X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ec83ae9a081ffd1d19bfecaf81cb99c32bdf6b83..8d1f73ed29652d96dc7644de4c7cfc64c2e199b4:/src/simix/popping.cpp

diff --git a/src/simix/popping.cpp b/src/simix/popping.cpp
index c488326b8e..2cefef94e6 100644
--- a/src/simix/popping.cpp
+++ b/src/simix/popping.cpp
@@ -1,5 +1,4 @@
-/* Copyright (c) 2010-2015. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2010-2017. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -10,11 +9,11 @@
 #include "src/mc/mc_private.h"
 #endif
 
-#include "src/kernel/activity/SynchroExec.hpp"
-#include "src/kernel/activity/SynchroComm.hpp"
-#include "src/kernel/activity/SynchroSleep.hpp"
-#include "src/kernel/activity/SynchroRaw.hpp"
+#include "src/kernel/activity/CommImpl.hpp"
+#include "src/kernel/activity/ExecImpl.hpp"
+#include "src/kernel/activity/SleepImpl.hpp"
 #include "src/kernel/activity/SynchroIo.hpp"
+#include "src/kernel/activity/SynchroRaw.hpp"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_popping, simix,
                                 "Popping part of SIMIX (transmuting from user request into kernel handlers)");
@@ -25,12 +24,12 @@ void SIMIX_simcall_answer(smx_simcall_t simcall)
     XBT_DEBUG("Answer simcall %s (%d) issued by %s (%p)", SIMIX_simcall_name(simcall->call), (int)simcall->call,
         simcall->issuer->name.c_str(), simcall->issuer);
     simcall->issuer->simcall.call = SIMCALL_NONE;
-/*    This check should be useless and slows everyone. Reactivate if you see something
- *    weird in process scheduling.
- */
-/*    if(!xbt_dynar_member(simix_global->process_to_run, &(simcall->issuer))) */
+    xbt_assert(SIMIX_is_maestro(), "Ugh! This code path is reserved for maestro, but I'm '%s' on '%s'",
+               SIMIX_process_self()->cname(), sg_host_get_name(SIMIX_process_self()->host));
+    /* This check should be useless and slows everyone. Reactivate if you see something weird in process scheduling. */
+    // if (xbt_dynar_member(simix_global->process_to_run, &(simcall->issuer)))
+    //   DIE_IMPOSSIBLE;
     xbt_dynar_push_as(simix_global->process_to_run, smx_actor_t, simcall->issuer);
-/*    else DIE_IMPOSSIBLE; */
   }
 }