projects
/
model-checker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix conflicts
[model-checker.git]
/
threads.cc
diff --git
a/threads.cc
b/threads.cc
index d170b7ada3554da89213ab6219fff15c11ed0019..cbedbb18bae1d73db1c46a531b4141886875b6be 100644
(file)
--- a/
threads.cc
+++ b/
threads.cc
@@
-7,6
+7,7
@@
#include <threads.h>
#include "common.h"
#include "threads-model.h"
#include <threads.h>
#include "common.h"
#include "threads-model.h"
+#include "action.h"
/* global "model" object */
#include "model.h"
/* global "model" object */
#include "model.h"
@@
-23,7
+24,13
@@
static void stack_free(void *stack)
snapshot_free(stack);
}
snapshot_free(stack);
}
-/** Return the currently executing thread. */
+/**
+ * @brief Get the current Thread
+ *
+ * Must be called from a user context
+ *
+ * @return The currently executing thread
+ */
Thread * thread_current(void)
{
ASSERT(model);
Thread * thread_current(void)
{
ASSERT(model);
@@
-84,6
+91,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
+105,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);
}
@@
-142,7
+151,7
@@
Thread::Thread(thread_id_t tid) :
* @param func The function that the thread will call.
* @param a The parameter to pass to this function.
*/
* @param func The function that the thread will call.
* @param a The parameter to pass to this function.
*/
-Thread::Thread(thrd_t *t, void (*func)(void *), void *a) :
+Thread::Thread(thrd_t *t, void (*func)(void *), void *a
, Thread * parent_thrd
) :
creation(NULL),
pending(NULL),
start_routine(func),
creation(NULL),
pending(NULL),
start_routine(func),
@@
-161,8
+170,8
@@
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
;
- parent = thread_current();
+
user_thread->priv = this
;
+ parent =
parent_thrd ? parent_thrd :
thread_current();
}
/** Destructor */
}
/** Destructor */