model: rearrange switch block, handle RMW
authorBrian Norris <banorris@uci.edu>
Thu, 12 Jul 2012 19:29:34 +0000 (12:29 -0700)
committerBrian Norris <banorris@uci.edu>
Thu, 12 Jul 2012 22:25:06 +0000 (15:25 -0700)
This switch block shouldn't have to be updated for every new action_type_t.
Rewrite so that we only have to worry about significant actions, like
ATOMIC_{READ,WRITE,RMW}.

model.cc

index d80d1d27be741c749d9f94db4e8c5c9f8c28e6d4..9d07d416307f143a1f4fcf12692d4042e6dd2e04 100644 (file)
--- a/model.cc
+++ b/model.cc
@@ -167,14 +167,12 @@ ModelAction * ModelChecker::get_last_conflict(ModelAction *act)
        action_type type = act->get_type();
 
        switch (type) {
-               case THREAD_CREATE:
-               case THREAD_YIELD:
-               case THREAD_JOIN:
-                       return NULL;
                case ATOMIC_READ:
                case ATOMIC_WRITE:
-               default:
+               case ATOMIC_RMW:
                        break;
+               default:
+                       return NULL;
        }
        /* linear search: from most recent to oldest */
        action_list_t::reverse_iterator rit;