X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2d2995483b57463581ffdc4365fe1999ddc306c2..2a7d4ad7f01f69f55791fe640630ef269a2f9770:/src/simix/popping.cpp

diff --git a/src/simix/popping.cpp b/src/simix/popping.cpp
index 7d94291d56..21a1331021 100644
--- a/src/simix/popping.cpp
+++ b/src/simix/popping.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010-2018. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2010-2019. 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. */
@@ -14,22 +14,14 @@ 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->get_cname(), simcall->issuer);
     simcall->issuer->simcall.call = SIMCALL_NONE;
-#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);
+    xbt_assert(not XBT_LOG_ISENABLED(simix_popping, xbt_log_priority_debug) ||
+                   std::find(begin(simix_global->actors_to_run), end(simix_global->actors_to_run), simcall->issuer) ==
+                       end(simix_global->actors_to_run),
+               "Actor %p should not exist in actors_to_run!", simcall->issuer);
+    simix_global->actors_to_run.push_back(simcall->issuer);
   }
 }
 
-void SIMIX_simcall_exit(smx_activity_t activity)
-{
-  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)
 {
   (*code)();
@@ -37,7 +29,7 @@ void SIMIX_run_kernel(std::function<void()> const* code)
 
 /** Kernel code for run_blocking
  *
- * The implementtion looks a lot like SIMIX_run_kernel ^^
+ * The implementation looks a lot like SIMIX_run_kernel ^^
  *
  * However, this `run_blocking` is blocking so the process will not be woken
  * up until `SIMIX_simcall_answer(simcall)`` is called by the kernel.