X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/fa222c38f9b796be07ab4351ffc810a61a8fd705..ea8f841a468a3db03f1d74e8e92e2dfba3db6f3b:/src/simix/libsmx.c diff --git a/src/simix/libsmx.c b/src/simix/libsmx.c index bd862a37f3..ab101d1db2 100644 --- a/src/simix/libsmx.c +++ b/src/simix/libsmx.c @@ -11,9 +11,9 @@ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ -#include "mc/mc_replay.h" +#include "src/mc/mc_replay.h" #include "smx_private.h" -#include "mc/mc_forward.h" +#include "src/mc/mc_forward.h" #include "xbt/ex.h" #include /* isfinite() */ #include "mc/mc.h" @@ -22,18 +22,6 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix); #include "popping_bodies.c" -/** - * \ingroup simix_host_management - * \brief Returns the name of a host. - * - * \param host A SIMIX host - * \return The name of this host - */ -const char* simcall_host_get_name(sg_host_t host) -{ - return simcall_BODY_host_get_name(host); -} - /** * \ingroup simix_host_management * \brief Start the host if it is off @@ -80,32 +68,6 @@ xbt_dict_t simcall_asr_get_properties(const char *name) return simcall_BODY_asr_get_properties(name); } - -/** - * \ingroup simix_host_management - * \brief Returns the speed of the processor. - * - * The speed returned does not take into account the current load on the machine. - * \param host A SIMIX host - * \return The speed of this host (in Mflop/s) - */ -double simcall_host_get_speed(sg_host_t host) -{ - return simcall_BODY_host_get_speed(host); -} - -/** - * \ingroup simix_host_management - * \brief Returns the number of core of the processor. - * - * \param host A SIMIX host - * \return The number of core - */ -int simcall_host_get_core(sg_host_t host) -{ - return simcall_BODY_host_get_core(host); -} - /** * \ingroup simix_host_management * \brief Returns the list of processes attached to the host. @@ -118,31 +80,6 @@ xbt_swag_t simcall_host_get_process_list(sg_host_t host) return simcall_BODY_host_get_process_list(host); } - -/** - * \ingroup simix_host_management - * \brief Returns the available speed of the processor. - * - * \return Speed currently available (in Mflop/s) - */ -double simcall_host_get_available_speed(sg_host_t host) -{ - return simcall_BODY_host_get_available_speed(host); -} - -/** - * \ingroup simix_host_management - * \brief Returns the state of a host. - * - * Two states are possible: 1 if the host is active or 0 if it has crashed. - * \param host A SIMIX host - * \return 1 if the host is available, 0 otherwise - */ -int simcall_host_get_state(sg_host_t host) -{ - return simcall_BODY_host_get_state(host); -} - /** * \ingroup simix_host_management * \brief Returns the power peak of a host. @@ -168,18 +105,6 @@ double simcall_host_get_power_peak_at(sg_host_t host, int pstate_index) return simcall_BODY_host_get_power_peak_at(host, pstate_index); } -/** - * \ingroup simix_host_management - * \brief Returns the number of power states for a host. - * - * \param host A SIMIX host - * \return the number of power states - */ -int simcall_host_get_nb_pstates(sg_host_t host) -{ - return simcall_BODY_host_get_nb_pstates(host); -} - /** * \ingroup simix_host_management * \brief Sets the pstate at which the host should run @@ -191,28 +116,7 @@ void simcall_host_set_pstate(sg_host_t host, int pstate_index) { simcall_BODY_host_set_pstate(host, pstate_index); } -/** - * \ingroup simix_host_management - * \brief Gets the pstate at which that host currently runs. - * - * \param host A SIMIX host - */ -int simcall_host_get_pstate(sg_host_t host) -{ - return simcall_BODY_host_get_pstate(host); -} -/** - * \ingroup simix_host_management - * \brief Returns the total energy consumed by the host (in Joules) - * - * \param host A SIMIX host - * \return the energy consumed by the host (double) - */ -double simcall_host_get_consumed_energy(sg_host_t host) -{ - return simcall_BODY_host_get_consumed_energy(host); -} /** \ingroup simix_host_management * \brief Returns the amount of watt dissipated at the given pstate when the host is idling */ @@ -950,7 +854,7 @@ smx_process_t simcall_rdv_get_receiver(smx_rdv_t rdv) /** * \ingroup simix_comm_management */ -void simcall_comm_send(smx_process_t src, smx_rdv_t rdv, double task_size, double rate, +void simcall_comm_send(smx_process_t sender, smx_rdv_t rdv, double task_size, double rate, void *src_buff, size_t src_buff_size, int (*match_fun)(void *, void *, smx_synchro_t), void (*copy_data_fun)(smx_synchro_t, void*, size_t), void *data, @@ -966,13 +870,13 @@ void simcall_comm_send(smx_process_t src, smx_rdv_t rdv, double task_size, doubl if (MC_is_active() || MC_record_replay_is_active()) { /* the model-checker wants two separate simcalls */ smx_synchro_t comm = NULL; /* MC needs the comm to be set to NULL during the simcall */ - comm = simcall_comm_isend(src, rdv, task_size, rate, + comm = simcall_comm_isend(sender, 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(src, rdv, task_size, rate, src_buff, src_buff_size, + simcall_BODY_comm_send(sender, rdv, task_size, rate, src_buff, src_buff_size, match_fun, copy_data_fun, data, timeout); } } @@ -980,7 +884,7 @@ void simcall_comm_send(smx_process_t src, smx_rdv_t rdv, double task_size, doubl /** * \ingroup simix_comm_management */ -smx_synchro_t simcall_comm_isend(smx_process_t src, smx_rdv_t rdv, double task_size, double rate, +smx_synchro_t simcall_comm_isend(smx_process_t sender, smx_rdv_t rdv, double task_size, double rate, void *src_buff, size_t src_buff_size, int (*match_fun)(void *, void *, smx_synchro_t), void (*clean_fun)(void *), @@ -994,7 +898,7 @@ smx_synchro_t simcall_comm_isend(smx_process_t src, smx_rdv_t rdv, double task_s xbt_assert(rdv, "No rendez-vous point defined for isend"); - return simcall_BODY_comm_isend(src, rdv, task_size, rate, src_buff, + return simcall_BODY_comm_isend(sender, rdv, task_size, rate, src_buff, src_buff_size, match_fun, clean_fun, copy_data_fun, data, detached); } @@ -1002,7 +906,7 @@ smx_synchro_t simcall_comm_isend(smx_process_t src, smx_rdv_t rdv, double task_s /** * \ingroup simix_comm_management */ -void simcall_comm_recv(smx_rdv_t rdv, void *dst_buff, size_t * dst_buff_size, +void simcall_comm_recv(smx_process_t receiver, smx_rdv_t rdv, void *dst_buff, size_t * dst_buff_size, int (*match_fun)(void *, void *, smx_synchro_t), void (*copy_data_fun)(smx_synchro_t, void*, size_t), void *data, double timeout, double rate) @@ -1013,27 +917,27 @@ void simcall_comm_recv(smx_rdv_t rdv, void *dst_buff, size_t * dst_buff_size, if (MC_is_active() || MC_record_replay_is_active()) { /* the model-checker wants two separate simcalls */ smx_synchro_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, + comm = simcall_comm_irecv(receiver, rdv, dst_buff, dst_buff_size, 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, + simcall_BODY_comm_recv(receiver, rdv, dst_buff, dst_buff_size, match_fun, copy_data_fun, data, timeout, rate); } } /** * \ingroup simix_comm_management */ -smx_synchro_t simcall_comm_irecv(smx_rdv_t rdv, void *dst_buff, size_t *dst_buff_size, +smx_synchro_t simcall_comm_irecv(smx_process_t receiver, smx_rdv_t rdv, void *dst_buff, size_t *dst_buff_size, int (*match_fun)(void *, void *, smx_synchro_t), void (*copy_data_fun)(smx_synchro_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, + return simcall_BODY_comm_irecv(receiver, rdv, dst_buff, dst_buff_size, match_fun, copy_data_fun, data, rate); }