X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/559c8d89e5ac9f924f963c9a70fbe475a15641c2..1f93c68826a603920598b8a75f9583c19192b952:/src/simix/simcalls.py

diff --git a/src/simix/simcalls.py b/src/simix/simcalls.py
index f2696f7338..fb346f8d8f 100755
--- a/src/simix/simcalls.py
+++ b/src/simix/simcalls.py
@@ -314,7 +314,7 @@ if __name__ == '__main__':
     fd.write('#include "src/mc/mc_forward.hpp"\n')
     fd.write('#endif\n')
     fd.write('#include "src/kernel/activity/ConditionVariableImpl.hpp"\n')
-    fd.write('#include "src/mc/checker/SimcallObserver.hpp"\n')
+    fd.write('#include "src/kernel/actor/SimcallObserver.hpp"\n')
 
     fd.write('\n')
     fd.write('XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_popping);\n\n')
@@ -336,7 +336,7 @@ if __name__ == '__main__':
     fd.write(' */\n')
     fd.write('void simgrid::kernel::actor::ActorImpl::simcall_handle(int times_considered)\n')
     fd.write('{\n')
-    fd.write('  XBT_DEBUG("Handling simcall %p: %s", &simcall_, SIMIX_simcall_name(simcall_.call_));\n')
+    fd.write('  XBT_DEBUG("Handling simcall %p: %s", &simcall_, SIMIX_simcall_name(simcall_));\n')
     fd.write('  simcall_.mc_value_ = times_considered;\n')
     fd.write('  if (simcall_.observer_ != nullptr)\n')
     fd.write('    simcall_.observer_->prepare(times_considered);\n')
@@ -380,9 +380,8 @@ inline static R simcall(Simcall call, T const&... t)
 {
   smx_actor_t self = SIMIX_process_self();
   simgrid::simix::marshal(&self->simcall_, call, t...);
-  if (self != simix_global->maestro_) {
-    XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->get_cname(), SIMIX_simcall_name(self->simcall_.call_),
-              (int)self->simcall_.call_);
+  if (not simix_global->is_maestro(self)) {
+    XBT_DEBUG("Yield process '%s' on simcall %s", self->get_cname(), SIMIX_simcall_name(self->simcall_));
     self->yield();
   } else {
     self->simcall_handle(0);