* 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);
}
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
*/
*/
void simcall_sem_destroy(smx_sem_t sem)
{
- simcall_sem_destroy(sem);
+ simcall_BODY_sem_destroy(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_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);
}
/**
return simcall_BODY_file_unlink(fd);
}
-/**
- * \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
+ * \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);
}
/**
* \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);
}
/**