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 SIMIX_context_get_thread_id to the context factory interface.
[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
ffd2bdf
..
2d62d5d
100644
(file)
--- a/
src/simix/smx_context_raw.c
+++ b/
src/simix/smx_context_raw.c
@@
-265,13
+265,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;
- /*xbt_os_thread_set_extra_data(context);*/
current_context = (smx_context_t)context;
raw_swapcontext(
&context->old_stack_top,
context->stack_top);
current_context = (smx_context_t)maestro_raw_context;
current_context = (smx_context_t)context;
raw_swapcontext(
&context->old_stack_top,
context->stack_top);
current_context = (smx_context_t)maestro_raw_context;
- /*xbt_os_thread_set_extra_data(NULL);*/
}
static void smx_ctx_raw_runall_parallel(xbt_dynar_t processes)
}
static void smx_ctx_raw_runall_parallel(xbt_dynar_t processes)
@@
-282,11
+280,13
@@
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)
{
- /*smx_context_t self_context = (smx_context_t) xbt_os_thread_get_extra_data();
- return self_context ? self_context : (smx_context_t) maestro_raw_context;*/
return current_context;
}
return current_context;
}
+static int smx_ctx_raw_get_thread_id(){
+ return (int)(unsigned long)xbt_os_thread_get_extra_data();
+}
+
void SIMIX_ctx_raw_factory_init(smx_context_factory_t *factory)
{
VERB0("Using raw contexts. Because the glibc is just not good enough for us.");
void SIMIX_ctx_raw_factory_init(smx_context_factory_t *factory)
{
VERB0("Using raw contexts. Because the glibc is just not good enough for us.");
@@
-305,6
+305,7
@@
void SIMIX_ctx_raw_factory_init(smx_context_factory_t *factory)
parmap = xbt_parmap_new(2);
(*factory)->runall = smx_ctx_raw_runall_parallel;
(*factory)->self = smx_ctx_raw_self_parallel;
parmap = xbt_parmap_new(2);
(*factory)->runall = smx_ctx_raw_runall_parallel;
(*factory)->self = smx_ctx_raw_self_parallel;
+ (*factory)->get_thread_id = smx_ctx_raw_get_thread_id;
#else
THROW0(arg_error, 0, "No thread support for parallel context execution");
#endif
#else
THROW0(arg_error, 0, "No thread support for parallel context execution");
#endif