projects
/
c11tester.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
model: use get_thread(curr) instead of get_current_thread()
[c11tester.git]
/
threads.cc
diff --git
a/threads.cc
b/threads.cc
index 6b4e2c740ab50b7b55f624b7bda05a4c9ad72678..d170b7ada3554da89213ab6219fff15c11ed0019 100644
(file)
--- a/
threads.cc
+++ b/
threads.cc
@@
-104,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);
}
/**
}
/**
@@
-169,7
+168,8
@@
Thread::Thread(thrd_t *t, void (*func)(void *), void *a) :
/** Destructor */
Thread::~Thread()
{
/** Destructor */
Thread::~Thread()
{
- complete();
+ if (!is_complete())
+ complete();
model->remove_thread(this);
}
model->remove_thread(this);
}
@@
-178,3
+178,13
@@
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;
+}