Fix initialization order.

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

diff --git a/src/simix/smx_context_base.c b/src/simix/smx_context_base.c
index fe09611..7d386c9 100644 (file)
--- a/src/simix/smx_context_base.c
+++ b/src/simix/smx_context_base.c
@@ -1,6 +1,6 @@
-/* context_base - Code factorization accross context switching implementations */
+/* context_base - Code factorization across context switching implementations */
 
-/* Copyright (c) 2010. The SimGrid Team.
+/* Copyright (c) 2010-2013. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -8,11 +8,13 @@
 
 
 #include "xbt/function_types.h"
-#include "smx_context_private.h"
+#include "simgrid/simix.h"
+#include "smx_private.h"
+#include "mc/mc.h"
 
-XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(bindings);
+XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_context);
 
-void smx_ctx_base_factory_init(smx_context_factory_t * factory)
+void smx_ctx_base_factory_init(smx_context_factory_t *factory)
 {
   /* instantiate the context factory */
   *factory = xbt_new0(s_smx_context_factory_t, 1);
@@ -22,7 +24,9 @@ void smx_ctx_base_factory_init(smx_context_factory_t * factory)
   (*factory)->free = smx_ctx_base_free;
   (*factory)->stop = smx_ctx_base_stop;
   (*factory)->suspend = NULL;
-  (*factory)->resume = NULL;
+  (*factory)->runall = NULL;
+  (*factory)->self = smx_ctx_base_self;
+  (*factory)->get_data = smx_ctx_base_get_data;
 
   (*factory)->name = "base context factory";
 }
@@ -38,20 +42,27 @@ smx_context_t
 smx_ctx_base_factory_create_context_sized(size_t size,
                                           xbt_main_func_t code, int argc,
                                           char **argv,
-                                          void_f_pvoid_t cleanup_func,
-                                          void *cleanup_arg)
+                                          void_pfn_smxprocess_t cleanup_func,
+                                          void *data)
 {
   smx_context_t context = xbt_malloc0(size);
 
-  /* If the user provided a function for the process then use it
-     otherwise is the context for maestro */
+  /* Store the address of the stack in heap to compare it apart of heap comparison */
+  if(MC_is_active())
+    MC_ignore_heap(context, size);
+
+  /* If the user provided a function for the process then use it.
+     Otherwise, it is the context for maestro and we should set it as the
+     current context */
   if (code) {
     context->cleanup_func = cleanup_func;
-    context->cleanup_arg = cleanup_arg;
     context->argc = argc;
     context->argv = argv;
     context->code = code;
+  } else {
+    SIMIX_context_set_current(context);
   }
+  context->data = data;
 
   return context;
 }
@@ -59,14 +70,12 @@ smx_ctx_base_factory_create_context_sized(size_t size,
 void smx_ctx_base_free(smx_context_t context)
 {
   int i;
-
   if (context) {
 
     /* free argv */
     if (context->argv) {
       for (i = 0; i < context->argc; i++)
-        if (context->argv[i])
-          free(context->argv[i]);
+        free(context->argv[i]);
 
       free(context->argv);
     }
@@ -78,8 +87,19 @@ void smx_ctx_base_free(smx_context_t context)
 
 void smx_ctx_base_stop(smx_context_t context)
 {
-
   if (context->cleanup_func)
-    (*(context->cleanup_func)) (context->cleanup_arg);
+    context->cleanup_func(context->data);
+  context->iwannadie = 0;
+  simcall_process_cleanup(context->data);
+  context->iwannadie = 1;
+}
 
+smx_context_t smx_ctx_base_self(void)
+{
+  return SIMIX_context_get_current();
+}
+
+void *smx_ctx_base_get_data(smx_context_t context)
+{
+  return context->data;
 }