X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9b73466ada27682d1729f394549479da83ef4a99..228ec0b9d568130e65c10f7e9d25ccb5273abaa8:/src/simix/smx_user.c diff --git a/src/simix/smx_user.c b/src/simix/smx_user.c index a2261cde73..e15fa42fce 100644 --- a/src/simix/smx_user.c +++ b/src/simix/smx_user.c @@ -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 @@ -253,6 +253,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, @@ -1419,7 +1421,7 @@ void simcall_file_set_data(smx_file_t fd, void *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 +1430,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 +1474,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 +1495,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 +1526,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); }