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
-Add smx_ctx_sysv_get_thread_id to the parallel ucontext factory.
[simgrid.git]
/
src
/
simix
/
smx_context_raw.c
diff --git
a/src/simix/smx_context_raw.c
b/src/simix/smx_context_raw.c
index
2d62d5d
..
8ed05e1
100644
(file)
--- a/
src/simix/smx_context_raw.c
+++ b/
src/simix/smx_context_raw.c
@@
-153,10
+153,8
@@
void raw_swapcontext(raw_stack_t* old, raw_stack_t new) {
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_context);
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_context);
-static xbt_parmap_t parmap;
-
#ifdef CONTEXT_THREADS
#ifdef CONTEXT_THREADS
-static
__thread smx_context_t current_context
;
+static
xbt_parmap_t parmap
;
#endif
static void smx_ctx_raw_wrapper(smx_ctx_raw_t context);
#endif
static void smx_ctx_raw_wrapper(smx_ctx_raw_t context);
@@
-200,7
+198,6
@@
smx_ctx_raw_create_context(xbt_main_func_t code, int argc, char **argv,
}else{
maestro_raw_context = context;
}else{
maestro_raw_context = context;
- current_context = (smx_context_t) maestro_raw_context;
}
return (smx_context_t) context;
}
return (smx_context_t) context;
@@
-265,11
+262,11
@@
static void smx_ctx_raw_runall(xbt_dynar_t processes)
static void smx_ctx_raw_resume_parallel(smx_process_t process)
{
smx_ctx_raw_t context = (smx_ctx_raw_t)process->context;
static void smx_ctx_raw_resume_parallel(smx_process_t process)
{
smx_ctx_raw_t context = (smx_ctx_raw_t)process->context;
- current_context = (smx_context_t)context;
+
smx_
current_context = (smx_context_t)context;
raw_swapcontext(
&context->old_stack_top,
context->stack_top);
raw_swapcontext(
&context->old_stack_top,
context->stack_top);
- current_context = (smx_context_t)maestro_raw_context;
+
smx_
current_context = (smx_context_t)maestro_raw_context;
}
static void smx_ctx_raw_runall_parallel(xbt_dynar_t processes)
}
static void smx_ctx_raw_runall_parallel(xbt_dynar_t processes)
@@
-280,7
+277,7
@@
static void smx_ctx_raw_runall_parallel(xbt_dynar_t processes)
static smx_context_t smx_ctx_raw_self_parallel(void)
{
static smx_context_t smx_ctx_raw_self_parallel(void)
{
- return current_context;
+ return
smx_
current_context;
}
static int smx_ctx_raw_get_thread_id(){
}
static int smx_ctx_raw_get_thread_id(){