better rendering of simgrid_modules.png (and corrected font for TRACE module)

[simgrid.git] / src / simix / smx_io.c

diff --git a/src/simix/smx_io.c b/src/simix/smx_io.c
index a19b309..209d825 100644 (file)
--- a/src/simix/smx_io.c
+++ b/src/simix/smx_io.c
@@ -18,15 +18,17 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_io, simix,
 void SIMIX_pre_file_read(smx_simcall_t simcall)
 {
   smx_action_t action = SIMIX_file_read(simcall->issuer,
+      simcall->file_read.storage,
       simcall->file_read.ptr,
       simcall->file_read.size,
       simcall->file_read.nmemb,
       simcall->file_read.stream);
   xbt_fifo_push(action->simcalls, simcall);
   simcall->issuer->waiting_action = action;
+  simcall->file_read.result = (action->io.surf_io)->read_write;
 }
 
-smx_action_t SIMIX_file_read(smx_process_t process, void* ptr, size_t size, size_t nmemb, smx_file_t stream)
+smx_action_t SIMIX_file_read(smx_process_t process, const char* storage, void* ptr, size_t size, size_t nmemb, m_file_t stream)
 {
   smx_action_t action;
   smx_host_t host = process->smx_host;
@@ -46,9 +48,7 @@ smx_action_t SIMIX_file_read(smx_process_t process, void* ptr, size_t size, size
 #endif
 
   action->io.host = host;
-  //  TODO in surf model disk???
-  //  action->io.surf_io = surf_workstation_model->extension.storage.read(host->host, name),
-  action->io.surf_io = surf_workstation_model->extension.workstation.sleep(host->host, 1.0);
+  action->io.surf_io = surf_workstation_model->extension.workstation.read(host->host, storage, ptr, size, nmemb, stream),
 
   surf_workstation_model->action_data_set(action->io.surf_io, action);
   XBT_DEBUG("Create io action %p", action);
@@ -60,15 +60,17 @@ smx_action_t SIMIX_file_read(smx_process_t process, void* ptr, size_t size, size
 void SIMIX_pre_file_write(smx_simcall_t simcall)
 {
   smx_action_t action = SIMIX_file_write(simcall->issuer,
+      simcall->file_write.storage,
       simcall->file_write.ptr,
       simcall->file_write.size,
       simcall->file_write.nmemb,
       simcall->file_write.stream);
   xbt_fifo_push(action->simcalls, simcall);
   simcall->issuer->waiting_action = action;
+  simcall->file_write.result = (action->io.surf_io)->read_write;
 }
 
-smx_action_t SIMIX_file_write(smx_process_t process, const void* ptr, size_t size, size_t nmemb, smx_file_t stream)
+smx_action_t SIMIX_file_write(smx_process_t process, const char* storage, const void* ptr, size_t size, size_t nmemb, m_file_t stream)
 {
   smx_action_t action;
   smx_host_t host = process->smx_host;
@@ -88,9 +90,7 @@ smx_action_t SIMIX_file_write(smx_process_t process, const void* ptr, size_t siz
 #endif
 
   action->io.host = host;
-  //  TODO in surf model disk???
-  //  action->io.surf_io = surf_workstation_model->extension.storage.write(host->host, name),
-  action->io.surf_io = surf_workstation_model->extension.workstation.sleep(host->host, 2.0);
+  action->io.surf_io = surf_workstation_model->extension.workstation.write(host->host, storage, ptr, size, nmemb, stream);
 
   surf_workstation_model->action_data_set(action->io.surf_io, action);
   XBT_DEBUG("Create io action %p", action);
@@ -102,13 +102,15 @@ smx_action_t SIMIX_file_write(smx_process_t process, const void* ptr, size_t siz
 void SIMIX_pre_file_open(smx_simcall_t simcall)
 {
   smx_action_t action = SIMIX_file_open(simcall->issuer,
+      simcall->file_open.storage,
       simcall->file_open.path,
       simcall->file_open.mode);
   xbt_fifo_push(action->simcalls, simcall);
   simcall->issuer->waiting_action = action;
+  simcall->file_open.result = (action->io.surf_io)->file;
 }
 
-smx_action_t SIMIX_file_open(smx_process_t process, const char* path, const char* mode)
+smx_action_t SIMIX_file_open(smx_process_t process ,const char* storage, const char* path, const char* mode)
 {
   smx_action_t action;
   smx_host_t host = process->smx_host;
@@ -128,9 +130,7 @@ smx_action_t SIMIX_file_open(smx_process_t process, const char* path, const char
 #endif
 
   action->io.host = host;
-  //  TODO in surf model disk???
-  //  action->io.surf_io = surf_workstation_model->extension.storage.open(host->host, name),
-  action->io.surf_io = surf_workstation_model->extension.workstation.sleep(host->host, 3.0);
+  action->io.surf_io = surf_workstation_model->extension.workstation.open(host->host, storage, path, mode);
 
   surf_workstation_model->action_data_set(action->io.surf_io, action);
   XBT_DEBUG("Create io action %p", action);
@@ -142,12 +142,14 @@ smx_action_t SIMIX_file_open(smx_process_t process, const char* path, const char
 void SIMIX_pre_file_close(smx_simcall_t simcall)
 {
   smx_action_t action = SIMIX_file_close(simcall->issuer,
+      simcall->file_close.storage,
       simcall->file_close.fp);
   xbt_fifo_push(action->simcalls, simcall);
   simcall->issuer->waiting_action = action;
+  simcall->file_close.result = 0;
 }
 
-smx_action_t SIMIX_file_close(smx_process_t process, smx_file_t fp)
+smx_action_t SIMIX_file_close(smx_process_t process ,const char* storage, m_file_t fp)
 {
   smx_action_t action;
   smx_host_t host = process->smx_host;
@@ -167,9 +169,7 @@ smx_action_t SIMIX_file_close(smx_process_t process, smx_file_t fp)
 #endif
 
   action->io.host = host;
-  //  TODO in surf model disk???
-  //  action->io.surf_io = surf_workstation_model->extension.storage.close(host->host, name),
-  action->io.surf_io = surf_workstation_model->extension.workstation.sleep(host->host, 4.0);
+  action->io.surf_io = surf_workstation_model->extension.workstation.close(host->host, storage, fp);
 
   surf_workstation_model->action_data_set(action->io.surf_io, action);
   XBT_DEBUG("Create io action %p", action);
@@ -181,13 +181,15 @@ smx_action_t SIMIX_file_close(smx_process_t process, smx_file_t fp)
 void SIMIX_pre_file_stat(smx_simcall_t simcall)
 {
   smx_action_t action = SIMIX_file_stat(simcall->issuer,
+      simcall->file_stat.storage,
       simcall->file_stat.fd,
       simcall->file_stat.buf);
   xbt_fifo_push(action->simcalls, simcall);
   simcall->issuer->waiting_action = action;
+  simcall->file_stat.result = 0;
 }
 
-smx_action_t SIMIX_file_stat(smx_process_t process, int fd, void* buf)
+smx_action_t SIMIX_file_stat(smx_process_t process ,const char* storage, int fd, void* buf)
 {
   smx_action_t action;
   smx_host_t host = process->smx_host;
@@ -207,9 +209,7 @@ smx_action_t SIMIX_file_stat(smx_process_t process, int fd, void* buf)
 #endif
 
   action->io.host = host;
-  //  TODO in surf model disk???
-  //  action->io.surf_io = surf_workstation_model->extension.storage.stat(host->host, name),
-  action->io.surf_io = surf_workstation_model->extension.workstation.sleep(host->host, 5.0);
+  action->io.surf_io = surf_workstation_model->extension.workstation.stat(host->host, storage, fd, buf);
 
   surf_workstation_model->action_data_set(action->io.surf_io, action);
   XBT_DEBUG("Create io action %p", action);
@@ -268,7 +268,7 @@ void SIMIX_io_finish(smx_action_t action)
 
       default:
         xbt_die("Internal error in SIMIX_io_finish: unexpected action state %d",
-            action->state);
+            (int)action->state);
     }
     simcall->issuer->waiting_action = NULL;
     SIMIX_simcall_answer(simcall);