X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/52b44ef3895813ad0d582d7aae8658d5a3c2e3b6..033c367624bf9452e84340162d1438a53b2ccc7b:/src/simix/smx_context_sysv.c

diff --git a/src/simix/smx_context_sysv.c b/src/simix/smx_context_sysv.c
index 0248f2840b..41341b63c0 100644
--- a/src/simix/smx_context_sysv.c
+++ b/src/simix/smx_context_sysv.c
@@ -19,14 +19,15 @@
 
 #ifdef _XBT_WIN32
 #include "win32_ucontext.h"
-#include "win32_ucontext.c"
 #else
 #include "ucontext.h"
 #endif
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_context);
 
+#ifdef CONTEXT_THREADS
 static xbt_parmap_t parmap;
+#endif
 
 static smx_context_t
 smx_ctx_sysv_create_context(xbt_main_func_t code, int argc, char **argv,
@@ -34,10 +35,25 @@ smx_ctx_sysv_create_context(xbt_main_func_t code, int argc, char **argv,
 
 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)
 {
   smx_ctx_base_factory_init(factory);
-  VERB0("Activating SYSV context factory");
+  XBT_VERB("Activating SYSV context factory");
 
   (*factory)->finalize = smx_ctx_sysv_factory_finalize;
   (*factory)->create_context = smx_ctx_sysv_create_context;
@@ -47,13 +63,14 @@ void SIMIX_ctx_sysv_factory_init(smx_context_factory_t *factory)
   (*factory)->suspend = smx_ctx_sysv_suspend;
   (*factory)->name = "smx_sysv_context_factory";
 
-  if (smx_parallel_contexts) {
+  if (SIMIX_context_is_parallel()) {
 #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;
+    (*factory)->get_thread_id = smx_ctx_sysv_get_thread_id;
 #else
-    THROW0(arg_error, 0, "No thread support for parallel context execution");
+    THROWF(arg_error, 0, "No thread support for parallel context execution");
 #endif
   }else{
     (*factory)->runall = smx_ctx_sysv_runall;
@@ -62,8 +79,10 @@ void SIMIX_ctx_sysv_factory_init(smx_context_factory_t *factory)
 
 int smx_ctx_sysv_factory_finalize(smx_context_factory_t *factory)
 { 
+#ifdef CONTEXT_THREADS
   if(parmap)
     xbt_parmap_destroy(parmap);
+#endif
   return smx_ctx_base_factory_finalize(factory);
 }
 
@@ -73,7 +92,7 @@ smx_ctx_sysv_create_context_sized(size_t size, xbt_main_func_t code,
                                   void_pfn_smxprocess_t cleanup_func,
                                   void *data)
 {
-  uintptr_t ctx_addr;
+  union u_ctx_addr ctx_addr;
   smx_ctx_sysv_t context =
       (smx_ctx_sysv_t) smx_ctx_base_factory_create_context_sized(size,
                                                                  code,
@@ -86,17 +105,19 @@ smx_ctx_sysv_create_context_sized(size_t size, xbt_main_func_t code,
      otherwise is the context for maestro */
   if (code) {
 
-    xbt_assert2(getcontext(&(context->uc)) == 0,
+    int res;
+    res = getcontext(&(context->uc));
+    xbt_assert(res == 0,
                 "Error in context saving: %d (%s)", errno,
                 strerror(errno));
 
     context->uc.uc_link = NULL;
 
     context->uc.uc_stack.ss_sp =
-        pth_skaddr_makecontext(context->stack, CONTEXT_STACK_SIZE);
+        pth_skaddr_makecontext(context->stack, smx_context_stack_size);
 
     context->uc.uc_stack.ss_size =
-        pth_sksize_makecontext(context->stack, CONTEXT_STACK_SIZE);
+        pth_sksize_makecontext(context->stack, smx_context_stack_size);
 
 #ifdef HAVE_VALGRIND_VALGRIND_H
     context->valgrind_stack_id =
@@ -104,18 +125,9 @@ 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 */
-    ctx_addr = (uintptr_t)context;
-    makecontext(&((smx_ctx_sysv_t) context)->uc, (void (*)())smx_ctx_sysv_wrapper,
-                SIZEOF_VOIDP / SIZEOF_INT + 1, SIZEOF_VOIDP / SIZEOF_INT,
-#if (SIZEOF_VOIDP == SIZEOF_INT)
-                (int)ctx_addr
-#elif (SIZEOF_VOIDP == 2 * SIZEOF_INT)
-                (int)(ctx_addr >> (8 * sizeof(int))),
-                (int)(ctx_addr)
-#else
-#error Your architecture is not supported yet
-#endif
-   );
+    ctx_addr.addr = context;
+    makecontext(&context->uc, (void (*)())smx_ctx_sysv_wrapper,
+                CTX_ADDR_LEN, CTX_ADDR_SPLIT(ctx_addr));
   }else{
     maestro_context = context;
   }
@@ -130,7 +142,7 @@ smx_ctx_sysv_create_context(xbt_main_func_t code, int argc, char **argv,
     void *data)
 {
 
-  return smx_ctx_sysv_create_context_sized(sizeof(s_smx_ctx_sysv_t),
+  return smx_ctx_sysv_create_context_sized(sizeof(s_smx_ctx_sysv_t) + smx_context_stack_size,
                                            code, argc, argv, cleanup_func,
                                            data);
 
@@ -156,24 +168,21 @@ void smx_ctx_sysv_stop(smx_context_t context)
   smx_ctx_sysv_suspend(context);
 }
 
-void smx_ctx_sysv_wrapper(int count, ...)
+void smx_ctx_sysv_wrapper(int first, ...)
 { 
-  uintptr_t ctx_addr = 0;
-  va_list ap;
+  union u_ctx_addr ctx_addr;
   smx_ctx_sysv_t context;
 
-  va_start(ap, count);
-#if (SIZEOF_VOIDP <= SIZEOF_INT)
-  ctx_addr = (uintptr_t)va_arg(ap, int);
-#else
-  int i;
-  for(i = 0; i < count; i++) {
-     ctx_addr <<= 8*sizeof(int);
-     ctx_addr |= (uintptr_t)va_arg(ap, int);
+  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);
   }
-#endif
-  va_end(ap);
-  context = (smx_ctx_sysv_t)ctx_addr;
+  context = ctx_addr.addr;
   (context->super.code) (context->super.argc, context->super.argv);
 
   smx_ctx_sysv_stop((smx_context_t) context);
@@ -182,17 +191,19 @@ void smx_ctx_sysv_wrapper(int count, ...)
 void smx_ctx_sysv_suspend(smx_context_t context)
 {
   smx_current_context = (smx_context_t)maestro_context;
-  int rv = swapcontext(&((smx_ctx_sysv_t) context)->uc, &((smx_ctx_sysv_t)context)->old_uc);
+  int rv;
+  rv = swapcontext(&((smx_ctx_sysv_t) context)->uc, &((smx_ctx_sysv_t)context)->old_uc);
 
-  xbt_assert0((rv == 0), "Context swapping failure");
+  xbt_assert((rv == 0), "Context swapping failure");
 }
 
 void smx_ctx_sysv_resume(smx_context_t context)
 {
   smx_current_context = context; 
-  int rv = swapcontext(&((smx_ctx_sysv_t)context)->old_uc, &((smx_ctx_sysv_t) context)->uc);
+  int rv;
+  rv = swapcontext(&((smx_ctx_sysv_t)context)->old_uc, &((smx_ctx_sysv_t) context)->uc);
 
-  xbt_assert0((rv == 0), "Context swapping failure");
+  xbt_assert((rv == 0), "Context swapping failure");
 }
 
 void smx_ctx_sysv_runall(xbt_dynar_t processes)
@@ -201,7 +212,7 @@ void smx_ctx_sysv_runall(xbt_dynar_t processes)
   unsigned int cursor;
 
   xbt_dynar_foreach(processes, cursor, process) {
-    DEBUG2("Schedule item %u of %lu",cursor,xbt_dynar_length(processes));
+    XBT_DEBUG("Schedule item %u of %lu",cursor,xbt_dynar_length(processes));
     smx_ctx_sysv_resume(process->context);
   }
   xbt_dynar_reset(processes);
@@ -210,21 +221,30 @@ void smx_ctx_sysv_runall(xbt_dynar_t 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);
+  smx_current_context = (smx_context_t)context;
+  int rv;
+  rv = swapcontext(&((smx_ctx_sysv_t)context)->old_uc, &((smx_ctx_sysv_t) context)->uc);
+  smx_current_context = (smx_context_t)maestro_context;
 
-  xbt_assert0((rv == 0), "Context swapping failure");
+  xbt_assert((rv == 0), "Context swapping failure");
 }
 
 void smx_ctx_sysv_runall_parallel(xbt_dynar_t processes)
 {
+#ifdef CONTEXT_THREADS
   xbt_parmap_apply(parmap, (void_f_pvoid_t)smx_ctx_sysv_resume_parallel, processes);
+#endif
   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;
+  /*smx_context_t self_context = (smx_context_t) xbt_os_thread_get_extra_data();
+  return self_context ? self_context : (smx_context_t) maestro_context;*/
+  return smx_current_context;
+}
+
+int smx_ctx_sysv_get_thread_id(void)
+{
+  return (int)(unsigned long)xbt_os_thread_get_extra_data();
 }