From: Brian Norris <banorris@uci.edu>
Date: Wed, 3 Oct 2012 19:37:22 +0000 (-0700)
Subject: model: update switch_to_master() comment
X-Git-Tag: pldi2013~107^2~14
X-Git-Url: http://plrg.eecs.uci.edu/git/?p=model-checker.git;a=commitdiff_plain;h=31081494669effd19d6b4e502129db6397722f28;ds=sidebyside

model: update switch_to_master() comment
---

diff --git a/model.cc b/model.cc
index c011221..6ec6080 100644
--- a/model.cc
+++ b/model.cc
@@ -1689,7 +1689,10 @@ void ModelChecker::remove_thread(Thread *t)
  * context). This switch is made with the intention of exploring a particular
  * model-checking action (described by a ModelAction object). Must be called
  * from a user-thread context.
- * @param act The current action that will be explored. Must not be NULL.
+ *
+ * @param act The current action that will be explored. May be NULL only if
+ * trace is exiting via an assertion (see ModelChecker::set_assert and
+ * ModelChecker::has_asserted).
  * @return Return status from the 'swap' call (i.e., success/fail, 0/-1)
  */
 int ModelChecker::switch_to_master(ModelAction *act)