move the 'link_insts' method to FuncNode class

[c11tester.git] / cmodelint.cc

diff --git a/cmodelint.cc b/cmodelint.cc
index c42ffe4187b1fdc2a02a467c4de19296f1c5a2ad..82bf974f03b99b7aaae1ecd7b4fd440ed05f104f 100644 (file)
--- a/cmodelint.cc
+++ b/cmodelint.cc
@@ -363,18 +363,18 @@ void cds_atomic_thread_fence(int atomic_index, const char * position) {
 
 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 */
+               // 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 */
+               // 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 );
@@ -384,18 +384,23 @@ void cds_func_entry(const char * 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;
 
        ModelHistory *history = model->get_history();
        func_id = history->getFuncMap()->get(funcName);
 
-       history->exit_function(func_id, th->get_id());
+       /* 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, th->get_id());
 }