From: Brian Norris <banorris@uci.edu>
Date: Tue, 29 May 2012 17:17:23 +0000 (-0700)
Subject: libthreads: pass 'class Thread' object as ModelAction 'location'
X-Git-Tag: pldi2013~392^2~8
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=c3ec6bb763ab72e04596bbdfb534578aab545d8f;p=model-checker.git

libthreads: pass 'class Thread' object as ModelAction 'location'

Currently, the 'location' parameter is unused for THREAD_CREATE. I need to
provide a reference from a Thread object to the ModelAction which created it,
so I will use this parameter as an entry point into the ModelChecker, which can
build the necessary reference later.
---

diff --git a/libthreads.cc b/libthreads.cc
index e8d3b6e..a414686 100644
--- a/libthreads.cc
+++ b/libthreads.cc
@@ -10,12 +10,14 @@
  */
 int thrd_create(thrd_t *t, thrd_start_t start_routine, void *arg)
 {
+	Thread *thread;
 	int ret;
 	DBG();
-	ret = model->add_thread(new Thread(t, start_routine, arg));
+	thread = new Thread(t, start_routine, arg);
+	ret = model->add_thread(thread);
 	DEBUG("create thread %d\n", id_to_int(thrd_to_id(*t)));
 	/* seq_cst is just a 'don't care' parameter */
-	model->switch_to_master(new ModelAction(THREAD_CREATE, memory_order_seq_cst, NULL, VALUE_NONE));
+	model->switch_to_master(new ModelAction(THREAD_CREATE, memory_order_seq_cst, thread, VALUE_NONE));
 	return ret;
 }