projects
/
model-checker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
threads/model: allocate Thread from w/in ModelChecker
[model-checker.git]
/
threads.cc
diff --git
a/threads.cc
b/threads.cc
index 3b793cff0c443f6f70f6d156e6ec456f40fdbe67..9de580297871687e4529f2a67512aa6087a9cc1b 100644
(file)
--- a/
threads.cc
+++ b/
threads.cc
@@
-84,6
+84,7
@@
int Thread::create_context()
*/
int Thread::swap(Thread *t, ucontext_t *ctxt)
{
*/
int Thread::swap(Thread *t, ucontext_t *ctxt)
{
+ t->set_state(THREAD_READY);
return swapcontext(&t->context, ctxt);
}
return swapcontext(&t->context, ctxt);
}
@@
-97,6
+98,7
@@
int Thread::swap(Thread *t, ucontext_t *ctxt)
*/
int Thread::swap(ucontext_t *ctxt, Thread *t)
{
*/
int Thread::swap(ucontext_t *ctxt, Thread *t)
{
+ t->set_state(THREAD_RUNNING);
return swapcontext(ctxt, &t->context);
}
return swapcontext(ctxt, &t->context);
}
@@
-104,12
+106,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);
}
/**
}
/**
@@
-162,19
+163,30
@@
Thread::Thread(thrd_t *t, void (*func)(void *), void *a) :
model_print("Error in create_context\n");
id = model->get_next_id();
model_print("Error in create_context\n");
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;
+}