seed random number generator with time

[c11tester.git] / cmodelint.cc

diff --git a/cmodelint.cc b/cmodelint.cc
index 0b9668d16a56c96f20322205e4a7a4cdb599fca4..9f1c9c0616d20cb7c85c5e9b90567cd70596660d 100644 (file)
--- a/cmodelint.cc
+++ b/cmodelint.cc
@@ -4,7 +4,6 @@
 #include "model.h"
 #include "execution.h"
 #include "action.h"
-#include "history.h"
 #include "cmodelint.h"
 #include "snapshot-interface.h"
 #include "threads-model.h"
@@ -15,39 +14,31 @@ memory_order orders[6] = {
        memory_order_release, memory_order_acq_rel, memory_order_seq_cst,
 };
 
-static void ensureModel() {
-       if (!model) {
-               snapshot_system_init(10000, 1024, 1024, 40000);
-               model = new ModelChecker();
-               model->startChecker();
-       }
-}
-
 /* ---  helper functions --- */
 uint64_t model_rmwrcas_action_helper(void *obj, int atomic_index, uint64_t oldval, int size, const char *position) {
-       ensureModel();
+       createModelIfNotExist();
        return model->switch_thread(new ModelAction(ATOMIC_RMWRCAS, position, orders[atomic_index], obj, oldval, size));
 }
 
 uint64_t model_rmwr_action_helper(void *obj, int atomic_index, const char *position) {
-       ensureModel();
+       createModelIfNotExist();
        return model->switch_thread(new ModelAction(ATOMIC_RMWR, position, orders[atomic_index], obj));
 }
 
 void model_rmw_action_helper(void *obj, uint64_t val, int atomic_index, const char * position) {
-       ensureModel();
+       createModelIfNotExist();
        model->switch_thread(new ModelAction(ATOMIC_RMW, position, orders[atomic_index], obj, val));
 }
 
 void model_rmwc_action_helper(void *obj, int atomic_index, const char *position) {
-       ensureModel();
+       createModelIfNotExist();
        model->switch_thread(new ModelAction(ATOMIC_RMWC, position, orders[atomic_index], obj));
 }
 
 // cds volatile loads
 #define VOLATILELOAD(size) \
        uint ## size ## _t cds_volatile_load ## size(void * obj, const char * position) { \
-               ensureModel();                                                      \
+               createModelIfNotExist();                                                      \
                return (uint ## size ## _t)model->switch_thread(new ModelAction(ATOMIC_READ, position, memory_order_volatile_load, obj)); \
        }
 
@@ -59,7 +50,7 @@ VOLATILELOAD(64)
 // cds volatile stores
 #define VOLATILESTORE(size) \
        void cds_volatile_store ## size (void * obj, uint ## size ## _t val, const char * position) { \
-               ensureModel();                                                      \
+               createModelIfNotExist();                                                      \
                model->switch_thread(new ModelAction(ATOMIC_WRITE, position, memory_order_volatile_store, obj, (uint64_t) val)); \
                *((volatile uint ## size ## _t *)obj) = val;            \
                thread_id_t tid = thread_current_id();           \
@@ -76,7 +67,7 @@ VOLATILESTORE(64)
 // cds atomic inits
 #define CDSATOMICINT(size)                                              \
        void cds_atomic_init ## size (void * obj, uint ## size ## _t val, const char * position) { \
-               ensureModel();                                                      \
+               createModelIfNotExist();                                                      \
                model->switch_thread(new ModelAction(ATOMIC_INIT, position, memory_order_relaxed, obj, (uint64_t) val)); \
                *((volatile uint ## size ## _t *)obj) = val;                                 \
                thread_id_t tid = thread_current_id();           \
@@ -93,7 +84,7 @@ CDSATOMICINT(64)
 // cds atomic loads
 #define CDSATOMICLOAD(size)                                             \
        uint ## size ## _t cds_atomic_load ## size(void * obj, int atomic_index, const char * position) { \
-               ensureModel();                                                      \
+               createModelIfNotExist();                                                      \
                uint ## size ## _t val = (uint ## size ## _t)model->switch_thread( \
                        new ModelAction(ATOMIC_READ, position, orders[atomic_index], obj)); \
                thread_id_t tid = thread_current_id();           \
@@ -111,7 +102,7 @@ CDSATOMICLOAD(64)
 // cds atomic stores
 #define CDSATOMICSTORE(size)                                            \
        void cds_atomic_store ## size(void * obj, uint ## size ## _t val, int atomic_index, const char * position) { \
-               ensureModel();                                                        \
+               createModelIfNotExist();                                                        \
                model->switch_thread(new ModelAction(ATOMIC_WRITE, position, orders[atomic_index], obj, (uint64_t) val)); \
                *((volatile uint ## size ## _t *)obj) = val;                     \
                thread_id_t tid = thread_current_id();           \
@@ -291,49 +282,7 @@ void cds_atomic_thread_fence(int atomic_index, const char * position) {
  */
 
 void cds_func_entry(const char * funcName) {
-#ifdef NEWFUZZER
-       ensureModel();
-       thread_id_t tid = thread_current_id();
-       uint32_t func_id;
-
-       ModelHistory *history = model->get_history();
-       if ( !history->getFuncMap()->contains(funcName) ) {
-               // add func id to func map
-               func_id = history->get_func_counter();
-               history->incr_func_counter();
-               history->getFuncMap()->put(funcName, func_id);
-
-               // add func id to reverse func map
-               ModelVector<const char *> * func_map_rev = history->getFuncMapRev();
-               if ( func_map_rev->size() <= func_id )
-                       func_map_rev->resize( func_id + 1 );
-
-               func_map_rev->at(func_id) = funcName;
-       } else {
-               func_id = history->getFuncMap()->get(funcName);
-       }
-
-       history->enter_function(func_id, tid);
-#endif
 }
 
 void cds_func_exit(const char * funcName) {
-#ifdef NEWFUZZER
-       ensureModel();
-       thread_id_t tid = thread_current_id();
-       uint32_t func_id;
-
-       ModelHistory *history = model->get_history();
-       func_id = history->getFuncMap()->get(funcName);
-/*
- * func_id not found; this could happen in the case where a function calls cds_func_entry
- * when the model has been defined yet, but then an atomic inside the function initializes
- * the model. And then cds_func_exit is called upon the function exiting.
- *
- */
-       if (func_id == 0)
-               return;
-
-       history->exit_function(func_id, tid);
-#endif
 }