From: Martin Quinson <martin.quinson@loria.fr>
Date: Mon, 11 Jan 2016 23:53:14 +0000 (+0100)
Subject: Make sg_* functions callable from simdag
X-Git-Tag: v3_13~1274
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/6a1855aaf9f340988d627b080607edae34c7f355

Make sg_* functions callable from simdag

There was an issue when they were doing a simcall, but now, every
simdag simulation is supposed to run in maestro context.
---

diff --git a/src/simix/smx_global.cpp b/src/simix/smx_global.cpp
index be74fbf712..ea12e3d477 100644
--- a/src/simix/smx_global.cpp
+++ b/src/simix/smx_global.cpp
@@ -702,5 +702,5 @@ xbt_dict_t SIMIX_asr_get_properties(const char *name)
 
 int SIMIX_is_maestro()
 {
-  return SIMIX_process_self() == simix_global->maestro_process;
-}
\ No newline at end of file
+  return simix_global==NULL /*SimDag*/|| SIMIX_process_self() == simix_global->maestro_process;
+}