Fix parameter passing through makecontext (again).

[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 9774fda..e5b66e1 100644 (file)
--- a/src/simix/smx_context_sysv.c
+++ b/src/simix/smx_context_sysv.c
@@ -6,9 +6,12 @@
  /* 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 <stdarg.h>

 
 #include "smx_context_sysv_private.h"
 
 #include "smx_context_sysv_private.h"

+#include "xbt/parmap.h"
+#include "simix/private.h"
+#include "gras_config.h"

 
 #ifdef HAVE_VALGRIND_VALGRIND_H
 #  include <valgrind/valgrind.h>
 
 #ifdef HAVE_VALGRIND_VALGRIND_H
 #  include <valgrind/valgrind.h>


@@ -23,42 +26,76 @@
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_context);
 
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_context);
 

+static xbt_parmap_t parmap;
+

 static smx_context_t
 smx_ctx_sysv_create_context(xbt_main_func_t code, int argc, char **argv,
 static smx_context_t
 smx_ctx_sysv_create_context(xbt_main_func_t code, int argc, char **argv,

-    void_pfn_smxprocess_t cleanup_func,
-    smx_process_t process);
-
-
-static void smx_ctx_sysv_wrapper(smx_ctx_sysv_t context);
+    void_pfn_smxprocess_t cleanup_func, void* data);
+
+static void smx_ctx_sysv_wrapper(int count, ...);
+
+/* This is a bit paranoid about SIZEOF_VOIDP not being a multiple of SIZEOF_INT,
+ * but it doesn't harm. */
+#define CTX_ADDR_LEN (SIZEOF_VOIDP / SIZEOF_INT + !!(SIZEOF_VOIDP % SIZEOF_INT))
+union u_ctx_addr {
+  void *addr;
+  int intv[CTX_ADDR_LEN];
+};
+#if (CTX_ADDR_LEN == 1)
+#  define CTX_ADDR_SPLIT(u) (u).intv[0]
+#elif (CTX_ADDR_LEN == 2)
+#  define CTX_ADDR_SPLIT(u) (u).intv[0], (u).intv[1]
+#else
+#  error Your architecture is not supported yet
+#endif

 
 

-void SIMIX_ctx_sysv_factory_init(smx_context_factory_t * factory)
+void SIMIX_ctx_sysv_factory_init(smx_context_factory_t *factory)

 {
 {

-

   smx_ctx_base_factory_init(factory);
   smx_ctx_base_factory_init(factory);

+  VERB0("Activating SYSV context factory");

 
 

+  (*factory)->finalize = smx_ctx_sysv_factory_finalize;

   (*factory)->create_context = smx_ctx_sysv_create_context;
   /* Do not overload that method (*factory)->finalize */
   (*factory)->free = smx_ctx_sysv_free;
   (*factory)->stop = smx_ctx_sysv_stop;
   (*factory)->suspend = smx_ctx_sysv_suspend;
   (*factory)->create_context = smx_ctx_sysv_create_context;
   /* Do not overload that method (*factory)->finalize */
   (*factory)->free = smx_ctx_sysv_free;
   (*factory)->stop = smx_ctx_sysv_stop;
   (*factory)->suspend = smx_ctx_sysv_suspend;

-  (*factory)->runall = smx_ctx_sysv_runall;

   (*factory)->name = "smx_sysv_context_factory";
   (*factory)->name = "smx_sysv_context_factory";

+
+  if (smx_parallel_contexts) {
+#ifdef CONTEXT_THREADS /* To use parallel ucontexts a thread pool is needed */
+    parmap = xbt_parmap_new(2);
+    (*factory)->runall = smx_ctx_sysv_runall_parallel;
+    (*factory)->self = smx_ctx_sysv_self_parallel;
+#else
+    THROW0(arg_error, 0, "No thread support for parallel context execution");
+#endif
+  }else{
+    (*factory)->runall = smx_ctx_sysv_runall;
+  }    
+}
+
+int smx_ctx_sysv_factory_finalize(smx_context_factory_t *factory)
+{ 
+  if(parmap)
+    xbt_parmap_destroy(parmap);
+  return smx_ctx_base_factory_finalize(factory);

 }
 
 smx_context_t
 smx_ctx_sysv_create_context_sized(size_t size, xbt_main_func_t code,
                                   int argc, char **argv,
                                   void_pfn_smxprocess_t cleanup_func,
 }
 
 smx_context_t
 smx_ctx_sysv_create_context_sized(size_t size, xbt_main_func_t code,
                                   int argc, char **argv,
                                   void_pfn_smxprocess_t cleanup_func,

-                                  smx_process_t process)
+                                  void *data)

 {
 {

-
+  union u_ctx_addr ctx_addr;

   smx_ctx_sysv_t context =
       (smx_ctx_sysv_t) smx_ctx_base_factory_create_context_sized(size,
                                                                  code,
                                                                  argc,
                                                                  argv,
                                                                  cleanup_func,
   smx_ctx_sysv_t context =
       (smx_ctx_sysv_t) smx_ctx_base_factory_create_context_sized(size,
                                                                  code,
                                                                  argc,
                                                                  argv,
                                                                  cleanup_func,

-                                                                 process);
+                                                                 data);

 
   /* If the user provided a function for the process then use it
      otherwise is the context for maestro */
 
   /* If the user provided a function for the process then use it
      otherwise is the context for maestro */


@@ -82,9 +119,11 @@ smx_ctx_sysv_create_context_sized(size_t size, xbt_main_func_t code,
                                 ((char *) context->uc.uc_stack.ss_sp) +
                                 context->uc.uc_stack.ss_size);
 #endif                          /* HAVE_VALGRIND_VALGRIND_H */
                                 ((char *) context->uc.uc_stack.ss_sp) +
                                 context->uc.uc_stack.ss_size);
 #endif                          /* HAVE_VALGRIND_VALGRIND_H */

-
-    makecontext(&((smx_ctx_sysv_t) context)->uc, (void (*)())smx_ctx_sysv_wrapper,
-                sizeof(void*)/sizeof(int), context);
+    ctx_addr.addr = context;
+    makecontext(&context->uc, (void (*)())smx_ctx_sysv_wrapper,
+                CTX_ADDR_LEN, CTX_ADDR_SPLIT(ctx_addr));
+  }else{
+    maestro_context = context;

   }
 
   return (smx_context_t) context;
   }
 
   return (smx_context_t) context;


