Merge branch 'master' of /home/git/model-checker

diff --combined config.h
index 971ea27d2705ceabc3d43c8c06e6a0a60dd01077,aacbb81db38613e43e10ff5ab6c43751173c6d30..891dfd7f7a02dacec02ff339a0ff2bffeaa58fcc
--- 1/config.h
--- 2/config.h
+++ b/config.h
@@@ -9,6 -9,10 +9,10 @@@
  /*            #ifndef CONFIG_DEBUG
                #define CONFIG_DEBUG
                #endif
+ 
+               #ifndef CONFIG_ASSERT
+               #define CONFIG_ASSERT
+               #endif
  */
  
  /** Turn on support for dumping cyclegraphs as dot files at each
@@@ -34,7 -38,7 +38,7 @@@
  #define USE_MPROTECT_SNAPSHOT 2
  
  /** Size of signal stack */
 -#define SIGSTACKSIZE 32768
 +#define SIGSTACKSIZE 65536
  
  /** Page size configuration */
  #define PAGESIZE 4096
@@@ -44,5 -48,10 +48,10 @@@
  /* Size of stack to allocate for a thread. */
  #define STACK_SIZE (1024 * 1024)
  
+ /** How many shadow tables of memory to preallocate for data race detector. */
+ #define SHADOWBASETABLES 4
+ 
+ /** Enable debugging assertions (via ASSERT()) */
+ #define CONFIG_ASSERT
  
  #endif