From: weiyu <weiyuluo1232@gmail.com>
Date: Thu, 1 Aug 2019 18:54:03 +0000 (-0700)
Subject: merge
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=7594d7ae8eda38fbb5a3ac3d6f33fffbb365b7bd;p=c11tester.git

merge
---

7594d7ae8eda38fbb5a3ac3d6f33fffbb365b7bd
diff --cc action.cc
index f00a1431,30ac2c82..b9df297e
--- a/action.cc
+++ b/action.cc
@@@ -53,6 -53,36 +53,34 @@@ ModelAction::ModelAction(action_type_t 
  }
  
  
+ /**
 - * @brief Construct a new ModelAction
++ * @brief Construct a new ModelAction for sleep actions
+  *
 - * @param type The type of action
++ * @param type The type of action: THREAD_SLEEP
+  * @param order The memory order of this action. A "don't care" for non-ATOMIC
+  * actions (e.g., THREAD_* or MODEL_* actions).
+  * @param loc The location that this action acts upon
 - * @param value (optional) A value associated with the action (e.g., the value
 - * read or written). Defaults to a given macro constant, for debugging purposes.
 - * @param thread (optional) The Thread in which this action occurred. If NULL
 - * (default), then a Thread is assigned according to the scheduler.
++ * @param value The time duration a thread is scheduled to sleep.
++ * @param _time The this sleep action is constructed
+  */
+ ModelAction::ModelAction(action_type_t type, memory_order order, uint64_t value, uint64_t _time) :
+ 	location(NULL),
+ 	position(NULL),
+ 	time(_time),
+ 	last_fence_release(NULL),
+ 	uninitaction(NULL),
+ 	cv(NULL),
+ 	rf_cv(NULL),
+ 	value(value),
+ 	type(type),
+ 	order(order),
+ 	original_order(order),
+ 	seq_number(ACTION_INITIAL_CLOCK)
+ {
+ 	Thread *t = thread_current();
+ 	this->tid = t!= NULL ? t->get_id() : -1;
+ }
+ 
  /**
   * @brief Construct a new ModelAction
   *