Implement stride for parmap_apply.

[simgrid.git] / src / simix / smx_context_sysv.c

diff --git a/src/simix/smx_context_sysv.c b/src/simix/smx_context_sysv.c
index d92dffd..25ef8ec 100644 (file)
--- a/src/simix/smx_context_sysv.c
+++ b/src/simix/smx_context_sysv.c
@@ -1,4 +1,4 @@
-/* context_sysv - context switching with ucontextes from System V           */
+/* context_sysv - context switching with ucontexts from System V           */
 
 /* Copyright (c) 2009-2013. The SimGrid Team.
  * All rights reserved.                                                     */
@@ -29,6 +29,7 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_context);
 typedef struct s_smx_ctx_sysv {
   s_smx_ctx_base_t super;       /* Fields of super implementation */
   ucontext_t uc;                /* the ucontext that executes the code */
+  unsigned int parmap_index;
 #ifdef HAVE_VALGRIND_VALGRIND_H
   unsigned int valgrind_stack_id;       /* the valgrind stack id */
 #endif
@@ -278,15 +279,19 @@ static void smx_ctx_sysv_suspend_parallel(smx_context_t context)
 {
 #ifdef CONTEXT_THREADS
   /* determine the next context */
-  smx_process_t next_work = xbt_parmap_next(sysv_parmap);
+  smx_process_t next_work;
   smx_context_t next_context;
   ucontext_t* next_stack;
 
+  next_work = xbt_parmap_next(sysv_parmap,
+                              &((smx_ctx_sysv_t) context)->parmap_index);
   if (next_work != NULL) {
     /* there is a next process to resume */
     XBT_DEBUG("Run next process");
     next_context = next_work->context;
     next_stack = &((smx_ctx_sysv_t) next_context)->uc;
+    ((smx_ctx_sysv_t) next_context)->parmap_index =
+      ((smx_ctx_sysv_t) context)->parmap_index;
   }
   else {
     /* all processes were run, go to the barrier */
@@ -310,10 +315,15 @@ static void smx_ctx_sysv_resume_parallel(smx_process_t first_process)
   smx_ctx_sysv_t worker_context = (smx_ctx_sysv_t)SIMIX_context_self();
   sysv_workers_context[worker_id] = worker_context;
   ucontext_t* worker_stack = &worker_context->uc;
-
-  smx_context_t context = first_process->context;
-  SIMIX_context_set_current(context);
-  swapcontext(worker_stack, &((smx_ctx_sysv_t) context)->uc);
+  unsigned int index = 0;
+
+  first_process = xbt_parmap_next(sysv_parmap, &index);
+  if (first_process != NULL) {
+    smx_context_t context = first_process->context;
+    ((smx_ctx_sysv_t) context)->parmap_index = index;
+    SIMIX_context_set_current(context);
+    swapcontext(worker_stack, &((smx_ctx_sysv_t) context)->uc);
+  }
 #endif
 }
 
@@ -322,6 +332,7 @@ static void smx_ctx_sysv_runall_parallel(void)
 #ifdef CONTEXT_THREADS
   sysv_threads_working = 0;
   xbt_parmap_apply(sysv_parmap, (void_f_pvoid_t) smx_ctx_sysv_resume_parallel,
-      simix_global->process_to_run);
+                   simix_global->process_to_run,
+                   1 + SIMIX_context_get_parallel_threshold() / SIMIX_context_get_nthreads(), 1);
 #endif
 }