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
[trace] cosmetics on user variables tracing, simpler 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
28f7831
..
e22ac1f
100644
(file)
--- a/
src/simix/smx_context_raw.c
+++ b/
src/simix/smx_context_raw.c
@@
-157,8
+157,6
@@
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_context);
static xbt_parmap_t parmap;
#endif
static xbt_parmap_t parmap;
#endif
-static smx_context_factory_t raw_factory;
-
#ifdef TIME_BENCH
#include "xbt/xbt_os_time.h"
#define NUM_THREADS 4
#ifdef TIME_BENCH
#include "xbt/xbt_os_time.h"
#define NUM_THREADS 4
@@
-357,26
+355,13
@@
static void smx_ctx_raw_runall_parallel(xbt_dynar_t processes)
#endif
}
#endif
}
-static smx_context_t smx_ctx_raw_self_parallel(void)
-{
- return SIMIX_context_get_current();
-}
-
-static int smx_ctx_raw_get_thread_id(){
- return (int)(unsigned long)xbt_os_thread_get_extra_data();
-}
-
static void smx_ctx_raw_runall(xbt_dynar_t processes)
{
if (xbt_dynar_length(processes) >= SIMIX_context_get_parallel_threshold()) {
XBT_DEBUG("Runall // %lu", xbt_dynar_length(processes));
static void smx_ctx_raw_runall(xbt_dynar_t processes)
{
if (xbt_dynar_length(processes) >= SIMIX_context_get_parallel_threshold()) {
XBT_DEBUG("Runall // %lu", xbt_dynar_length(processes));
- raw_factory->self = smx_ctx_raw_self_parallel;
- raw_factory->get_thread_id = smx_ctx_raw_get_thread_id;
smx_ctx_raw_runall_parallel(processes);
} else {
XBT_DEBUG("Runall serial %lu", xbt_dynar_length(processes));
smx_ctx_raw_runall_parallel(processes);
} else {
XBT_DEBUG("Runall serial %lu", xbt_dynar_length(processes));
- raw_factory->self = smx_ctx_base_self;
- raw_factory->get_thread_id = smx_ctx_base_get_thread_id;
smx_ctx_raw_runall_serial(processes);
}
}
smx_ctx_raw_runall_serial(processes);
}
}
@@
-404,18
+389,13
@@
void SIMIX_ctx_raw_factory_init(smx_context_factory_t *factory)
}
else {
/* always parallel */
}
else {
/* always parallel */
- (*factory)->self = smx_ctx_raw_self_parallel;
- (*factory)->get_thread_id = smx_ctx_raw_get_thread_id;
(*factory)->runall = smx_ctx_raw_runall_parallel;
}
}
else {
/* always serial */
(*factory)->runall = smx_ctx_raw_runall_parallel;
}
}
else {
/* always serial */
- (*factory)->self = smx_ctx_base_self;
- (*factory)->get_thread_id = smx_ctx_base_get_thread_id;
(*factory)->runall = smx_ctx_raw_runall_serial;
}
(*factory)->runall = smx_ctx_raw_runall_serial;
}
- raw_factory = *factory;
#ifdef TIME_BENCH
timer = xbt_os_timer_new();
#endif
#ifdef TIME_BENCH
timer = xbt_os_timer_new();
#endif