@@ -94,12 +133,12 @@ smx_ctx_sysv_create_context_sized(size_t size, xbt_main_func_t code,
 static smx_context_t
 smx_ctx_sysv_create_context(xbt_main_func_t code, int argc, char **argv,
     void_pfn_smxprocess_t cleanup_func,
 static smx_context_t
 smx_ctx_sysv_create_context(xbt_main_func_t code, int argc, char **argv,
     void_pfn_smxprocess_t cleanup_func,

-    smx_process_t process)
+    void *data)

 {
 
   return smx_ctx_sysv_create_context_sized(sizeof(s_smx_ctx_sysv_t),
                                            code, argc, argv, cleanup_func,
 {
 
   return smx_ctx_sysv_create_context_sized(sizeof(s_smx_ctx_sysv_t),
                                            code, argc, argv, cleanup_func,

-                                           process);
+                                           data);

 
 }
 
 
 }
 


@@ -120,12 +159,24 @@ void smx_ctx_sysv_free(smx_context_t context)
 void smx_ctx_sysv_stop(smx_context_t context)
 {
   smx_ctx_base_stop(context);
 void smx_ctx_sysv_stop(smx_context_t context)
 {
   smx_ctx_base_stop(context);

-

   smx_ctx_sysv_suspend(context);
 }
 
   smx_ctx_sysv_suspend(context);
 }
 

-void smx_ctx_sysv_wrapper(smx_ctx_sysv_t context)
+void smx_ctx_sysv_wrapper(int first, ...)

 { 
 { 

+  union u_ctx_addr ctx_addr;
+  smx_ctx_sysv_t context;
+
+  ctx_addr.intv[0] = first;
+  if (CTX_ADDR_LEN > 1) {
+    va_list ap;
+    int i;
+    va_start(ap, first);
+    for(i = 1; i < CTX_ADDR_LEN; i++)
+      ctx_addr.intv[i] = va_arg(ap, int);
+    va_end(ap);
+  }
+  context = ctx_addr.addr;

   (context->super.code) (context->super.argc, context->super.argv);
 
   smx_ctx_sysv_stop((smx_context_t) context);
   (context->super.code) (context->super.argc, context->super.argv);
 
   smx_ctx_sysv_stop((smx_context_t) context);


@@ -133,31 +184,50 @@ void smx_ctx_sysv_wrapper(smx_ctx_sysv_t context)
 
 void smx_ctx_sysv_suspend(smx_context_t context)
 {
 
 void smx_ctx_sysv_suspend(smx_context_t context)
 {

-  ucontext_t maestro_ctx =
-      ((smx_ctx_sysv_t) simix_global->maestro_process->context)->uc;
-
-  int rv = swapcontext(&((smx_ctx_sysv_t) context)->uc, &maestro_ctx);
+  smx_current_context = (smx_context_t)maestro_context;
+  int rv = swapcontext(&((smx_ctx_sysv_t) context)->uc, &((smx_ctx_sysv_t)context)->old_uc);

 
   xbt_assert0((rv == 0), "Context swapping failure");
 }
 
 
   xbt_assert0((rv == 0), "Context swapping failure");
 }
 

-void smx_ctx_sysv_resume(smx_context_t new_context)
+void smx_ctx_sysv_resume(smx_context_t context)

 {
 {

-  smx_ctx_sysv_t maestro =
-      (smx_ctx_sysv_t) simix_global->maestro_process->context;
-
-  int rv =
-      swapcontext(&(maestro->uc), &((smx_ctx_sysv_t) new_context)->uc);
+  smx_current_context = context; 
+  int rv = swapcontext(&((smx_ctx_sysv_t)context)->old_uc, &((smx_ctx_sysv_t) context)->uc);

 
   xbt_assert0((rv == 0), "Context swapping failure");
 }
 
 
   xbt_assert0((rv == 0), "Context swapping failure");
 }
 

-void smx_ctx_sysv_runall(xbt_swag_t processes)
+void smx_ctx_sysv_runall(xbt_dynar_t processes)

 {
   smx_process_t process;
 {
   smx_process_t process;

-  while((process = xbt_swag_extract(processes))){
-    simix_global->current_process = process;
+  unsigned int cursor;
+
+  xbt_dynar_foreach(processes, cursor, process) {
+    DEBUG2("Schedule item %u of %lu",cursor,xbt_dynar_length(processes));

     smx_ctx_sysv_resume(process->context);
     smx_ctx_sysv_resume(process->context);

-    simix_global->current_process = simix_global->maestro_process;

   }
   }

+  xbt_dynar_reset(processes);
+}
+
+void smx_ctx_sysv_resume_parallel(smx_process_t process)
+{
+  smx_context_t context = process->context;
+  xbt_os_thread_set_extra_data(context);
+  int rv = swapcontext(&((smx_ctx_sysv_t)context)->old_uc, &((smx_ctx_sysv_t) context)->uc);
+  xbt_os_thread_set_extra_data(NULL);
+
+  xbt_assert0((rv == 0), "Context swapping failure");
+}
+
+void smx_ctx_sysv_runall_parallel(xbt_dynar_t processes)
+{
+  xbt_parmap_apply(parmap, (void_f_pvoid_t)smx_ctx_sysv_resume_parallel, processes);
+  xbt_dynar_reset(processes);
+}
+
+smx_context_t smx_ctx_sysv_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_context;

 }
 }