Merge branch 'new_fuzzer' into branch-weiyu

diff --combined cmodelint.cc
index f71c0f7e9904f8e8d8d91918a4b14cfac94c9745,98f7f89d46a44af0481b0246eb6fe307c1069796..c42ffe4187b1fdc2a02a467c4de19296f1c5a2ad
--- 1/cmodelint.cc
--- 2/cmodelint.cc
+++ b/cmodelint.cc
@@@ -363,32 -363,27 +363,33 @@@ void cds_atomic_thread_fence(int atomic
  
  void cds_func_entry(const char * funcName) {
        if (!model) return;
- 
+       /*
        Thread * th = thread_current();
        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, th->get_id());
+       */
  }
  
  void cds_func_exit(const char * funcName) {
        if (!model) return;
- 
+       /*
        Thread * th = thread_current();
        uint32_t func_id;
  
@@@ -396,4 -391,5 +397,5 @@@
        func_id = history->getFuncMap()->get(funcName);
  
        history->exit_function(func_id, th->get_id());
+       */
  }