X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/fe503dfa41c532a17a4fc3f6b244e72e7783d386..b10171365eb016397cbe20e1bed5d02be72634e8:/src/simix/popping_bodies.cpp diff --git a/src/simix/popping_bodies.cpp b/src/simix/popping_bodies.cpp index 270cdc7d90..458aa720cb 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. */ /**********************************************************************/ /* @@ -14,8 +14,9 @@ * That's not about http://en.wikipedia.org/wiki/Poop, despite the odor :) */ -#include "smx_private.h" +#include "smx_private.hpp" #include "src/mc/mc_forward.hpp" +#include "src/simix/smx_synchro_private.hpp" #include "xbt/ex.h" #include #include @@ -36,18 +37,11 @@ inline static R simcall(e_smx_simcall_t call, T const&... t) return simgrid::simix::unmarshal(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(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(SIMCALL_PROCESS_CLEANUP, process); + simcall_HANDLER_process_killall(&SIMIX_process_self()->simcall); + return simcall(SIMCALL_PROCESS_KILLALL); } inline static void simcall_BODY_process_suspend(smx_actor_t process) @@ -71,11 +65,13 @@ inline static int simcall_BODY_process_sleep(double duration) return simcall(SIMCALL_PROCESS_SLEEP, duration); } -inline static boost::intrusive_ptr simcall_BODY_execution_start(const char* name, double flops_amount, double priority, double bound) +inline static boost::intrusive_ptr +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); - return simcall, const char*, double, double, double>(SIMCALL_EXECUTION_START, name, flops_amount, priority, bound); + SIMIX_execution_start(name, flops_amount, priority, bound, host); + return simcall, const char*, double, double, double, + sg_host_t>(SIMCALL_EXECUTION_START, name, flops_amount, priority, bound, host); } inline static boost::intrusive_ptr simcall_BODY_execution_parallel_start(const char* name, int host_nb, sg_host_t* host_list, double* flops_amount, double* bytes_amount, double rate, double timeout) @@ -92,6 +88,13 @@ inline static int simcall_BODY_execution_wait(boost::intrusive_ptr>(SIMCALL_EXECUTION_WAIT, execution); } +inline static int simcall_BODY_execution_test(boost::intrusive_ptr execution) +{ + if (0) /* Go to that function to follow the code flow through the simcall barrier */ + simcall_HANDLER_execution_test(&SIMIX_process_self()->simcall, execution); + return simcall>(SIMCALL_EXECUTION_TEST, execution); +} + inline static void simcall_BODY_process_on_exit(smx_actor_t process, int_f_pvoid_pvoid_t fun, void* data) { if (0) /* Go to that function to follow the code flow through the simcall barrier */ @@ -190,13 +193,6 @@ inline static smx_cond_t simcall_BODY_cond_init() return simcall(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(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 */ @@ -211,13 +207,6 @@ inline static void simcall_BODY_cond_wait_timeout(smx_cond_t cond, smx_mutex_t m return simcall(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(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 */ @@ -232,18 +221,18 @@ inline static void simcall_BODY_sem_acquire_timeout(smx_sem_t sem, double timeou return simcall(SIMCALL_SEM_ACQUIRE_TIMEOUT, sem, timeout); } -inline static sg_size_t simcall_BODY_file_read(surf_file_t fd, sg_size_t size) +inline static sg_size_t simcall_BODY_storage_read(surf_storage_t st, sg_size_t size) { if (0) /* Go to that function to follow the code flow through the simcall barrier */ - simcall_HANDLER_file_read(&SIMIX_process_self()->simcall, fd, size); - return simcall(SIMCALL_FILE_READ, fd, size); + simcall_HANDLER_storage_read(&SIMIX_process_self()->simcall, st, size); + return simcall(SIMCALL_STORAGE_READ, st, size); } -inline static sg_size_t simcall_BODY_file_write(surf_file_t fd, sg_size_t size) +inline static sg_size_t simcall_BODY_storage_write(surf_storage_t st, sg_size_t size) { if (0) /* Go to that function to follow the code flow through the simcall barrier */ - simcall_HANDLER_file_write(&SIMIX_process_self()->simcall, fd, size); - return simcall(SIMCALL_FILE_WRITE, fd, size); + simcall_HANDLER_storage_write(&SIMIX_process_self()->simcall, st, size); + return simcall(SIMCALL_STORAGE_WRITE, st, size); } inline static int simcall_BODY_mc_random(int min, int max)