projects
/
model-checker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cyclegraph: move function definitions out of header
[model-checker.git]
/
threads.cc
diff --git
a/threads.cc
b/threads.cc
index dc2db2d9bfefcab57458035f3f4bc815b75b5fc5..6adc053ae2dbfc58a00bbbb2f0e6a7c2e79a7b4c 100644
(file)
--- a/
threads.cc
+++ b/
threads.cc
@@
-34,8
+34,6
@@
Thread * thread_current(void)
* Provides a startup wrapper for each thread, allowing some initial
* model-checking data to be recorded. This method also gets around makecontext
* not being 64-bit clean
* Provides a startup wrapper for each thread, allowing some initial
* model-checking data to be recorded. This method also gets around makecontext
* not being 64-bit clean
- * @todo We should make the START event always immediately follow the
- * CREATE event, so we don't get redundant traces...
*/
void thread_startup()
{
*/
void thread_startup()
{
@@
-106,12
+104,11
@@
int Thread::swap(ucontext_t *ctxt, Thread *t)
/** Terminate a thread and free its stack. */
void Thread::complete()
{
/** Terminate a thread and free its stack. */
void Thread::complete()
{
- if (!is_complete()) {
- DEBUG("completed thread %d\n", id_to_int(get_id()));
- state = THREAD_COMPLETED;
- if (stack)
- stack_free(stack);
- }
+ ASSERT(!is_complete());
+ DEBUG("completed thread %d\n", id_to_int(get_id()));
+ state = THREAD_COMPLETED;
+ if (stack)
+ stack_free(stack);
}
/**
}
/**
@@
-161,22
+158,33
@@
Thread::Thread(thrd_t *t, void (*func)(void *), void *a) :
/* Initialize state */
ret = create_context();
if (ret)
/* Initialize state */
ret = create_context();
if (ret)
-
printf
("Error in create_context\n");
+
model_print
("Error in create_context\n");
id = model->get_next_id();
id = model->get_next_id();
-
*user_thread = id
;
+
user_thread->priv = this
;
parent = thread_current();
}
/** Destructor */
Thread::~Thread()
{
parent = thread_current();
}
/** Destructor */
Thread::~Thread()
{
- complete();
+ if (!is_complete())
+ complete();
model->remove_thread(this);
}
/** @return The thread_id_t corresponding to this Thread object. */
model->remove_thread(this);
}
/** @return The thread_id_t corresponding to this Thread object. */
-thread_id_t Thread::get_id()
+thread_id_t Thread::get_id()
const
{
return id;
}
{
return id;
}
+
+/**
+ * Set a thread's THREAD_* state (@see thread_state)
+ * @param s The state to enter
+ */
+void Thread::set_state(thread_state s)
+{
+ ASSERT(s == THREAD_COMPLETED || state != THREAD_COMPLETED);
+ state = s;
+}