X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f540320e2e4fd4fe5c9cb1bf8a4b1c0a972082e6..5e7d79b763a5f55d1afb579d2b5a8d30ccfe869c:/src/simix/popping.cpp

diff --git a/src/simix/popping.cpp b/src/simix/popping.cpp
index 1e59de2aa4..daeacbdd67 100644
--- a/src/simix/popping.cpp
+++ b/src/simix/popping.cpp
@@ -1,21 +1,19 @@
-/* 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. */
 
-#include "smx_private.h"
-#include "xbt/fifo.h"
+#include "smx_private.hpp"
 #include "xbt/xbt_os_thread.h"
-#if HAVE_MC
-#include "src/mc/mc_private.h"
+#if SIMGRID_HAVE_MC
+#include "src/mc/mc_private.hpp"
 #endif
 
-#include "src/synchro/SynchroExec.hpp"
-#include "src/synchro/SynchroComm.hpp"
-#include "src/synchro/SynchroSleep.hpp"
-#include "src/synchro/SynchroRaw.hpp"
-#include "src/synchro/SynchroIo.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)");
@@ -26,18 +24,20 @@ 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_dynar_push_as(simix_global->process_to_run, smx_process_t, simcall->issuer);
-/*    else DIE_IMPOSSIBLE; */
+#if 0
+    /* This check should be useless and slows everyone. Reactivate if you see something weird in process scheduling. */
+    if (std::find(begin(simix_global->process_to_run), end(simix_global->process_to_run), simcall->issuer) !=
+        end(simix_global->process_to_run))
+      DIE_IMPOSSIBLE;
+#endif
+    simix_global->process_to_run.push_back(simcall->issuer);
   }
 }
 
-void SIMIX_simcall_exit(smx_synchro_t synchro)
+void SIMIX_simcall_exit(smx_activity_t activity)
 {
-  synchro->post();
+  if (activity != nullptr) // When migrating, the surf activity is disconnected from its simix activity before cancel
+    activity->post();
 }
 
 void SIMIX_run_kernel(std::function<void()> const* code)