model: bugfix - detect conflicts properly
authorBrian Norris <banorris@uci.edu>
Thu, 26 Apr 2012 19:05:08 +0000 (12:05 -0700)
committerBrian Norris <banorris@uci.edu>
Thu, 26 Apr 2012 19:05:08 +0000 (12:05 -0700)
Finding a conflict from the same thread does not mean we should quit the search
with no found conflict; we just continue to the next search item.

model.cc

index 82e65202510076338130dea1d51488e52fa1b720..19570ffc2914fda9ccb003a73836a525fb96de83 100644 (file)
--- a/model.cc
+++ b/model.cc
@@ -146,7 +146,7 @@ ModelAction * ModelChecker::get_last_conflict(ModelAction *act)
                        continue;
                /* Conflict from the same thread is not really a conflict */
                if (id == prev->get_tid())
-                       return NULL;
+                       continue;
                return prev;
        }
        return NULL;