projects
/
model-checker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'markdown'
[model-checker.git]
/
threads.cc
diff --git
a/threads.cc
b/threads.cc
index e4b46561a0e7be13016661a541f09146b9726f28..a0bc02970aa9ff71c6e8e1a04f6565d52b6db43a 100644
(file)
--- a/
threads.cc
+++ b/
threads.cc
@@
-93,7
+93,7
@@
int Thread::create_context()
int Thread::swap(Thread *t, ucontext_t *ctxt)
{
t->set_state(THREAD_READY);
int Thread::swap(Thread *t, ucontext_t *ctxt)
{
t->set_state(THREAD_READY);
- return swapcontext(&t->context, ctxt);
+ return
model_
swapcontext(&t->context, ctxt);
}
/**
}
/**
@@
-107,7
+107,7
@@
int Thread::swap(Thread *t, ucontext_t *ctxt)
int Thread::swap(ucontext_t *ctxt, Thread *t)
{
t->set_state(THREAD_RUNNING);
int Thread::swap(ucontext_t *ctxt, Thread *t)
{
t->set_state(THREAD_RUNNING);
- return swapcontext(ctxt, &t->context);
+ return
model_
swapcontext(ctxt, &t->context);
}
}
@@
-139,7
+139,6
@@
Thread::Thread(thread_id_t tid) :
user_thread(NULL),
id(tid),
state(THREAD_READY), /* Thread is always ready? */
user_thread(NULL),
id(tid),
state(THREAD_READY), /* Thread is always ready? */
- wait_list(),
last_action_val(0),
model_thread(true)
{
last_action_val(0),
model_thread(true)
{
@@
-152,15
+151,15
@@
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 *parent) :
+Thread::Thread(thr
ead_id_t tid, thr
d_t *t, void (*func)(void *), void *a, Thread *parent) :
parent(parent),
creation(NULL),
pending(NULL),
start_routine(func),
arg(a),
user_thread(t),
parent(parent),
creation(NULL),
pending(NULL),
start_routine(func),
arg(a),
user_thread(t),
+ id(tid),
state(THREAD_CREATED),
state(THREAD_CREATED),
- wait_list(),
last_action_val(VALUE_NONE),
model_thread(false)
{
last_action_val(VALUE_NONE),
model_thread(false)
{
@@
-171,7
+170,6
@@
Thread::Thread(thrd_t *t, void (*func)(void *), void *a, Thread *parent) :
if (ret)
model_print("Error in create_context\n");
if (ret)
model_print("Error in create_context\n");
- id = model->get_next_id();
user_thread->priv = this;
}
user_thread->priv = this;
}