X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ea55b530facfb04b499b016152f739e024445aa4..c02558d70f9c62f9f5d04f1830be4cf16ca84bc0:/src/simix/smx_io.cpp diff --git a/src/simix/smx_io.cpp b/src/simix/smx_io.cpp index 3866492b03..c4a1033589 100644 --- a/src/simix/smx_io.cpp +++ b/src/simix/smx_io.cpp @@ -4,14 +4,16 @@ /* 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 "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" -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_io, simix, - "Logging specific to SIMIX (io)"); +#include "src/simix/SynchroIo.hpp" + +XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_io, simix, "Logging specific to SIMIX (io)"); /** @@ -52,29 +54,22 @@ 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; } smx_synchro_t SIMIX_file_read(smx_file_t fd, sg_size_t size, sg_host_t host) { - smx_synchro_t synchro; - /* check if the host is active */ - if (surf_host_get_state(surf_host_resource_priv(host)) != SURF_RESOURCE_ON) { - THROWF(host_error, 0, "Host %s failed, you cannot call this function", - sg_host_get_name(host)); - } + if (host->isOff()) + THROWF(host_error, 0, "Host %s failed, you cannot call this function", sg_host_get_name(host)); - synchro = (smx_synchro_t) xbt_mallocator_get(simix_global->synchro_mallocator); - synchro->type = SIMIX_SYNC_IO; - synchro->name = NULL; - synchro->category = NULL; - synchro->io.host = host; - synchro->io.surf_io = surf_host_read(host, fd->surf_file, size); + simgrid::simix::Io *synchro = new simgrid::simix::Io(); + synchro->host = host; + synchro->surf_io = surf_host_read(host, fd->surf_file, size); - surf_action_set_data(synchro->io.surf_io, synchro); + synchro->surf_io->setData(synchro); XBT_DEBUG("Create io synchro %p", synchro); return synchro; @@ -84,29 +79,19 @@ 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; } smx_synchro_t SIMIX_file_write(smx_file_t fd, sg_size_t size, sg_host_t host) { - smx_synchro_t synchro; - - /* check if the host is active */ - if (surf_host_get_state(surf_host_resource_priv(host)) != SURF_RESOURCE_ON) { - THROWF(host_error, 0, "Host %s failed, you cannot call this function", - sg_host_get_name(host)); - } - - synchro = (smx_synchro_t) xbt_mallocator_get(simix_global->synchro_mallocator); - synchro->type = SIMIX_SYNC_IO; - synchro->name = NULL; - synchro->category = NULL; - - synchro->io.host = host; - synchro->io.surf_io = surf_host_write(host, fd->surf_file, size); + if (host->isOff()) + THROWF(host_error, 0, "Host %s failed, you cannot call this function", sg_host_get_name(host)); - surf_action_set_data(synchro->io.surf_io, synchro); + simgrid::simix::Io *synchro = new simgrid::simix::Io(); + synchro->host = host; + synchro->surf_io = surf_host_write(host, fd->surf_file, size); + synchro->surf_io->setData(synchro); XBT_DEBUG("Create io synchro %p", synchro); return synchro; @@ -116,29 +101,19 @@ 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; } smx_synchro_t SIMIX_file_open(const char* fullpath, sg_host_t host) { - smx_synchro_t synchro; + if (host->isOff()) + THROWF(host_error, 0, "Host %s failed, you cannot call this function", sg_host_get_name(host)); - /* check if the host is active */ - if (surf_host_get_state(surf_host_resource_priv(host)) != SURF_RESOURCE_ON) { - THROWF(host_error, 0, "Host %s failed, you cannot call this function", - sg_host_get_name(host)); - } - - synchro = (smx_synchro_t) xbt_mallocator_get(simix_global->synchro_mallocator); - synchro->type = SIMIX_SYNC_IO; - synchro->name = NULL; - synchro->category = NULL; - - synchro->io.host = host; - synchro->io.surf_io = surf_host_open(host, fullpath); - - surf_action_set_data(synchro->io.surf_io, synchro); + simgrid::simix::Io *synchro = new simgrid::simix::Io(); + synchro->host = host; + synchro->surf_io = surf_host_open(host, fullpath); + synchro->surf_io->setData(synchro); XBT_DEBUG("Create io synchro %p", synchro); return synchro; @@ -148,29 +123,19 @@ 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; } smx_synchro_t SIMIX_file_close(smx_file_t fd, sg_host_t host) { - smx_synchro_t synchro; - - /* check if the host is active */ - if (surf_host_get_state(surf_host_resource_priv(host)) != SURF_RESOURCE_ON) { - THROWF(host_error, 0, "Host %s failed, you cannot call this function", - sg_host_get_name(host)); - } + if (host->isOff()) + THROWF(host_error, 0, "Host %s failed, you cannot call this function", sg_host_get_name(host)); - synchro = (smx_synchro_t) xbt_mallocator_get(simix_global->synchro_mallocator); - synchro->type = SIMIX_SYNC_IO; - synchro->name = NULL; - synchro->category = NULL; - - synchro->io.host = host; - synchro->io.surf_io = surf_host_close(host, fd->surf_file); - - surf_action_set_data(synchro->io.surf_io, synchro); + simgrid::simix::Io *synchro = new simgrid::simix::Io(); + synchro->host = host; + synchro->surf_io = surf_host_close(host, fd->surf_file); + synchro->surf_io->setData(synchro); XBT_DEBUG("Create io synchro %p", synchro); return synchro; @@ -180,11 +145,8 @@ smx_synchro_t SIMIX_file_close(smx_file_t fd, sg_host_t host) //SIMIX FILE UNLINK int SIMIX_file_unlink(smx_file_t fd, sg_host_t host) { - /* check if the host is active */ - if (surf_host_get_state(surf_host_resource_priv(host)) != SURF_RESOURCE_ON) { - THROWF(host_error, 0, "Host %s failed, you cannot call this function", - sg_host_get_name(host)); - } + if (host->isOff()) + THROWF(host_error, 0, "Host %s failed, you cannot call this function", sg_host_get_name(host)); int res = surf_host_unlink(host, fd->surf_file); xbt_free(fd); @@ -248,7 +210,6 @@ int SIMIX_file_move(smx_process_t process, smx_file_t file, const char* fullpath } sg_size_t SIMIX_storage_get_size(smx_storage_t storage){ - xbt_assert((storage != NULL), "Invalid parameters (simix storage is NULL)"); return surf_storage_get_size(storage); } @@ -273,88 +234,37 @@ sg_size_t SIMIX_storage_get_used_size(smx_process_t process, smx_storage_t stora } xbt_dict_t SIMIX_storage_get_properties(smx_storage_t storage){ - xbt_assert((storage != NULL), "Invalid parameters (simix storage is NULL)"); - return (xbt_dict_t) surf_resource_get_properties((surf_cpp_resource_t) - surf_storage_resource_priv(storage)); + return surf_storage_get_properties(storage); } const char* SIMIX_storage_get_name(smx_storage_t storage){ - xbt_assert((storage != NULL), "Invalid parameters"); return sg_storage_name(storage); } xbt_dict_t SIMIX_storage_get_content(smx_storage_t storage){ - xbt_assert((storage != NULL), "Invalid parameters (simix storage is NULL)"); return surf_storage_get_content(storage); } const char* SIMIX_storage_get_host(smx_storage_t storage){ - xbt_assert((storage != NULL), "Invalid parameters"); return surf_storage_get_host(storage); } void SIMIX_post_io(smx_synchro_t synchro) { - xbt_fifo_item_t i; - smx_simcall_t simcall; - - 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(synchro->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, surf_action_get_cost(synchro->io.surf_io)); - break; - - case SIMCALL_FILE_READ: - simcall_file_read__set__result(simcall, surf_action_get_cost(synchro->io.surf_io)); - break; - - default: - break; - } - } - - switch (surf_action_get_state(synchro->io.surf_io)) { - - case SURF_ACTION_FAILED: - synchro->state = SIMIX_FAILED; - break; - - case SURF_ACTION_DONE: - synchro->state = SIMIX_DONE; - break; - - default: - THROW_IMPOSSIBLE; - break; - } - - SIMIX_io_finish(synchro); } void SIMIX_io_destroy(smx_synchro_t synchro) { + simgrid::simix::Io *io = static_cast(synchro); XBT_DEBUG("Destroy synchro %p", synchro); - if (synchro->io.surf_io) - surf_action_unref(synchro->io.surf_io); - xbt_mallocator_release(simix_global->synchro_mallocator, synchro); + if (io->surf_io) + io->surf_io->unref(); + delete io; } 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) { @@ -375,7 +285,7 @@ void SIMIX_io_finish(smx_synchro_t synchro) (int)synchro->state); } - if (surf_host_get_state(surf_host_resource_priv(simcall->issuer->host)) != SURF_RESOURCE_ON) { + if (simcall->issuer->host->isOff()) { simcall->issuer->context->iwannadie = 1; }