X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c620ebc670a6dd5c6605e643fb4cbc7e61b991d4..b6fe7e75cd720400327e0585247824b7b82805aa:/src/simix/smx_io.cpp diff --git a/src/simix/smx_io.cpp b/src/simix/smx_io.cpp index c465d624a6..c4eaa4a677 100644 --- a/src/simix/smx_io.cpp +++ b/src/simix/smx_io.cpp @@ -4,14 +4,19 @@ /* 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 +#include +#include +#include + +#include + +#include + #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" +#include "src/kernel/activity/SynchroIo.hpp" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_io, simix, "Logging specific to SIMIX (io)"); @@ -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) { @@ -40,9 +45,9 @@ smx_storage_t SIMIX_storage_create(const char *name, void *storage, void *data) */ void SIMIX_storage_destroy(void *s) { - smx_storage_priv_t storage = (smx_storage_priv_t) s; + smx_storage_priv_t storage = static_cast(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; } @@ -65,7 +70,7 @@ smx_synchro_t SIMIX_file_read(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(); + simgrid::kernel::activity::Io *synchro = new simgrid::kernel::activity::Io(); synchro->host = host; synchro->surf_io = surf_host_read(host, fd->surf_file, size); @@ -79,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; } @@ -88,7 +93,7 @@ smx_synchro_t SIMIX_file_write(smx_file_t fd, sg_size_t size, sg_host_t host) if (host->isOff()) 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(); + simgrid::kernel::activity::Io *synchro = new simgrid::kernel::activity::Io(); synchro->host = host; synchro->surf_io = surf_host_write(host, fd->surf_file, size); synchro->surf_io->setData(synchro); @@ -101,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; } @@ -110,7 +115,7 @@ smx_synchro_t SIMIX_file_open(const char* fullpath, sg_host_t host) if (host->isOff()) 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(); + simgrid::kernel::activity::Io *synchro = new simgrid::kernel::activity::Io(); synchro->host = host; synchro->surf_io = surf_host_open(host, fullpath); synchro->surf_io->setData(synchro); @@ -123,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; } @@ -132,7 +137,7 @@ smx_synchro_t SIMIX_file_close(smx_file_t fd, sg_host_t host) if (host->isOff()) 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(); + simgrid::kernel::activity::Io *synchro = new simgrid::kernel::activity::Io(); synchro->host = host; synchro->surf_io = surf_host_close(host, fd->surf_file); synchro->surf_io->setData(synchro); @@ -141,7 +146,6 @@ smx_synchro_t SIMIX_file_close(smx_file_t fd, sg_host_t host) return synchro; } - //SIMIX FILE UNLINK int SIMIX_file_unlink(smx_file_t fd, sg_host_t host) { @@ -150,7 +154,7 @@ int SIMIX_file_unlink(smx_file_t fd, sg_host_t host) int res = surf_host_unlink(host, fd->surf_file); xbt_free(fd); - return !!res; + return res; } sg_size_t simcall_HANDLER_file_get_size(smx_simcall_t simcall, smx_file_t fd) @@ -249,13 +253,9 @@ const char* SIMIX_storage_get_host(smx_storage_t storage){ return surf_storage_get_host(storage); } -void SIMIX_post_io(smx_synchro_t synchro) -{ -} - void SIMIX_io_destroy(smx_synchro_t synchro) { - simgrid::simix::Io *io = static_cast(synchro); + simgrid::kernel::activity::Io *io = static_cast(synchro); XBT_DEBUG("Destroy synchro %p", synchro); if (io->surf_io) io->surf_io->unref(); @@ -264,35 +264,26 @@ 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) { - case SIMIX_DONE: /* do nothing, synchro done */ break; - case SIMIX_FAILED: SMX_EXCEPTION(simcall->issuer, io_error, 0, "IO failed"); break; - case SIMIX_CANCELED: SMX_EXCEPTION(simcall->issuer, cancel_error, 0, "Canceled"); break; - default: - xbt_die("Internal error in SIMIX_io_finish: unexpected synchro state %d", - (int)synchro->state); + xbt_die("Internal error in SIMIX_io_finish: unexpected synchro state %d", static_cast(synchro->state)); } if (simcall->issuer->host->isOff()) { simcall->issuer->context->iwannadie = 1; } - simcall->issuer->waiting_synchro = NULL; + simcall->issuer->waiting_synchro = nullptr; SIMIX_simcall_answer(simcall); }