X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9b73466ada27682d1729f394549479da83ef4a99..5a5e8338f6d18da29438ec26f96970afb7579992:/src/simix/smx_user.c diff --git a/src/simix/smx_user.c b/src/simix/smx_user.c index a2261cde73..8feee85b1f 100644 --- a/src/simix/smx_user.c +++ b/src/simix/smx_user.c @@ -1,7 +1,7 @@ /* smx_user.c - public interface to simix */ -/* Copyright (c) 2010-2013. The SimGrid Team. - All rights reserved. */ +/* Copyright (c) 2010-2014. The SimGrid Team. + * All rights reserved. */ /* 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. */ @@ -15,11 +15,11 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix); /* generate strings from the enumeration values */ static const char* simcall_names[] = { -SIMCALL_LIST(SIMCALL_STRING_TYPE, SIMCALL_SEP_COMMA) +#include "simcalls_generated_string.c" [SIMCALL_NONE] = "NONE" }; -SIMCALL_LIST(SIMCALL_FUNC, SIMCALL_SEP_NOTHING) +#include "simcalls_generated_body.c" /** * \ingroup simix_host_management @@ -154,31 +154,6 @@ int simcall_host_get_state(smx_host_t host) return simcall_BODY_host_get_state(host); } -/** - * \ingroup simix_host_management - * \brief Returns the user data associated to a host. - * - * \param host SIMIX host - * \return the user data of this host - */ -void* simcall_host_get_data(smx_host_t host) -{ - return simcall_BODY_host_get_data(host); -} - -/** - * \ingroup simix_host_management - * \brief Sets the user data associated to a host. - * - * The host must not have previous user data associated to it. - * \param host A SIMIX host - * \param data The user data to set - */ -void simcall_host_set_data(smx_host_t host, void *data) -{ - simcall_host_set_data(host, data); -} - /** * \ingroup simix_host_management * \brief Returns the power peak of a host. @@ -253,6 +228,8 @@ double simcall_host_get_consumed_energy(smx_host_t host) * \param host SIMIX host where the action will be executed * \param computation_amount amount Computation amount (in bytes) * \param priority computation priority + * \param bound + * \param affinity_mask * \return A new SIMIX execution action */ smx_action_t simcall_host_execute(const char *name, smx_host_t host, @@ -911,13 +888,6 @@ smx_rdv_t simcall_rdv_get_by_name(const char *name) * skipping the simcall (for now). It works in parallel, it won't work on * distributed but probably we will change MSG for that. */ - /* - smx_simcall_t simcall = simcall_mine(); - simcall->call = SIMCALL_RDV_GEY_BY_NAME; - simcall->rdv_get_by_name.name = name; - SIMIX_simcall_push(simcall->issuer); - return simcall->rdv_get_by_name.result;*/ - return SIMIX_rdv_get_by_name(name); } @@ -1004,11 +974,13 @@ smx_action_t simcall_comm_isend(smx_rdv_t rdv, double task_size, double rate, src_buff_size, match_fun, clean_fun, data, detached); } + /** * \ingroup simix_comm_management */ 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 *data, double timeout) + int (*match_fun)(void *, void *, smx_action_t), + void *data, double timeout, double rate) { xbt_assert(isfinite(timeout), "timeout is not finite!"); xbt_assert(rdv, "No rendez-vous point defined for recv"); @@ -1017,61 +989,28 @@ 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); + match_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); - } -} -/** - * \ingroup simix_comm_management - */ -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 *data) -{ - xbt_assert(rdv, "No rendez-vous point defined for irecv"); - - return simcall_BODY_comm_irecv(rdv, dst_buff, dst_buff_size, - match_fun, data); -} - - -/** - * \ingroup simix_comm_management - */ -void simcall_comm_recv_bounded(smx_rdv_t rdv, void *dst_buff, size_t * dst_buff_size, - int (*match_fun)(void *, void *, smx_action_t), void *data, double timeout, double rate) -{ - xbt_assert(isfinite(timeout), "timeout is not finite!"); - xbt_assert(rdv, "No rendez-vous point defined for recv"); - - if (MC_is_active()) { - /* the model-checker wants two separate simcalls */ - smx_action_t comm = simcall_comm_irecv_bounded(rdv, dst_buff, dst_buff_size, - match_fun, data, rate); - simcall_comm_wait(comm, timeout); - } - else { - simcall_BODY_comm_recv_bounded(rdv, dst_buff, dst_buff_size, match_fun, data, timeout, rate); } } /** * \ingroup simix_comm_management */ -smx_action_t simcall_comm_irecv_bounded(smx_rdv_t rdv, void *dst_buff, size_t *dst_buff_size, - int (*match_fun)(void *, void *, smx_action_t), void *data, double rate) +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 *data, double rate) { xbt_assert(rdv, "No rendez-vous point defined for irecv"); - return simcall_BODY_comm_irecv_bounded(rdv, dst_buff, dst_buff_size, + return simcall_BODY_comm_irecv(rdv, dst_buff, dst_buff_size, match_fun, data, rate); } - /** * \ingroup simix_comm_management */ @@ -1083,22 +1022,6 @@ smx_action_t simcall_comm_iprobe(smx_rdv_t rdv, int src, int tag, return simcall_BODY_comm_iprobe(rdv, src, tag, match_fun, data); } -void simcall_comm_destroy(smx_action_t comm) -{ - xbt_assert(comm, "Invalid parameter"); - - /* FIXME remove this simcall type: comms are auto-destroyed now */ - - /* - smx_simcall_t simcall = simcall_mine(); - - simcall->call = SIMCALL_COMM_DESTROY; - simcall->comm_destroy.comm = comm; - - SIMIX_simcall_push(simcall->issuer); - */ -} - /** * \ingroup simix_comm_management */ @@ -1342,7 +1265,7 @@ smx_sem_t simcall_sem_init(int capacity) */ void simcall_sem_destroy(smx_sem_t sem) { - simcall_sem_destroy(sem); + simcall_BODY_sem_destroy(sem); } /** @@ -1393,33 +1316,9 @@ int simcall_sem_get_capacity(smx_sem_t sem) /** * \ingroup simix_file_management - * \brief Returns the user data associated to a file. * - * \param fd A simix file - * \return the user data of this file */ -void* simcall_file_get_data(smx_file_t fd) -{ - return simcall_BODY_file_get_data(fd); -} - -/** - * \ingroup simix_file_management - * \brief Sets the user data associated to a file. - * - * \param fd A SIMIX file - * \param data The user data to set - */ -void simcall_file_set_data(smx_file_t fd, void *data) -{ - simcall_file_set_data(fd, data); -} - -/** - * \ingroup simix_file_management - * - */ -sg_storage_size_t simcall_file_read(smx_file_t fd, sg_storage_size_t size) +sg_size_t simcall_file_read(smx_file_t fd, sg_size_t size) { return simcall_BODY_file_read(fd, size); } @@ -1428,7 +1327,7 @@ sg_storage_size_t simcall_file_read(smx_file_t fd, sg_storage_size_t size) * \ingroup simix_file_management * */ -sg_storage_size_t simcall_file_write(smx_file_t fd, sg_storage_size_t size) +sg_size_t simcall_file_write(smx_file_t fd, sg_size_t size) { return simcall_BODY_file_write(fd, size); } @@ -1472,10 +1371,18 @@ xbt_dict_t simcall_file_ls(const char* mount, const char* path) * \ingroup simix_file_management * */ -sg_storage_size_t simcall_file_get_size (smx_file_t fd){ +sg_size_t simcall_file_get_size(smx_file_t fd){ return simcall_BODY_file_get_size(fd); } +/** + * \ingroup simix_file_management + * + */ +sg_size_t simcall_file_tell(smx_file_t fd){ + return simcall_BODY_file_tell(fd); +} + /** * \ingroup simix_file_management * @@ -1485,13 +1392,30 @@ xbt_dynar_t simcall_file_get_info(smx_file_t fd) return simcall_BODY_file_get_info(fd); } +/** + * \ingroup simix_file_management + * + */ +int simcall_file_seek(smx_file_t fd, sg_size_t offset, int origin){ + return simcall_BODY_file_seek(fd, offset, origin); +} + +/** + * \ingroup simix_file_management + * + */ +void simcall_storage_file_rename(smx_storage_t storage, const char* src, const char* dest) +{ + return simcall_BODY_storage_file_rename(storage, src, dest); +} + /** * \ingroup simix_storage_management * \brief Returns the free space size on a given storage element. * \param storage name - * \return Return the free space size on a given storage element (as sg_storage_size_t) + * \return Return the free space size on a given storage element (as sg_size_t) */ -sg_storage_size_t simcall_storage_get_free_size (const char* name){ +sg_size_t simcall_storage_get_free_size (const char* name){ return simcall_BODY_storage_get_free_size(name); } @@ -1499,9 +1423,9 @@ sg_storage_size_t simcall_storage_get_free_size (const char* name){ * \ingroup simix_storage_management * \brief Returns the used space size on a given storage element. * \param storage name - * \return Return the used space size on a given storage element (as sg_storage_size_t) + * \return Return the used space size on a given storage element (as sg_size_t) */ -sg_storage_size_t simcall_storage_get_used_size (const char* name){ +sg_size_t simcall_storage_get_used_size (const char* name){ return simcall_BODY_storage_get_used_size(name); } @@ -1511,9 +1435,20 @@ sg_storage_size_t simcall_storage_get_used_size (const char* name){ * \param host A SIMIX host * \return a dict containing all storages mounted on the host */ -xbt_dict_t simcall_host_get_storage_list(smx_host_t host) +xbt_dict_t simcall_host_get_mounted_storage_list(smx_host_t host) +{ + return simcall_BODY_host_get_mounted_storage_list(host); +} + +/** + * \ingroup simix_storage_management + * \brief Returns the list of storages attached to an host. + * \param host A SIMIX host + * \return a dict containing all storages attached to the host + */ +xbt_dynar_t simcall_host_get_attached_storage_list(smx_host_t host) { - return simcall_BODY_host_get_storage_list(host); + return simcall_BODY_host_get_attached_storage_list(host); } /**