merge and resolve conflict
authorweiyu <weiyuluo1232@gmail.com>
Mon, 8 Jul 2019 23:45:24 +0000 (16:45 -0700)
committerweiyu <weiyuluo1232@gmail.com>
Mon, 8 Jul 2019 23:45:24 +0000 (16:45 -0700)
1  2 
Makefile
classlist.h
execution.cc
execution.h

diff --cc Makefile
Simple merge
diff --cc classlist.h
@@@ -22,5 -17,6 +20,7 @@@ class FuncInst
  struct model_snapshot_members;
  struct bug_message;
  typedef SnapList<ModelAction *> action_list_t;
 +typedef SnapList<uint32_t> func_id_list_t;
+ extern volatile int forklock;
  #endif
diff --cc execution.cc
@@@ -63,12 -61,9 +62,11 @@@ ModelExecution::ModelExecution(ModelChe
        mutex_map(),
        thrd_last_action(1),
        thrd_last_fence_release(),
-       node_stack(node_stack),
        priv(new struct model_snapshot_members ()),
 -                       mo_graph(new CycleGraph()),
 -      fuzzer(new Fuzzer())
 +      mo_graph(new CycleGraph()),
 +      fuzzer(new Fuzzer()),
 +      thrd_func_list(),
 +      thrd_func_inst_lists()
  {
        /* Initialize a model-checker thread, for special ModelActions */
        model_thread = new Thread(get_next_id());
diff --cc execution.h
Simple merge