Avoid (conditionnaly) including C++ headers files in C headers

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

diff --git a/src/simix/smx_io.cpp b/src/simix/smx_io.cpp
index 755f531..41a1ff3 100644 (file)
--- a/src/simix/smx_io.cpp
+++ b/src/simix/smx_io.cpp
@@ -4,12 +4,17 @@
 /* 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 <xbt/ex.hpp>
+#include <xbt/sysdep.h>
+#include <xbt/log.h>
+#include <xbt/dict.h>
+
+#include <simgrid/s4u/host.hpp>
+
+#include <mc/mc.h>
+
 #include "src/surf/surf_interface.hpp"
 #include "smx_private.h"
-#include "xbt/sysdep.h"
-#include "xbt/log.h"
-#include "xbt/dict.h"
-#include "mc/mc.h"
 
 #include "src/simix/SynchroIo.hpp"
 
@@ -20,7 +25,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_io, simix, "Logging specific to SIMIX (io)
  * \brief Internal function to create a SIMIX storage.
  * \param name name of the storage to create
  * \param storage the SURF storage to encapsulate
- * \param data some user data (may be NULL)
+ * \param data some user data (may be nullptr)
  */
 smx_storage_t SIMIX_storage_create(const char *name, void *storage, void *data)
 {
@@ -42,7 +47,7 @@ void SIMIX_storage_destroy(void *s)
 {
   smx_storage_priv_t storage = (smx_storage_priv_t) s;
 
-  xbt_assert((storage != NULL), "Invalid parameters");
+  xbt_assert((storage != nullptr), "Invalid parameters");
   if (storage->data)
     free(storage->data);
 
@@ -54,7 +59,7 @@ void SIMIX_storage_destroy(void *s)
 void simcall_HANDLER_file_read(smx_simcall_t simcall, smx_file_t fd, sg_size_t size, sg_host_t host)
 {
   smx_synchro_t synchro = SIMIX_file_read(fd, size, host);
-  xbt_fifo_push(synchro->simcalls, simcall);
+  synchro->simcalls.push_back(simcall);
   simcall->issuer->waiting_synchro = synchro;
 }
 
@@ -66,7 +71,6 @@ smx_synchro_t SIMIX_file_read(smx_file_t fd, sg_size_t size, sg_host_t host)
 
 
   simgrid::simix::Io *synchro = new simgrid::simix::Io();
-  synchro->name = NULL;
   synchro->host = host;
   synchro->surf_io = surf_host_read(host, fd->surf_file, size);
 
@@ -80,7 +84,7 @@ smx_synchro_t SIMIX_file_read(smx_file_t fd, sg_size_t size, sg_host_t host)
 void simcall_HANDLER_file_write(smx_simcall_t simcall, smx_file_t fd, sg_size_t size, sg_host_t host)
 {
   smx_synchro_t synchro = SIMIX_file_write(fd,  size, host);
-  xbt_fifo_push(synchro->simcalls, simcall);
+  synchro->simcalls.push_back(simcall);
   simcall->issuer->waiting_synchro = synchro;
 }
 
@@ -90,7 +94,6 @@ smx_synchro_t SIMIX_file_write(smx_file_t fd, sg_size_t size, sg_host_t host)
     THROWF(host_error, 0, "Host %s failed, you cannot call this function", sg_host_get_name(host));
 
   simgrid::simix::Io *synchro = new simgrid::simix::Io();
-  synchro->name = NULL;
   synchro->host = host;
   synchro->surf_io = surf_host_write(host, fd->surf_file, size);
   synchro->surf_io->setData(synchro);
@@ -103,7 +106,7 @@ smx_synchro_t SIMIX_file_write(smx_file_t fd, sg_size_t size, sg_host_t host)
 void simcall_HANDLER_file_open(smx_simcall_t simcall, const char* fullpath, sg_host_t host)
 {
   smx_synchro_t synchro = SIMIX_file_open(fullpath, host);
-  xbt_fifo_push(synchro->simcalls, simcall);
+  synchro->simcalls.push_back(simcall);
   simcall->issuer->waiting_synchro = synchro;
 }
 
@@ -113,7 +116,6 @@ smx_synchro_t SIMIX_file_open(const char* fullpath, sg_host_t host)
     THROWF(host_error, 0, "Host %s failed, you cannot call this function", sg_host_get_name(host));
 
   simgrid::simix::Io *synchro = new simgrid::simix::Io();
-  synchro->name = NULL;
   synchro->host = host;
   synchro->surf_io = surf_host_open(host, fullpath);
   synchro->surf_io->setData(synchro);
@@ -126,7 +128,7 @@ smx_synchro_t SIMIX_file_open(const char* fullpath, sg_host_t host)
 void simcall_HANDLER_file_close(smx_simcall_t simcall, smx_file_t fd, sg_host_t host)
 {
   smx_synchro_t synchro = SIMIX_file_close(fd, host);
-  xbt_fifo_push(synchro->simcalls, simcall);
+  synchro->simcalls.push_back(simcall);
   simcall->issuer->waiting_synchro = synchro;
 }
 
@@ -136,7 +138,6 @@ smx_synchro_t SIMIX_file_close(smx_file_t fd, sg_host_t host)
     THROWF(host_error, 0, "Host %s failed, you cannot call this function", sg_host_get_name(host));
 
   simgrid::simix::Io *synchro = new simgrid::simix::Io();
-  synchro->name = NULL;
   synchro->host = host;
   synchro->surf_io = surf_host_close(host, fd->surf_file);
   synchro->surf_io->setData(synchro);
@@ -255,52 +256,6 @@ const char* SIMIX_storage_get_host(smx_storage_t storage){
 
 void SIMIX_post_io(smx_synchro_t synchro)
 {
-  xbt_fifo_item_t i;
-  smx_simcall_t simcall;
-
-  simgrid::simix::Io *io = static_cast<simgrid::simix::Io*>(synchro);
-
-  xbt_fifo_foreach(synchro->simcalls,i,simcall,smx_simcall_t) {
-    switch (simcall->call) {
-    case SIMCALL_FILE_OPEN: {
-      smx_file_t tmp = xbt_new(s_smx_file_t,1);
-      tmp->surf_file = surf_storage_action_get_file(io->surf_io);
-      simcall_file_open__set__result(simcall, tmp);
-      break;
-    }
-    case SIMCALL_FILE_CLOSE:
-      xbt_free(simcall_file_close__get__fd(simcall));
-      simcall_file_close__set__result(simcall, 0);
-      break;
-    case SIMCALL_FILE_WRITE:
-      simcall_file_write__set__result(simcall, io->surf_io->getCost());
-      break;
-
-    case SIMCALL_FILE_READ:
-      simcall_file_read__set__result(simcall, io->surf_io->getCost());
-      break;
-
-    default:
-      break;
-    }
-  }
-
-  switch (io->surf_io->getState()) {
-
-    case simgrid::surf::Action::State::failed:
-      synchro->state = SIMIX_FAILED;
-      break;
-
-    case simgrid::surf::Action::State::done:
-      synchro->state = SIMIX_DONE;
-      break;
-
-    default:
-      THROW_IMPOSSIBLE;
-      break;
-  }
-
-  SIMIX_io_finish(synchro);
 }
 
 void SIMIX_io_destroy(smx_synchro_t synchro)
@@ -314,10 +269,7 @@ void SIMIX_io_destroy(smx_synchro_t synchro)
 
 void SIMIX_io_finish(smx_synchro_t synchro)
 {
-  xbt_fifo_item_t item;
-  smx_simcall_t simcall;
-
-  xbt_fifo_foreach(synchro->simcalls, item, simcall, smx_simcall_t) {
+  for (smx_simcall_t simcall : synchro->simcalls) {
 
     switch (synchro->state) {
 
@@ -342,7 +294,7 @@ void SIMIX_io_finish(smx_synchro_t synchro)
       simcall->issuer->context->iwannadie = 1;
     }
 
-    simcall->issuer->waiting_synchro = NULL;
+    simcall->issuer->waiting_synchro = nullptr;
     SIMIX_simcall_answer(simcall);
   }