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 parmap to raw contexts
[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
57f8c71
..
9a2f7bb
100644
(file)
--- a/
src/simix/smx_context_raw.c
+++ b/
src/simix/smx_context_raw.c
@@
-7,6
+7,8
@@
* under the terms of the license (GNU LGPL) which comes with this package. */
#include "simix/private.h"
* under the terms of the license (GNU LGPL) which comes with this package. */
#include "simix/private.h"
+#include "xbt/parmap.h"
+
#ifdef HAVE_VALGRIND_VALGRIND_H
# include <valgrind/valgrind.h>
#ifdef HAVE_VALGRIND_VALGRIND_H
# include <valgrind/valgrind.h>
@@
-157,11
+159,14
@@
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
void smx_ctx_raw_wrapper(smx_ctx_raw_t context)
;
+static
xbt_parmap_t parmap
;
+static void smx_ctx_raw_wrapper(smx_ctx_raw_t context);
static int smx_ctx_raw_factory_finalize(smx_context_factory_t *factory)
{
static int smx_ctx_raw_factory_finalize(smx_context_factory_t *factory)
{
+ if(parmap)
+ xbt_parmap_destroy(parmap);
return smx_ctx_base_factory_finalize(factory);
}
return smx_ctx_base_factory_finalize(factory);
}
@@
-260,25
+265,29
@@
static void smx_ctx_raw_resume(smx_context_t context)
static void smx_ctx_raw_runall(xbt_dynar_t processes)
{
smx_process_t process;
static void smx_ctx_raw_runall(xbt_dynar_t processes)
{
smx_process_t process;
+ unsigned int cursor;
-
while (xbt_dynar_length(processes))
{
-
process = xbt_dynar_pop_as(processes,smx_process_t
);
+
xbt_dynar_foreach(processes, cursor, process)
{
+
DEBUG2("Schedule item %u of %lu",cursor,xbt_dynar_length(processes)
);
smx_ctx_raw_resume(process->context);
}
smx_ctx_raw_resume(process->context);
}
+ xbt_dynar_reset(processes);
}
}
-static void smx_ctx_raw_resume_parallel(smx_
context_t 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);
raw_swapcontext(
xbt_os_thread_set_extra_data(context);
raw_swapcontext(
- &
((smx_ctx_raw_t) context)
->old_stack_top,
-
((smx_ctx_raw_t) context)
->stack_top);
+ &
context
->old_stack_top,
+
context
->stack_top);
xbt_os_thread_set_extra_data(NULL);
}
static void smx_ctx_raw_runall_parallel(xbt_dynar_t processes)
{
xbt_os_thread_set_extra_data(NULL);
}
static void smx_ctx_raw_runall_parallel(xbt_dynar_t processes)
{
- return;
+ xbt_parmap_apply(parmap, (void_f_pvoid_t)smx_ctx_raw_resume_parallel, processes);
+ xbt_dynar_reset(processes);
}
static smx_context_t smx_ctx_raw_self_parallel(void)
}
static smx_context_t smx_ctx_raw_self_parallel(void)
@@
-302,6
+311,7
@@
void SIMIX_ctx_raw_factory_init(smx_context_factory_t *factory)
if(_surf_parallel_contexts){
#ifdef CONTEXT_THREADS /* To use parallel ucontexts a thread pool is needed */
if(_surf_parallel_contexts){
#ifdef CONTEXT_THREADS /* To use parallel ucontexts a thread pool is needed */
+ parmap = xbt_parmap_new(2);
(*factory)->runall = smx_ctx_raw_runall_parallel;
(*factory)->self = smx_ctx_raw_self_parallel;
#else
(*factory)->runall = smx_ctx_raw_runall_parallel;
(*factory)->self = smx_ctx_raw_self_parallel;
#else