X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/cc4ca208c5e056ac569cd07e08f09a416f3606fe..28cf1594ef109bb3cd215fd9b0f16a5418ca999e:/src/simix/popping_bodies.cpp

diff --git a/src/simix/popping_bodies.cpp b/src/simix/popping_bodies.cpp
index f616cf57b7..c0f8318125 100644
--- 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,20 +37,6 @@ 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)
-{
-  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);
-}
-
-inline static void simcall_BODY_process_cleanup(smx_actor_t process)
-{
-  if (0) /* Go to that function to follow the code flow through the simcall barrier */
-    SIMIX_process_cleanup(process);
-  return simcall<void, smx_actor_t>(SIMCALL_PROCESS_CLEANUP, process);
-}
-
 inline static void simcall_BODY_process_suspend(smx_actor_t process)
 {
   if (0) /* Go to that function to follow the code flow through the simcall barrier */
@@ -75,7 +62,7 @@ inline static boost::intrusive_ptr<simgrid::kernel::activity::ExecImpl>
 simcall_BODY_execution_start(const char* name, double flops_amount, double priority, double bound, sg_host_t host)
 {
   if (0) /* Go to that function to follow the code flow through the simcall barrier */
-    simcall_HANDLER_execution_start(&SIMIX_process_self()->simcall, name, flops_amount, priority, bound, host);
+    SIMIX_execution_start(name, flops_amount, priority, bound, host);
   return simcall<boost::intrusive_ptr<simgrid::kernel::activity::ExecImpl>, const char*, double, double, double,
                  sg_host_t>(SIMCALL_EXECUTION_START, name, flops_amount, priority, bound, host);
 }
@@ -199,13 +186,6 @@ inline static smx_cond_t simcall_BODY_cond_init()
   return simcall<smx_cond_t>(SIMCALL_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);
-  return simcall<void, smx_cond_t>(SIMCALL_COND_SIGNAL, cond);
-}
-
 inline static void simcall_BODY_cond_wait(smx_cond_t cond, smx_mutex_t mutex)
 {
   if (0) /* Go to that function to follow the code flow through the simcall barrier */
@@ -220,13 +200,6 @@ inline static void simcall_BODY_cond_wait_timeout(smx_cond_t cond, smx_mutex_t m
   return simcall<void, smx_cond_t, smx_mutex_t, double>(SIMCALL_COND_WAIT_TIMEOUT, cond, mutex, timeout);
 }
 
-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);
-  return simcall<void, smx_cond_t>(SIMCALL_COND_BROADCAST, cond);
-}
-
 inline static void simcall_BODY_sem_acquire(smx_sem_t sem)
 {
   if (0) /* Go to that function to follow the code flow through the simcall barrier */