X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/07c319ec54d6fc778ee3cc5e75a747242006723e..be90de47c20463008fa55dcafee17d506d10bc92:/src/simix/smx_context_base.c

diff --git a/src/simix/smx_context_base.c b/src/simix/smx_context_base.c
index 2c9a758993..71760301ce 100644
--- a/src/simix/smx_context_base.c
+++ b/src/simix/smx_context_base.c
@@ -1,4 +1,4 @@
-/* context_base - Code factorization accross context switching implementations */
+/* context_base - Code factorization across context switching implementations */
 
 /* Copyright (c) 2010. The SimGrid Team.
  * All rights reserved.                                                     */
@@ -8,11 +8,12 @@
 
 
 #include "xbt/function_types.h"
-#include "smx_context_private.h"
+#include "simix/simix.h"
+#include "simix/context.h"
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(bindings);
 
-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);
@@ -24,6 +25,8 @@ void smx_ctx_base_factory_init(smx_context_factory_t * factory)
   (*factory)->suspend = NULL;
   (*factory)->runall = NULL;
   (*factory)->self = smx_ctx_base_self;
+  (*factory)->get_data = smx_ctx_base_get_data;
+  (*factory)->get_thread_id = smx_ctx_base_get_thread_id;
 
   (*factory)->name = "base context factory";
 }
@@ -40,19 +43,22 @@ smx_ctx_base_factory_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)
 {
   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 */
+  /* 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->process = process;
     context->argc = argc;
     context->argv = argv;
     context->code = code;
+  }else{
+    smx_current_context = context;
   }
+  context->data = data;
 
   return context;
 }
@@ -79,13 +85,23 @@ 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->process);
+    (*(context->cleanup_func)) (context->data);
+  context->iwannadie = 0;
+  SIMIX_req_process_cleanup(context->data);
+}
 
+smx_context_t smx_ctx_base_self(void)
+{
+  return smx_current_context;
 }
 
-smx_process_t smx_ctx_base_self(void)
+void *smx_ctx_base_get_data(smx_context_t context)
 {
-  return simix_global->current_process;
+  return context->data;
+}
+
+int smx_ctx_base_get_thread_id()
+{
+  return 0;
 }