X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f6a147ae4d559391e52232a5d0cde1cd5adf9e62..d2782615cdbeb1ad4c5e994a4c681739927e3aff:/src/simix/smx_user.c diff --git a/src/simix/smx_user.c b/src/simix/smx_user.c index 453c7410bb..d327392983 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 "smx_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) { @@ -437,7 +430,7 @@ 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 */ + /* will jump to SIMIX_pre_vm_get_pm in src/simix/smx_smurf_private.h */ return simcall_BODY_vm_get_pm(vm); } @@ -933,9 +926,10 @@ 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 *data, + int (*match_fun)(void *, void *, smx_action_t), + void (*copy_data_fun)(smx_action_t, void*, size_t), void *data, double timeout) { /* checking for infinite values */ @@ -948,24 +942,25 @@ 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, - src_buff, src_buff_size, match_fun, NULL, data, 0); + 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, - match_fun, data, timeout); + simcall_BODY_comm_send(src, rdv, task_size, rate, src_buff, src_buff_size, + match_fun, copy_data_fun, data, timeout); } } /** * \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 *), + void (*copy_data_fun)(smx_action_t, void*, size_t), void *data, int detached) { @@ -975,9 +970,9 @@ 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, data, detached); + clean_fun, copy_data_fun, data, detached); } /** @@ -985,6 +980,7 @@ smx_action_t simcall_comm_isend(smx_rdv_t rdv, double task_size, double rate, */ void simcall_comm_recv(smx_rdv_t rdv, void *dst_buff, size_t * dst_buff_size, int (*match_fun)(void *, void *, smx_action_t), + void (*copy_data_fun)(smx_action_t, void*, size_t), void *data, double timeout, double rate) { xbt_assert(isfinite(timeout), "timeout is not finite!"); @@ -994,13 +990,13 @@ void simcall_comm_recv(smx_rdv_t rdv, void *dst_buff, size_t * dst_buff_size, /* 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_irecv(rdv, dst_buff, dst_buff_size, - match_fun, data, rate); + match_fun, copy_data_fun, data, rate); simcall_comm_wait(comm, timeout); comm = NULL; } else { simcall_BODY_comm_recv(rdv, dst_buff, dst_buff_size, - match_fun, data, timeout, rate); + match_fun, copy_data_fun, data, timeout, rate); } } /** @@ -1008,23 +1004,24 @@ void simcall_comm_recv(smx_rdv_t rdv, void *dst_buff, size_t * dst_buff_size, */ smx_action_t simcall_comm_irecv(smx_rdv_t rdv, void *dst_buff, size_t *dst_buff_size, int (*match_fun)(void *, void *, smx_action_t), + void (*copy_data_fun)(smx_action_t, void*, size_t), void *data, double rate) { xbt_assert(rdv, "No rendez-vous point defined for irecv"); return simcall_BODY_comm_irecv(rdv, dst_buff, dst_buff_size, - match_fun, data, rate); + match_fun, copy_data_fun, data, rate); } /** * \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); } /** @@ -1350,7 +1347,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); } @@ -1359,9 +1356,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); } /** @@ -1393,7 +1390,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); } @@ -1473,39 +1470,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 */