Implement functions file_read and file_open into simix like fread and fwrite in posix

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

diff --git a/src/simix/smx_io.c b/src/simix/smx_io.c
index 1d16e71..e4072e6 100644 (file)
--- a/src/simix/smx_io.c
+++ b/src/simix/smx_io.c
@@ -4,7 +4,7 @@
 /* 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. */
 
-#include "private.h"
+#include "smx_private.h"
 #include "xbt/sysdep.h"
 #include "xbt/log.h"
 #include "xbt/dict.h"
@@ -13,14 +13,20 @@
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_io, simix,
                                 "Logging specific to SIMIX (io)");
 
-void SIMIX_pre_file_read(smx_req_t req)
+
+//SIMIX FILE READ
+void SIMIX_pre_file_read(smx_simcall_t simcall)
 {
-  smx_action_t action = SIMIX_file_read(req->issuer, req->file_read.name);
-  xbt_fifo_push(action->request_list, req);
-  req->issuer->waiting_action = action;
+  smx_action_t action = SIMIX_file_read(simcall->issuer,
+      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;
 }
 
-smx_action_t SIMIX_file_read(smx_process_t process, char* name)
+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 action;
   smx_host_t host = process->smx_host;
@@ -50,6 +56,48 @@ smx_action_t SIMIX_file_read(smx_process_t process, char* name)
   return action;
 }
 
+//SIMIX FILE WRITE
+void SIMIX_pre_file_write(smx_simcall_t simcall)
+{
+  smx_action_t action = SIMIX_file_write(simcall->issuer,
+      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;
+}
+
+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 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) {
+    THROWF(host_error, 0, "Host %s failed, you cannot call this function",
+           host->name);
+  }
+
+  action = xbt_mallocator_get(simix_global->action_mallocator);
+  action->type = SIMIX_ACTION_IO;
+  action->name = NULL;
+#ifdef HAVE_TRACING
+  action->category = NULL;
+#endif
+
+  action->io.host = host;
+  //  TODO in surf model disk???
+  //  action->io.surf_io = surf_workstation_model->extension.disk.write(host->host, name),
+  action->io.surf_io = surf_workstation_model->extension.workstation.sleep(host->host, 2.0);
+
+  surf_workstation_model->action_data_set(action->io.surf_io, action);
+  XBT_DEBUG("Create io action %p", action);
+
+  return action;
+}
+
 void SIMIX_post_io(smx_action_t action)
 {
   switch (surf_workstation_model->action_state_get(action->io.surf_io)) {
@@ -81,9 +129,9 @@ void SIMIX_io_destroy(smx_action_t action)
 void SIMIX_io_finish(smx_action_t action)
 {
   volatile xbt_fifo_item_t item;
-  smx_req_t req;
+  smx_simcall_t simcall;
 
-  xbt_fifo_foreach(action->request_list, item, req, smx_req_t) {
+  xbt_fifo_foreach(action->simcalls, item, simcall, smx_simcall_t) {
 
     switch (action->state) {
 
@@ -95,8 +143,8 @@ void SIMIX_io_finish(smx_action_t action)
         TRY {
           THROWF(io_error, 0, "IO failed");
         }
-       CATCH(req->issuer->running_ctx->exception) {
-         req->issuer->doexception = 1;
+       CATCH(simcall->issuer->running_ctx->exception) {
+         simcall->issuer->doexception = 1;
        }
       break;
 
@@ -104,8 +152,8 @@ void SIMIX_io_finish(smx_action_t action)
         TRY {
           THROWF(cancel_error, 0, "Canceled");
         }
-       CATCH(req->issuer->running_ctx->exception) {
-         req->issuer->doexception = 1;
+       CATCH(simcall->issuer->running_ctx->exception) {
+         simcall->issuer->doexception = 1;
         }
        break;
 
@@ -113,8 +161,8 @@ void SIMIX_io_finish(smx_action_t action)
         xbt_die("Internal error in SIMIX_io_finish: unexpected action state %d",
             action->state);
     }
-    req->issuer->waiting_action = NULL;
-    SIMIX_request_answer(req);
+    simcall->issuer->waiting_action = NULL;
+    SIMIX_simcall_answer(simcall);
   }
 
   /* We no longer need it */