* 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 <math.h> /* 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 "popping_bodies.c"
/**
* \ingroup simix_host_management
*
* \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)
{
/* 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);
}
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,
{
/* checking for infinite values */
xbt_assert(isfinite(priority), "priority is not finite!");
-
+
simcall_BODY_host_execution_set_priority(execution, priority);
}
* \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);
}
*/
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);
}
*/
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);
}
*/
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);
}
*/
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);
}
*/
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);
}
*/
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);
}
*/
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);
}
*/
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);
}
*/
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);
}
*/
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);
}
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.
* \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);
}
/**
* \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);
}
/**
*/
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!");
/* 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);
}
}
/**
*/
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);
}
/**
*/
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
*/
void simcall_mutex_lock(smx_mutex_t mutex)
{
- simcall_BODY_mutex_lock(mutex);
+ simcall_BODY_mutex_lock(mutex);
}
/**
*/
int simcall_mutex_trylock(smx_mutex_t mutex)
{
- return simcall_BODY_mutex_trylock(mutex);
+ return simcall_BODY_mutex_trylock(mutex);
}
/**
*/
void simcall_mutex_unlock(smx_mutex_t mutex)
{
- simcall_BODY_mutex_unlock(mutex);
+ simcall_BODY_mutex_unlock(mutex);
}
/**
*/
smx_sem_t simcall_sem_init(int capacity)
{
- return simcall_BODY_sem_init(capacity);
+ return simcall_BODY_sem_init(capacity);
}
/**
*/
void simcall_sem_release(smx_sem_t sem)
{
- simcall_BODY_sem_release(sem);
+ simcall_BODY_sem_release(sem);
}
/**
return simcall_BODY_sem_get_capacity(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_BODY_file_set_data(fd, data);
-}
-
/**
* \ingroup simix_file_management
*
*/
-sg_size_t simcall_file_read(smx_file_t fd, sg_size_t size)
+sg_size_t simcall_file_read(smx_file_t fd, sg_size_t size, smx_host_t host)
{
- return simcall_BODY_file_read(fd, size);
+ return simcall_BODY_file_read(fd, size, host);
}
/**
* \ingroup simix_file_management
*
*/
-sg_size_t simcall_file_write(smx_file_t fd, sg_size_t size)
+sg_size_t simcall_file_write(smx_file_t fd, sg_size_t size, smx_host_t host)
{
- return simcall_BODY_file_write(fd, size);
+ return simcall_BODY_file_write(fd, size, host);
}
/**
* \ingroup simix_file_management
* \brief
*/
-smx_file_t simcall_file_open(const char* mount, const char* path)
+smx_file_t simcall_file_open(const char* fullpath, smx_host_t host)
{
- return simcall_BODY_file_open(mount, path);
+ return simcall_BODY_file_open(fullpath, host);
}
/**
* \ingroup simix_file_management
*
*/
-int simcall_file_close(smx_file_t fd)
+int simcall_file_close(smx_file_t fd, smx_host_t host)
{
- return simcall_BODY_file_close(fd);
+ return simcall_BODY_file_close(fd, 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);
}
-/**
- * \ingroup simix_file_management
- *
- */
-xbt_dict_t simcall_file_ls(const char* mount, const char* path)
-{
- return simcall_BODY_file_ls(mount, path);
-}
/**
* \ingroup simix_file_management
*
* \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);
}
/**
* \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);
}
/**
* \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);
}
/**
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 */
