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
Fix tne runall functions
[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
b687123
..
2ca8451
100644
(file)
--- a/
src/simix/smx_context_raw.c
+++ b/
src/simix/smx_context_raw.c
@@
-6,7
+6,6
@@
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
-#include "xbt/threadpool.h"
#include "simix/private.h"
#ifdef HAVE_VALGRIND_VALGRIND_H
#include "simix/private.h"
#ifdef HAVE_VALGRIND_VALGRIND_H
@@
-158,15
+157,11
@@
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_tpool_t tpool;
-
static void smx_ctx_raw_wrapper(smx_ctx_raw_t context);
static int smx_ctx_raw_factory_finalize(smx_context_factory_t *factory)
{
static void smx_ctx_raw_wrapper(smx_ctx_raw_t context);
static int smx_ctx_raw_factory_finalize(smx_context_factory_t *factory)
{
- if(tpool)
- xbt_tpool_destroy(tpool);
return smx_ctx_base_factory_finalize(factory);
}
return smx_ctx_base_factory_finalize(factory);
}
@@
-262,12
+257,15
@@
static void smx_ctx_raw_resume(smx_context_t context)
((smx_ctx_raw_t) context)->stack_top);
}
((smx_ctx_raw_t) context)->stack_top);
}
-static void smx_ctx_raw_runall(xbt_
swag
_t processes)
+static void smx_ctx_raw_runall(xbt_
dynar
_t processes)
{
smx_process_t process;
{
smx_process_t process;
+ unsigned int cursor;
- while ((process = xbt_swag_extract(processes)))
+ xbt_dynar_foreach(processes, cursor, process) {
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_context_t context)
@@
-279,13
+277,9
@@
static void smx_ctx_raw_resume_parallel(smx_context_t context)
xbt_os_thread_set_extra_data(NULL);
}
xbt_os_thread_set_extra_data(NULL);
}
-static void smx_ctx_raw_runall_parallel(xbt_
swag
_t processes)
+static void smx_ctx_raw_runall_parallel(xbt_
dynar
_t processes)
{
{
- smx_process_t process;
- while((process = xbt_swag_extract(processes))){
- xbt_tpool_queue_job(tpool, (void_f_pvoid_t)smx_ctx_raw_resume_parallel, process->context);
- }
- xbt_tpool_wait_all(tpool);
+ return;
}
static smx_context_t smx_ctx_raw_self_parallel(void)
}
static smx_context_t smx_ctx_raw_self_parallel(void)
@@
-309,7
+303,6
@@
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 */
- tpool = xbt_tpool_new(2, 10);
(*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