From: Brian Demsky <bdemsky@uci.edu>
Date: Thu, 15 Nov 2012 04:55:23 +0000 (-0800)
Subject: Merge branch 'master' of /home/git/model-checker
X-Git-Tag: oopsla2013~539
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=44118f596eb7cd9b4b0b5037fbbf958db001accc;hp=-c;p=model-checker.git

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

44118f596eb7cd9b4b0b5037fbbf958db001accc
diff --combined config.h
index 971ea27,aacbb81..891dfd7
--- a/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