free(storage);
}
-void* SIMIX_pre_file_get_data(smx_simcall_t simcall,smx_file_t fd){
- return SIMIX_file_get_data(fd);
-}
-
-void* SIMIX_file_get_data(smx_file_t fd){
- xbt_assert((fd != NULL), "Invalid parameters (simix file is NULL)");
-
- return fd->data;
-}
-
-void SIMIX_pre_file_set_data(smx_simcall_t simcall, smx_file_t fd, void *data) {
- SIMIX_file_set_data(fd, data);
-}
-
-void SIMIX_file_set_data(smx_file_t fd, void *data){
- xbt_assert((fd != NULL), "Invalid parameter");
-
- fd->data = data;
-}
-
//SIMIX FILE READ
void SIMIX_pre_file_read(smx_simcall_t simcall, smx_file_t fd, sg_size_t size)
{
}
//SIMIX FILE OPEN
-void SIMIX_pre_file_open(smx_simcall_t simcall, const char* mount,
- const char* path)
+void SIMIX_pre_file_open(smx_simcall_t simcall, const char* fullpath)
{
- smx_action_t action = SIMIX_file_open(simcall->issuer, mount, path);
+ smx_action_t action = SIMIX_file_open(simcall->issuer, fullpath);
xbt_fifo_push(action->simcalls, simcall);
simcall->issuer->waiting_action = action;
}
-smx_action_t SIMIX_file_open(smx_process_t process ,const char* mount,
- const char* path)
+smx_action_t SIMIX_file_open(smx_process_t process, const char* fullpath)
{
smx_action_t action;
smx_host_t host = process->smx_host;
#endif
action->io.host = host;
- action->io.surf_io = surf_workstation_open(host, mount, path);
+ action->io.surf_io = surf_workstation_open(host, fullpath);
surf_action_set_data(action->io.surf_io, action);
XBT_DEBUG("Create io action %p", action);
return surf_workstation_file_seek(host, fd->surf_file, offset, origin);
}
-void SIMIX_pre_storage_file_rename(smx_simcall_t simcall, smx_storage_t storage, const char* src, const char* dest)
+int SIMIX_pre_file_move(smx_simcall_t simcall, smx_file_t file, const char* fullpath)
{
- return SIMIX_storage_file_rename(simcall->issuer, storage, src, dest);
+ return SIMIX_file_move(simcall->issuer, file, fullpath);
}
-void SIMIX_storage_file_rename(smx_process_t process, smx_storage_t storage, const char* src, const char* dest)
+int SIMIX_file_move(smx_process_t process, smx_file_t file, const char* fullpath)
{
- return surf_storage_rename(storage, src, dest);
+ smx_host_t host = process->smx_host;
+ return surf_workstation_file_move(host, file->surf_file, fullpath);
}
sg_size_t SIMIX_pre_storage_get_free_size(smx_simcall_t simcall, const char* name)
return sg_storage_name(storage);
}
-void SIMIX_pre_storage_set_data(smx_simcall_t simcall, smx_storage_t storage, void *data) {
- SIMIX_storage_set_data(storage, data);
-}
-void SIMIX_storage_set_data(smx_storage_t storage, void *data){
- xbt_assert((storage != NULL), "Invalid parameters");
- xbt_assert((SIMIX_storage_priv(storage)->data == NULL), "Data already set");
-
- SIMIX_storage_priv(storage)->data = data;
-}
-
-void* SIMIX_pre_storage_get_data(smx_simcall_t simcall,smx_storage_t storage){
- return SIMIX_storage_get_data(storage);
-}
-
-void* SIMIX_storage_get_data(smx_storage_t storage){
- xbt_assert((storage != NULL), "Invalid parameters (simix storage is NULL)");
-
- return SIMIX_storage_priv(storage)->data;
-}
-
xbt_dict_t SIMIX_pre_storage_get_content(smx_simcall_t simcall, smx_storage_t storage){
return SIMIX_storage_get_content(storage);
}
return surf_storage_get_size(storage);
}
+const char* SIMIX_pre_storage_get_host(smx_simcall_t simcall, smx_storage_t storage){
+ return SIMIX_storage_get_host(storage);
+}
+
+const char* SIMIX_storage_get_host(smx_storage_t storage){
+ xbt_assert((storage != NULL), "Invalid parameters");
+ return surf_storage_get_host(storage);
+}
+
void SIMIX_post_io(smx_action_t action)
{
xbt_fifo_item_t i;