Bugfix: Protect SIMIX_process_self in the case that the context module is not yet...

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

diff --git a/src/simix/smx_process.c b/src/simix/smx_process.c
index c1f19e1..f22b2cc 100644 (file)
--- a/src/simix/smx_process.c
+++ b/src/simix/smx_process.c
@@ -9,6 +9,7 @@
 #include "xbt/log.h"
 #include "xbt/dict.h"
 #include "msg/mailbox.h"
+#include "mc/mc.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_process, simix,
                                 "Logging specific to SIMIX (process)");
@@ -24,10 +25,9 @@ static unsigned long simix_process_count = 0;
  */
 XBT_INLINE smx_process_t SIMIX_process_self(void)
 {
-  if (simix_global)
-    return SIMIX_context_get_data(SIMIX_context_self());
+  smx_context_t self_context = SIMIX_context_self();
 
-  return NULL;
+  return self_context ? SIMIX_context_get_data(self_context) : NULL;
 }
 
 /**
@@ -152,7 +152,6 @@ smx_process_t SIMIX_process_create(const char *name,
     process->pid = simix_process_count++;
     process->name = xbt_strdup(name);
     process->smx_host = host;
-    process->iwannadie = 0;
     process->data = data;
 
     VERB1("Create context %s", process->name);
@@ -191,7 +190,7 @@ void SIMIX_process_kill(smx_process_t process, smx_process_t killer) {
 
   DEBUG2("Killing process %s on %s", process->name, process->smx_host->name);
 
-  process->iwannadie = 1;
+  process->context->iwannadie = 1;
   process->blocked = 0;
   process->suspended = 0;
   /* FIXME: set doexception to 0 also? */
@@ -413,12 +412,10 @@ xbt_dict_t SIMIX_process_get_properties(smx_process_t process)
 
 void SIMIX_pre_process_sleep(smx_req_t req)
 {
-#ifdef HAVE_MC
-  if(_surf_do_model_check){
+  if (MC_IS_ENABLED) {
     req->process_sleep.result = SIMIX_DONE;
     SIMIX_request_answer(req);
   }
-#endif
   smx_action_t action = SIMIX_process_sleep(req->issuer, req->process_sleep.duration);
   xbt_fifo_push(action->request_list, req);
   req->issuer->waiting_action = action;
@@ -508,7 +505,7 @@ void SIMIX_process_yield(void)
   /* Ok, maestro returned control to us */
   DEBUG1("Maestro returned control to me: '%s'", self->name);
 
-  if (self->iwannadie)
+  if (self->context->iwannadie)
     SIMIX_context_stop(self->context);
 
   if (self->doexception) {
@@ -530,3 +527,10 @@ void SIMIX_process_exception_terminate(xbt_ex_t * e)
   xbt_ex_display(e);
   abort();
 }
+
+smx_context_t SIMIX_process_get_context(smx_process_t p) {
+  return p->context;
+}
+void SIMIX_process_set_context(smx_process_t p,smx_context_t c) {
+  p->context = c;
+}