#include <string.h>
-#include "libthreads.h"
+#include <threads.h>
#include "common.h"
#include "threads-model.h"
* 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()
{
/** 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);
}
/**
/* 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();
- *user_thread = id;
+ user_thread->priv = this;
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. */
-thread_id_t Thread::get_id()
+thread_id_t Thread::get_id() const
{
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;
+}