X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6d3f12ae629969d1ede04070ba244377e3cf434d..60059959d6d517261ca7f4176b0267bc37caf04d:/src/simix/smx_user.c diff --git a/src/simix/smx_user.c b/src/simix/smx_user.c index 929a8e09d5..8d80aa3d0f 100644 --- a/src/simix/smx_user.c +++ b/src/simix/smx_user.c @@ -1,25 +1,19 @@ /* 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. */ #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[] = { -SIMCALL_LIST(SIMCALL_STRING_TYPE, SIMCALL_SEP_COMMA) -[SIMCALL_NONE] = "NONE" -}; - -SIMCALL_LIST(SIMCALL_FUNC, SIMCALL_SEP_NOTHING) +#include "popping_bodies.c" /** * \ingroup simix_host_management @@ -154,31 +148,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. @@ -222,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) { @@ -264,7 +232,7 @@ smx_action_t simcall_host_execute(const char *name, smx_host_t host, /* checking for infinite values */ xbt_assert(isfinite(computation_amount), "computation_amount is not finite!"); xbt_assert(isfinite(priority), "priority is not finite!"); - + return simcall_BODY_host_execute(name, host, computation_amount, priority, bound, affinity_mask); } @@ -296,14 +264,14 @@ smx_action_t simcall_host_parallel_execute(const char *name, for (i = 0 ; i < host_nb ; ++i) { xbt_assert(isfinite(computation_amount[i]), "computation_amount[%d] is not finite!", i); for (j = 0 ; j < host_nb ; ++j) { - xbt_assert(isfinite(communication_amount[i + host_nb * j]), + xbt_assert(isfinite(communication_amount[i + host_nb * j]), "communication_amount[%d+%d*%d] is not finite!", i, host_nb, j); - } - } - + } + } + xbt_assert(isfinite(amount), "amount is not finite!"); xbt_assert(isfinite(rate), "rate is not finite!"); - + return simcall_BODY_host_parallel_execute(name, host_nb, host_list, computation_amount, communication_amount, @@ -371,7 +339,7 @@ void simcall_host_execution_set_priority(smx_action_t execution, double priority { /* checking for infinite values */ xbt_assert(isfinite(priority), "priority is not finite!"); - + simcall_BODY_host_execution_set_priority(execution, priority); } @@ -424,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); } @@ -436,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); } @@ -449,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); } @@ -462,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); } @@ -499,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); } @@ -511,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); } @@ -523,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); } @@ -535,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); } @@ -547,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); } @@ -559,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); } @@ -571,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); } @@ -654,6 +607,11 @@ void simcall_process_change_host(smx_process_t process, smx_host_t dest) simcall_BODY_process_change_host(process, dest); } +void simcall_process_join(smx_process_t process, double timeout) +{ + simcall_BODY_process_join(process, timeout); +} + /** * \ingroup simix_process_management * \brief Suspends a process. @@ -839,7 +797,7 @@ xbt_dict_t simcall_process_get_properties(smx_process_t process) * \brief Add an on_exit function * Add an on_exit function which will be executed when the process exits/is killed. */ -XBT_PUBLIC(void) simcall_process_on_exit(smx_process_t process, int_f_pvoid_t fun, void *data) +XBT_PUBLIC(void) simcall_process_on_exit(smx_process_t process, int_f_pvoid_pvoid_t fun, void *data) { simcall_BODY_process_on_exit(process, fun, data); } @@ -913,13 +871,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); } @@ -960,57 +911,62 @@ 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 */ xbt_assert(isfinite(task_size), "task_size is not finite!"); xbt_assert(isfinite(rate), "rate is not finite!"); xbt_assert(isfinite(timeout), "timeout is not finite!"); - + xbt_assert(rdv, "No rendez-vous point defined for send"); 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) { /* checking for infinite values */ xbt_assert(isfinite(task_size), "task_size is not finite!"); xbt_assert(isfinite(rate), "rate is not finite!"); - + 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); } + /** * \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 (*copy_data_fun)(smx_action_t, void*, size_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"); @@ -1019,86 +975,38 @@ 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, 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); + match_fun, copy_data_fun, data, timeout, rate); } } /** * \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) + 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_bounded(rdv, dst_buff, dst_buff_size, - match_fun, data, rate); + return simcall_BODY_comm_irecv(rdv, dst_buff, dst_buff_size, + 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); -} - -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); - */ + return simcall_BODY_comm_iprobe(rdv, type, src, tag, match_fun, data); } /** @@ -1213,7 +1121,7 @@ smx_process_t simcall_comm_get_src_proc(smx_action_t comm) */ smx_process_t simcall_comm_get_dst_proc(smx_action_t comm) { - return simcall_BODY_comm_get_dst_proc(comm); + return simcall_BODY_comm_get_dst_proc(comm); } #ifdef HAVE_LATENCY_BOUND_TRACKING @@ -1251,7 +1159,7 @@ void simcall_mutex_destroy(smx_mutex_t mutex) */ void simcall_mutex_lock(smx_mutex_t mutex) { - simcall_BODY_mutex_lock(mutex); + simcall_BODY_mutex_lock(mutex); } /** @@ -1260,7 +1168,7 @@ void simcall_mutex_lock(smx_mutex_t mutex) */ int simcall_mutex_trylock(smx_mutex_t mutex) { - return simcall_BODY_mutex_trylock(mutex); + return simcall_BODY_mutex_trylock(mutex); } /** @@ -1269,7 +1177,7 @@ int simcall_mutex_trylock(smx_mutex_t mutex) */ void simcall_mutex_unlock(smx_mutex_t mutex) { - simcall_BODY_mutex_unlock(mutex); + simcall_BODY_mutex_unlock(mutex); } /** @@ -1335,7 +1243,7 @@ void simcall_cond_broadcast(smx_cond_t cond) */ smx_sem_t simcall_sem_init(int capacity) { - return simcall_BODY_sem_init(capacity); + return simcall_BODY_sem_init(capacity); } /** @@ -1344,7 +1252,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); } /** @@ -1353,7 +1261,7 @@ void simcall_sem_destroy(smx_sem_t sem) */ void simcall_sem_release(smx_sem_t sem) { - simcall_BODY_sem_release(sem); + simcall_BODY_sem_release(sem); } /** @@ -1395,125 +1303,110 @@ 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) +sg_size_t simcall_file_read(smx_file_t fd, sg_size_t size, smx_host_t host) { - return simcall_BODY_file_get_data(fd); + return simcall_BODY_file_read(fd, size, host); } /** * \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) +sg_size_t simcall_file_write(smx_file_t fd, sg_size_t size, smx_host_t host) { - simcall_file_set_data(fd, data); + return simcall_BODY_file_write(fd, size, host); } /** * \ingroup simix_file_management - * + * \brief */ -sg_size_t simcall_file_read(smx_file_t fd, sg_size_t size) +smx_file_t simcall_file_open(const char* fullpath, smx_host_t host) { - return simcall_BODY_file_read(fd, size); + return simcall_BODY_file_open(fullpath, host); } /** * \ingroup simix_file_management * */ -sg_size_t simcall_file_write(smx_file_t fd, sg_size_t size) +int simcall_file_close(smx_file_t fd, smx_host_t host) { - return simcall_BODY_file_write(fd, size); + return simcall_BODY_file_close(fd, host); } /** * \ingroup simix_file_management - * \brief + * */ -smx_file_t simcall_file_open(const char* mount, const char* path) +int simcall_file_unlink(smx_file_t fd, smx_host_t host) { - return simcall_BODY_file_open(mount, path); + return simcall_BODY_file_unlink(fd, host); } /** * \ingroup simix_file_management * */ -int simcall_file_close(smx_file_t fd) -{ - return simcall_BODY_file_close(fd); +sg_size_t simcall_file_get_size(smx_file_t fd){ + return simcall_BODY_file_get_size(fd); } /** * \ingroup simix_file_management * */ -int simcall_file_unlink(smx_file_t fd) -{ - return simcall_BODY_file_unlink(fd); +sg_size_t simcall_file_tell(smx_file_t fd){ + return simcall_BODY_file_tell(fd); } /** * \ingroup simix_file_management * */ -xbt_dict_t simcall_file_ls(const char* mount, const char* path) +xbt_dynar_t simcall_file_get_info(smx_file_t fd) { - return simcall_BODY_file_ls(mount, path); -} -/** - * \ingroup simix_file_management - * - */ -sg_size_t simcall_file_get_size (smx_file_t fd){ - return simcall_BODY_file_get_size(fd); + return simcall_BODY_file_get_info(fd); } /** * \ingroup simix_file_management * */ -xbt_dynar_t simcall_file_get_info(smx_file_t fd) -{ - return simcall_BODY_file_get_info(fd); +int simcall_file_seek(smx_file_t fd, sg_offset_t offset, int origin){ + return simcall_BODY_file_seek(fd, offset, origin); } /** * \ingroup simix_file_management + * \brief Move a file to another location on the *same mount point*. * */ -void simcall_storage_file_rename(smx_storage_t storage, const char* src, const char* dest) +int simcall_file_move(smx_file_t fd, const char* fullpath) { - return simcall_BODY_storage_file_rename(storage, src, dest); + return simcall_BODY_file_move(fd, fullpath); } /** * \ingroup simix_storage_management * \brief Returns the free space size on a given storage element. - * \param storage name + * \param storage a storage * \return Return the free space size on a given storage element (as sg_size_t) */ -sg_size_t simcall_storage_get_free_size (const char* name){ - return simcall_BODY_storage_get_free_size(name); +sg_size_t simcall_storage_get_free_size (smx_storage_t storage){ + return simcall_BODY_storage_get_free_size(storage); } /** * \ingroup simix_storage_management * \brief Returns the used space size on a given storage element. - * \param storage name + * \param storage a storage * \return Return the used space size on a given storage element (as sg_size_t) */ -sg_size_t simcall_storage_get_used_size (const char* name){ - return simcall_BODY_storage_get_used_size(name); +sg_size_t simcall_storage_get_used_size (smx_storage_t storage){ + return simcall_BODY_storage_get_used_size(storage); } /** @@ -1522,9 +1415,20 @@ sg_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_storage_list(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_attached_storage_list(host); } /** @@ -1551,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 */