/* 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. */
/* 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
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.
* \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,
/* 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);
}
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);
}
* 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);
}
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()) {
/* 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,
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");
/* 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
*/
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
*/
*/
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_destroy(smx_sem_t sem)
{
- simcall_sem_destroy(sem);
+ simcall_BODY_sem_destroy(sem);
}
/**
*/
void simcall_sem_release(smx_sem_t sem)
{
- simcall_BODY_sem_release(sem);
+ simcall_BODY_sem_release(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_storage_size_t simcall_file_read(smx_file_t fd, sg_storage_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_storage_size_t simcall_file_write(smx_file_t fd, sg_storage_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)
{
- return simcall_BODY_file_open(mount, path);
+ return simcall_BODY_file_unlink(fd);
}
/**
* \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);
+ return simcall_BODY_file_get_info(fd);
}
+
/**
* \ingroup simix_file_management
*
*/
-sg_storage_size_t simcall_file_get_size (smx_file_t fd){
- return simcall_BODY_file_get_size(fd);
+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
+ * \brief Move a file to another location on the *same mount point*.
*
*/
-xbt_dynar_t simcall_file_get_info(smx_file_t fd)
+int simcall_file_move(smx_file_t fd, const char* fullpath)
{
- return simcall_BODY_file_get_info(fd);
+ 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
- * \return Return the free space size on a given storage element (as sg_storage_size_t)
+ * \param storage a storage
+ * \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){
- 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
- * \return Return the used space size on a given storage element (as sg_storage_size_t)
+ * \param storage a storage
+ * \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){
- 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_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);
}
/**
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);
}
