X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/22ee43de174bafecc4d073e1e7fba1f6c45a678d..e51ea751d20f2437b9b350a3bab1db3c257fb54f:/src/simix/smx_io.c

diff --git a/src/simix/smx_io.c b/src/simix/smx_io.c
index 031577da60..6c7868c614 100644
--- a/src/simix/smx_io.c
+++ b/src/simix/smx_io.c
@@ -18,6 +18,7 @@ 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,
@@ -26,7 +27,7 @@ void SIMIX_pre_file_read(smx_simcall_t simcall)
   simcall->issuer->waiting_action = action;
 }
 
-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, smx_file_t stream)
 {
   smx_action_t action;
   smx_host_t host = process->smx_host;
@@ -46,9 +47,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_file),
 
   surf_workstation_model->action_data_set(action->io.surf_io, action);
   XBT_DEBUG("Create io action %p", action);
@@ -60,6 +59,7 @@ 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,
@@ -68,7 +68,7 @@ void SIMIX_pre_file_write(smx_simcall_t simcall)
   simcall->issuer->waiting_action = action;
 }
 
-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, smx_file_t stream)
 {
   smx_action_t action;
   smx_host_t host = process->smx_host;
@@ -88,9 +88,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_file);
 
   surf_workstation_model->action_data_set(action->io.surf_io, action);
   XBT_DEBUG("Create io action %p", action);
@@ -102,13 +100,14 @@ 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;
 }
 
-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 +127,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 +139,13 @@ 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;
 }
 
-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, smx_file_t fp)
 {
   smx_action_t action;
   smx_host_t host = process->smx_host;
@@ -167,9 +165,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_file);
 
   surf_workstation_model->action_data_set(action->io.surf_io, action);
   XBT_DEBUG("Create io action %p", action);
@@ -181,17 +177,17 @@ 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;
 }
 
-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, smx_file_t fd, s_file_stat_t buf)
 {
   smx_action_t action;
   smx_host_t host = process->smx_host;
-
   /* check if the host is active */
   if (surf_workstation_model->extension.
       workstation.get_state(host->host) != SURF_RESOURCE_ON) {
@@ -207,9 +203,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->surf_file);
 
   surf_workstation_model->action_data_set(action->io.surf_io, action);
   XBT_DEBUG("Create io action %p", action);
@@ -219,6 +213,35 @@ smx_action_t SIMIX_file_stat(smx_process_t process, int fd, void* buf)
 
 void SIMIX_post_io(smx_action_t action)
 {
+  xbt_fifo_item_t i;
+  smx_simcall_t simcall;
+
+  xbt_fifo_foreach(action->simcalls,i,simcall,smx_simcall_t) {
+    switch (simcall->call) {
+    case SIMCALL_FILE_OPEN:
+      simcall->file_open.result = xbt_new(s_smx_file_t,1);
+      simcall->file_open.result->surf_file = (action->io.surf_io)->file;
+      break;
+    case SIMCALL_FILE_CLOSE:
+      simcall->file_read.result = 0;
+      break;
+    case SIMCALL_FILE_WRITE:
+      simcall->file_write.result = (action->io.surf_io)->cost;
+      break;
+    case SIMCALL_FILE_READ:
+      simcall->file_read.result = (action->io.surf_io)->cost;
+      break;
+    case SIMCALL_FILE_STAT:
+      simcall->file_stat.result = 0;
+      s_file_stat_t *dst = &(simcall->file_stat.buf);
+      s_file_stat_t *src = &((action->io.surf_io)->stat);
+      file_stat_copy(src,dst);
+      break;
+    default:
+      break;
+    }
+  }
+
   switch (surf_workstation_model->action_state_get(action->io.surf_io)) {
 
     case SURF_ACTION_FAILED:
@@ -247,7 +270,7 @@ void SIMIX_io_destroy(smx_action_t action)
 
 void SIMIX_io_finish(smx_action_t action)
 {
-  volatile xbt_fifo_item_t item;
+  xbt_fifo_item_t item;
   smx_simcall_t simcall;
 
   xbt_fifo_foreach(action->simcalls, item, simcall, smx_simcall_t) {
@@ -259,26 +282,16 @@ void SIMIX_io_finish(smx_action_t action)
         break;
 
       case SIMIX_FAILED:
-        TRY {
-          THROWF(io_error, 0, "IO failed");
-        }
-	CATCH(simcall->issuer->running_ctx->exception) {
-	  simcall->issuer->doexception = 1;
-	}
-      break;
+        SMX_EXCEPTION(simcall->issuer, io_error, 0, "IO failed");
+        break;
 
       case SIMIX_CANCELED:
-        TRY {
-          THROWF(cancel_error, 0, "Canceled");
-        }
-	CATCH(simcall->issuer->running_ctx->exception) {
-	  simcall->issuer->doexception = 1;
-        }
-	break;
+        SMX_EXCEPTION(simcall->issuer, cancel_error, 0, "Canceled");
+        break;
 
       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);