Remove superfluous indirection.

[simgrid.git] / src / simix / popping_bodies.cpp

diff --git a/src/simix/popping_bodies.cpp b/src/simix/popping_bodies.cpp
index 8bae553..9914be1 100644 (file)
--- a/src/simix/popping_bodies.cpp
+++ b/src/simix/popping_bodies.cpp
@@ -4,7 +4,7 @@
 /*                    DO NOT EVER CHANGE THIS FILE                    */
 /*                                                                    */
 /* change simcalls specification in src/simix/simcalls.in             */
-/* Copyright (c) 2014-2017. The SimGrid Team. All rights reserved.    */
+/* Copyright (c) 2014-2018. The SimGrid Team. All rights reserved.    */
 /**********************************************************************/
 
 /*
@@ -16,6 +16,7 @@
 
 #include "smx_private.hpp"
 #include "src/mc/mc_forward.hpp"
+#include "src/simix/smx_synchro_private.hpp"
 #include "xbt/ex.h"
 #include <functional>
 #include <simgrid/simix.hpp>
@@ -36,11 +37,11 @@ inline static R simcall(e_smx_simcall_t call, T const&... t)
   return simgrid::simix::unmarshal<R>(self->simcall.result);
 }
 
-inline static void simcall_BODY_process_killall(int reset_pid)
+inline static void simcall_BODY_process_killall()
 {
   if (0) /* Go to that function to follow the code flow through the simcall barrier */
-    simcall_HANDLER_process_killall(&SIMIX_process_self()->simcall, reset_pid);
-  return simcall<void, int>(SIMCALL_PROCESS_KILLALL, reset_pid);
+    simcall_HANDLER_process_killall(&SIMIX_process_self()->simcall);
+  return simcall<void>(SIMCALL_PROCESS_KILLALL);
 }
 
 inline static void simcall_BODY_process_cleanup(smx_actor_t process)
@@ -202,7 +203,7 @@ inline static smx_cond_t simcall_BODY_cond_init()
 inline static void simcall_BODY_cond_signal(smx_cond_t cond)
 {
   if (0) /* Go to that function to follow the code flow through the simcall barrier */
-    SIMIX_cond_signal(cond);
+    simcall_HANDLER_cond_signal(&SIMIX_process_self()->simcall, cond);
   return simcall<void, smx_cond_t>(SIMCALL_COND_SIGNAL, cond);
 }
 
@@ -223,7 +224,7 @@ inline static void simcall_BODY_cond_wait_timeout(smx_cond_t cond, smx_mutex_t m
 inline static void simcall_BODY_cond_broadcast(smx_cond_t cond)
 {
   if (0) /* Go to that function to follow the code flow through the simcall barrier */
-    SIMIX_cond_broadcast(cond);
+    simcall_HANDLER_cond_broadcast(&SIMIX_process_self()->simcall, cond);
   return simcall<void, smx_cond_t>(SIMCALL_COND_BROADCAST, cond);
 }