A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Trying to make context work on stupid architectures by stealing some nice code to...
[simgrid.git]
/
src
/
xbt
/
context.c
diff --git
a/src/xbt/context.c
b/src/xbt/context.c
index
fce1e64
..
a2aa4fd
100644
(file)
--- a/
src/xbt/context.c
+++ b/
src/xbt/context.c
@@
-25,7
+25,7
@@
static xbt_swag_t context_to_destroy = NULL;
static xbt_swag_t context_living = NULL;
#ifndef USE_PTHREADS /* USE_PTHREADS and USE_CONTEXT are exclusive */
static xbt_swag_t context_living = NULL;
#ifndef USE_PTHREADS /* USE_PTHREADS and USE_CONTEXT are exclusive */
-# ifndef
HAVE_UCONTEXT_H
+# ifndef
USE_UCONTEXT
/* don't want to play with conditional compilation in automake tonight, sorry.
include directly the c file from here when needed. */
# include "context_win32.c"
/* don't want to play with conditional compilation in automake tonight, sorry.
include directly the c file from here when needed. */
# include "context_win32.c"
@@
-108,9
+108,13
@@
static void *__context_wrapper(void *c)
int i;
#ifdef USE_PTHREADS
int i;
#ifdef USE_PTHREADS
+ DEBUG0("**** Lock ****");
pthread_mutex_lock(&(context->mutex));
pthread_mutex_lock(&(context->mutex));
+ DEBUG0("**** Releasing the prisonner ****");
pthread_cond_signal(&(context->cond));
pthread_cond_signal(&(context->cond));
+ DEBUG0("**** Going to Jail ****");
pthread_cond_wait(&(context->cond), &(context->mutex));
pthread_cond_wait(&(context->cond), &(context->mutex));
+ DEBUG0("**** Unlocking ****");
pthread_mutex_unlock(&(context->mutex));
#endif
pthread_mutex_unlock(&(context->mutex));
#endif
@@
-176,10
+180,14
@@
void xbt_context_start(xbt_context_t context)
{
#ifdef USE_PTHREADS
/* Launch the thread */
{
#ifdef USE_PTHREADS
/* Launch the thread */
+ DEBUG0("**** Locking ****");
pthread_mutex_lock(&(context->mutex));
pthread_mutex_lock(&(context->mutex));
+ DEBUG0("**** Pthread create ****");
xbt_assert0(!pthread_create(context->thread, NULL, __context_wrapper, context),
"Unable to create a thread.");
xbt_assert0(!pthread_create(context->thread, NULL, __context_wrapper, context),
"Unable to create a thread.");
+ DEBUG0("**** Going to jail ****");
pthread_cond_wait(&(context->cond), &(context->mutex));
pthread_cond_wait(&(context->cond), &(context->mutex));
+ DEBUG0("**** Unlocking ****");
pthread_mutex_unlock(&(context->mutex));
#else
makecontext (&(context->uc), (void (*) (void)) __context_wrapper,
pthread_mutex_unlock(&(context->mutex));
#else
makecontext (&(context->uc), (void (*) (void)) __context_wrapper,
@@
-221,8
+229,8
@@
xbt_context_t xbt_context_new(xbt_context_function_t code,
/* WARNING : when this context is over, the current_context (i.e. the
father), is awaken... Theorically, the wrapper should prevent using
this feature. */
/* WARNING : when this context is over, the current_context (i.e. the
father), is awaken... Theorically, the wrapper should prevent using
this feature. */
- res->uc.uc_stack.ss_sp =
res->stack
;
- res->uc.uc_stack.ss_size =
STACK_SIZE
;
+ res->uc.uc_stack.ss_sp =
pth_skaddr_makecontext(res->stack,STACK_SIZE)
;
+ res->uc.uc_stack.ss_size =
pth_sksize_makecontext(res->stack,STACK_SIZE)
;
#endif
res->argc = argc;
res->argv = argv;
#endif
res->argc = argc;
res->argv = argv;