projects
/
model-checker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
check in message
[model-checker.git]
/
threads.cc
diff --git
a/threads.cc
b/threads.cc
index 0ed7bdcabc084eabf0755c8df098b724d3c023c4..37b0f1a87ee6fb9ac975a84c8df9adf018d808c5 100644
(file)
--- a/
threads.cc
+++ b/
threads.cc
@@
-1,5
+1,3
@@
-/* -*- Mode: C; indent-tabs-mode: t -*- */
-
#include "libthreads.h"
#include "common.h"
#include "threads.h"
#include "libthreads.h"
#include "common.h"
#include "threads.h"
@@
-11,12
+9,12
@@
static void * stack_allocate(size_t size)
{
static void * stack_allocate(size_t size)
{
- return
userM
alloc(size);
+ return
m
alloc(size);
}
static void stack_free(void *stack)
{
}
static void stack_free(void *stack)
{
-
userF
ree(stack);
+
f
ree(stack);
}
Thread * thread_current(void)
}
Thread * thread_current(void)
@@
-27,7
+25,7
@@
Thread * thread_current(void)
/* This method just gets around makecontext not being 64-bit clean */
void thread_startup() {
/* This method just gets around makecontext not being 64-bit clean */
void thread_startup() {
- Thread * curr_thread
=
thread_current();
+ Thread * curr_thread
=
thread_current();
curr_thread->start_routine(curr_thread->arg);
}
curr_thread->start_routine(curr_thread->arg);
}
@@
-45,7
+43,7
@@
int Thread::create_context()
context.uc_stack.ss_size = STACK_SIZE;
context.uc_stack.ss_flags = 0;
context.uc_link = model->get_system_context();
context.uc_stack.ss_size = STACK_SIZE;
context.uc_stack.ss_flags = 0;
context.uc_link = model->get_system_context();
- makecontext(&context,
start_routine, 1
);
+ makecontext(&context,
thread_startup, 0
);
return 0;
}
return 0;
}
@@
-70,7
+68,7
@@
void Thread::complete()
}
}
}
}
-Thread::Thread(thrd_t *t, void (*func)(), void *a) {
+Thread::Thread(thrd_t *t, void (*func)(
void *
), void *a) {
int ret;
user_thread = t;
int ret;
user_thread = t;