X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=schedule.cc;h=93c4fc3fdc0369c79d817d4ef268f4fe0bc3ecb3;hb=HEAD;hp=f68786a825698f64052729f5032b332a3925e824;hpb=bbc0bd0561362e1cb93c04fddc165b49d83c24ed;p=c11tester.git

diff --git a/schedule.cc b/schedule.cc
index f68786a8..93c4fc3f 100644
--- a/schedule.cc
+++ b/schedule.cc
@@ -57,9 +57,9 @@ void Scheduler::set_enabled(Thread *t, enabled_type_t enabled_status) {
 	int threadid = id_to_int(t->get_id());
 	if (threadid >= enabled_len) {
 		enabled_type_t *new_enabled = (enabled_type_t *)snapshot_malloc(sizeof(enabled_type_t) * (threadid + 1));
-		memset(&new_enabled[enabled_len], 0, (threadid + 1 - enabled_len) * sizeof(enabled_type_t));
+		real_memset(&new_enabled[enabled_len], 0, (threadid + 1 - enabled_len) * sizeof(enabled_type_t));
 		if (enabled != NULL) {
-			memcpy(new_enabled, enabled, enabled_len * sizeof(enabled_type_t));
+			real_memcpy(new_enabled, enabled, enabled_len * sizeof(enabled_type_t));
 			snapshot_free(enabled);
 		}
 		enabled = new_enabled;
@@ -98,11 +98,17 @@ bool Scheduler::is_enabled(thread_id_t tid) const
 /**
  * @brief Check if a Thread is currently in the sleep set
  * @param t The Thread to check
- * @return True if the Thread is currently enabled
  */
 bool Scheduler::is_sleep_set(const Thread *t) const
 {
-	return get_enabled(t) == THREAD_SLEEP_SET;
+	return is_sleep_set(t->get_id());
+}
+
+bool Scheduler::is_sleep_set(thread_id_t tid) const
+{
+	int id = id_to_int(tid);
+	ASSERT(id < enabled_len);
+	return enabled[id] == THREAD_SLEEP_SET;
 }
 
 /**
@@ -132,6 +138,8 @@ enabled_type_t Scheduler::get_enabled(const Thread *t) const
 /**
  * Add a Thread to the sleep set.
  * @param t The Thread to add
+ * A Thread is in THREAD_SLEEP_SET if it is sleeping or blocked by a wait
+ * operation that should fail spuriously (decide by fuzzer).
  */
 void Scheduler::add_sleep(Thread *t)
 {
@@ -206,7 +214,7 @@ Thread * Scheduler::select_next_thread()
 	int thread_list[enabled_len], sleep_list[enabled_len];
 	Thread * thread;
 
-	for (int i = 0; i < enabled_len; i++) {
+	for (int i = 0;i < enabled_len;i++) {
 		if (enabled[i] == THREAD_ENABLED)
 			thread_list[avail_threads++] = i;
 		else if (enabled[i] == THREAD_SLEEP_SET)
@@ -227,7 +235,7 @@ Thread * Scheduler::select_next_thread()
 		thread = execution->getFuzzer()->selectThread(thread_list, avail_threads);
 	}
 
-	curr_thread_index = id_to_int(thread->get_id());
+	//curr_thread_index = id_to_int(thread->get_id());
 	return thread;
 }