From 6a1855aaf9f340988d627b080607edae34c7f355 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Tue, 12 Jan 2016 00:53:14 +0100 Subject: [PATCH 1/1] 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. --- src/simix/smx_global.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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; +} -- 2.20.1