X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1bfdc9a38c22af6a9becf133be154a2fa2bc6589..60059959d6d517261ca7f4176b0267bc37caf04d:/src/simix/smx_user.c diff --git a/src/simix/smx_user.c b/src/simix/smx_user.c index 700e2e3c4b..8d80aa3d0f 100644 --- a/src/simix/smx_user.c +++ b/src/simix/smx_user.c @@ -7,19 +7,13 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include "smx_private.h" -#include "mc/mc.h" +#include "mc/mc_interface.h" #include "xbt/ex.h" #include /* isfinite() */ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix); -/* generate strings from the enumeration values */ -static const char* simcall_names[] = { -#include "simcalls_generated_string.c" -[SIMCALL_NONE] = "NONE" -}; - -#include "simcalls_generated_body.c" +#include "popping_bodies.c" /** * \ingroup simix_host_management @@ -197,7 +191,6 @@ int simcall_host_get_nb_pstates(smx_host_t host) * * \param host A SIMIX host * \param pstate_index The pstate to which the CPU power will be set - * \return void */ void simcall_host_set_power_peak_at(smx_host_t host, int pstate_index) { @@ -399,7 +392,6 @@ e_smx_state_t simcall_host_execution_wait(smx_action_t execution) * \return The host object of the VM */ void* simcall_vm_create(const char *name, smx_host_t phys_host){ - /* will jump to SIMIX_pre_vm_create() in src/simix/smx_smurf_private.h */ return simcall_BODY_vm_create(name, phys_host); } @@ -411,7 +403,6 @@ void* simcall_vm_create(const char *name, smx_host_t phys_host){ */ void simcall_vm_start(smx_host_t vm) { - /* will jump to SIMIX_pre_vm_start in src/simix/smx_smurf_private.h */ simcall_BODY_vm_start(vm); } @@ -424,7 +415,6 @@ void simcall_vm_start(smx_host_t vm) */ int simcall_vm_get_state(smx_host_t vm) { - /* will jump to SIMIX_pre_vm_get_state in src/simix/smx_smurf_private.h */ return simcall_BODY_vm_get_state(vm); } @@ -437,31 +427,26 @@ int simcall_vm_get_state(smx_host_t vm) */ void *simcall_vm_get_pm(smx_host_t vm) { - /* will jump to SIMIX_pre_vm_migrate in src/simix/smx_smurf_private.h */ return simcall_BODY_vm_get_pm(vm); } void simcall_vm_set_bound(smx_host_t vm, double bound) { - /* will jump to SIMIX_pre_vm_set_bound in src/simix/smx_smurf_private.h */ simcall_BODY_vm_set_bound(vm, bound); } void simcall_vm_set_affinity(smx_host_t vm, smx_host_t pm, unsigned long mask) { - /* will jump to SIMIX_pre_vm_set_affinity in src/simix/smx_smurf_private.h */ simcall_BODY_vm_set_affinity(vm, pm, mask); } void simcall_host_get_params(smx_host_t vm, ws_params_t params) { - /* will jump to SIMIX_pre_host_get_params in src/simix/smx_smurf_private.h */ simcall_BODY_host_get_params(vm, params); } void simcall_host_set_params(smx_host_t vm, ws_params_t params) { - /* will jump to SIMIX_pre_host_set_params in src/simix/smx_smurf_private.h */ simcall_BODY_host_set_params(vm, params); } @@ -474,7 +459,6 @@ void simcall_host_set_params(smx_host_t vm, ws_params_t params) */ void simcall_vm_migrate(smx_host_t vm, smx_host_t host) { - /* will jump to SIMIX_pre_vm_migrate in src/simix/smx_smurf_private.h */ simcall_BODY_vm_migrate(vm, host); } @@ -486,7 +470,6 @@ void simcall_vm_migrate(smx_host_t vm, smx_host_t host) */ void simcall_vm_suspend(smx_host_t vm) { - /* will jump to SIMIX_pre_vm_suspend in src/simix/smx_smurf_private.h */ simcall_BODY_vm_suspend(vm); } @@ -498,7 +481,6 @@ void simcall_vm_suspend(smx_host_t vm) */ void simcall_vm_resume(smx_host_t vm) { - /* will jump to SIMIX_pre_vm_resume in src/simix/smx_smurf_private.h */ simcall_BODY_vm_resume(vm); } @@ -510,7 +492,6 @@ void simcall_vm_resume(smx_host_t vm) */ void simcall_vm_save(smx_host_t vm) { - /* will jump to SIMIX_pre_vm_save in src/simix/smx_smurf_private.h */ simcall_BODY_vm_save(vm); } @@ -522,7 +503,6 @@ void simcall_vm_save(smx_host_t vm) */ void simcall_vm_restore(smx_host_t vm) { - /* will jump to SIMIX_pre_vm_restore in src/simix/smx_smurf_private.h */ simcall_BODY_vm_restore(vm); } @@ -534,7 +514,6 @@ void simcall_vm_restore(smx_host_t vm) */ void simcall_vm_shutdown(smx_host_t vm) { - /* will jump to SIMIX_pre_vm_shutdown in src/simix/smx_smurf_private.h */ simcall_BODY_vm_shutdown(vm); } @@ -546,7 +525,6 @@ void simcall_vm_shutdown(smx_host_t vm) */ void simcall_vm_destroy(smx_host_t vm) { - /* will jump to SIMIX_pre_vm_destroy in src/simix/smx_smurf_private.h */ simcall_BODY_vm_destroy(vm); } @@ -933,7 +911,7 @@ smx_process_t simcall_rdv_get_receiver(smx_rdv_t rdv) /** * \ingroup simix_comm_management */ -void simcall_comm_send(smx_rdv_t rdv, double task_size, double rate, +void simcall_comm_send(smx_process_t src, smx_rdv_t rdv, double task_size, double rate, void *src_buff, size_t src_buff_size, int (*match_fun)(void *, void *, smx_action_t), void (*copy_data_fun)(smx_action_t, void*, size_t), void *data, @@ -949,13 +927,13 @@ void simcall_comm_send(smx_rdv_t rdv, double task_size, double rate, if (MC_is_active()) { /* the model-checker wants two separate simcalls */ smx_action_t comm = NULL; /* MC needs the comm to be set to NULL during the simcall */ - comm = simcall_comm_isend(rdv, task_size, rate, + comm = simcall_comm_isend(src, rdv, task_size, rate, src_buff, src_buff_size, match_fun, NULL, copy_data_fun, data, 0); simcall_comm_wait(comm, timeout); comm = NULL; } else { - simcall_BODY_comm_send(rdv, task_size, rate, src_buff, src_buff_size, + simcall_BODY_comm_send(src, rdv, task_size, rate, src_buff, src_buff_size, match_fun, copy_data_fun, data, timeout); } } @@ -963,7 +941,7 @@ void simcall_comm_send(smx_rdv_t rdv, double task_size, double rate, /** * \ingroup simix_comm_management */ -smx_action_t simcall_comm_isend(smx_rdv_t rdv, double task_size, double rate, +smx_action_t simcall_comm_isend(smx_process_t src, smx_rdv_t rdv, double task_size, double rate, void *src_buff, size_t src_buff_size, int (*match_fun)(void *, void *, smx_action_t), void (*clean_fun)(void *), @@ -977,7 +955,7 @@ smx_action_t simcall_comm_isend(smx_rdv_t rdv, double task_size, double rate, xbt_assert(rdv, "No rendez-vous point defined for isend"); - return simcall_BODY_comm_isend(rdv, task_size, rate, src_buff, + return simcall_BODY_comm_isend(src, rdv, task_size, rate, src_buff, src_buff_size, match_fun, clean_fun, copy_data_fun, data, detached); } @@ -1023,12 +1001,12 @@ smx_action_t simcall_comm_irecv(smx_rdv_t rdv, void *dst_buff, size_t *dst_buff_ /** * \ingroup simix_comm_management */ -smx_action_t simcall_comm_iprobe(smx_rdv_t rdv, int src, int tag, +smx_action_t simcall_comm_iprobe(smx_rdv_t rdv, int type, int src, int tag, int (*match_fun)(void *, void *, smx_action_t), void *data) { xbt_assert(rdv, "No rendez-vous point defined for iprobe"); - return simcall_BODY_comm_iprobe(rdv, src, tag, match_fun, data); + return simcall_BODY_comm_iprobe(rdv, type, src, tag, match_fun, data); } /** @@ -1354,7 +1332,7 @@ smx_file_t simcall_file_open(const char* fullpath, smx_host_t host) * \ingroup simix_file_management * */ -int simcall_file_close(smx_file_t fd, smx_host_t host) +int simcall_file_close(smx_file_t fd, smx_host_t host) { return simcall_BODY_file_close(fd, host); } @@ -1363,9 +1341,9 @@ int simcall_file_close(smx_file_t fd, smx_host_t host) * \ingroup simix_file_management * */ -int simcall_file_unlink(smx_file_t fd) +int simcall_file_unlink(smx_file_t fd, smx_host_t host) { - return simcall_BODY_file_unlink(fd); + return simcall_BODY_file_unlink(fd, host); } /** @@ -1397,7 +1375,7 @@ xbt_dynar_t simcall_file_get_info(smx_file_t fd) * \ingroup simix_file_management * */ -int simcall_file_seek(smx_file_t fd, sg_size_t offset, int origin){ +int simcall_file_seek(smx_file_t fd, sg_offset_t offset, int origin){ return simcall_BODY_file_seek(fd, offset, origin); } @@ -1477,39 +1455,24 @@ xbt_dict_t simcall_storage_get_content(smx_storage_t storage) return simcall_BODY_storage_get_content(storage); } + + #ifdef HAVE_MC -void *simcall_mc_snapshot(void) -{ +void *simcall_mc_snapshot(void) { return simcall_BODY_mc_snapshot(); } -int simcall_mc_compare_snapshots(void *s1, void *s2){ +int simcall_mc_compare_snapshots(void *s1, void *s2) { return simcall_BODY_mc_compare_snapshots(s1, s2); } -int simcall_mc_random(int min, int max) -{ +int simcall_mc_random(int min, int max) { return simcall_BODY_mc_random(min, max); } - #endif /* HAVE_MC */ -/* ****************************************************************************************** */ -/* TUTORIAL: New API */ -/* All functions for simcall */ -/* ****************************************************************************************** */ -int simcall_new_api_fct(const char* param1, double param2){ - smx_simcall_t simcall = SIMIX_simcall_mine(); - simcall->call = SIMCALL_NEW_API_INIT; - simcall->new_api.param1 = param1; - simcall->new_api.param2 = param2; - - SIMIX_simcall_push(simcall->issuer); - return simcall->new_api.result; -} - /* ************************************************************************** */ /** @brief returns a printable string representing a simcall */