X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ea55b530facfb04b499b016152f739e024445aa4..04f2226028a38d3e30f5d7d30ef53b7274f34cca:/src/simix/smx_io.cpp diff --git a/src/simix/smx_io.cpp b/src/simix/smx_io.cpp index 3866492b03..44b42f3931 100644 --- a/src/simix/smx_io.cpp +++ b/src/simix/smx_io.cpp @@ -4,21 +4,28 @@ /* 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" -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_io, simix, - "Logging specific to SIMIX (io)"); +#include "src/kernel/activity/SynchroIo.hpp" + +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) { @@ -38,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); @@ -51,30 +58,22 @@ void SIMIX_storage_destroy(void *s) //SIMIX FILE READ 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); + smx_activity_t synchro = SIMIX_file_read(fd, size, host); + 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_activity_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", host->cname()); - synchro = (smx_synchro_t) xbt_mallocator_get(simix_global->synchro_mallocator); - synchro->type = SIMIX_SYNC_IO; - synchro->name = NULL; - synchro->category = NULL; + simgrid::kernel::activity::Io *synchro = new simgrid::kernel::activity::Io(); + synchro->host = host; + synchro->surf_io = surf_host_read(host, fd->surf_file, size); - synchro->io.host = host; - synchro->io.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; @@ -83,30 +82,20 @@ smx_synchro_t SIMIX_file_read(smx_file_t fd, sg_size_t size, sg_host_t host) //SIMIX FILE WRITE 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); + smx_activity_t synchro = SIMIX_file_write(fd, size, host); + 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_activity_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; + if (host->isOff()) + THROWF(host_error, 0, "Host %s failed, you cannot call this function", host->cname()); - synchro->io.host = host; - synchro->io.surf_io = surf_host_write(host, fd->surf_file, size); - - surf_action_set_data(synchro->io.surf_io, synchro); + 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); XBT_DEBUG("Create io synchro %p", synchro); return synchro; @@ -115,30 +104,20 @@ smx_synchro_t SIMIX_file_write(smx_file_t fd, sg_size_t size, sg_host_t host) //SIMIX FILE OPEN 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); + smx_activity_t synchro = SIMIX_file_open(fullpath, host); + synchro->simcalls.push_back(simcall); simcall->issuer->waiting_synchro = synchro; } -smx_synchro_t SIMIX_file_open(const char* fullpath, sg_host_t host) +smx_activity_t SIMIX_file_open(const char* fullpath, 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_open(host, fullpath); + if (host->isOff()) + THROWF(host_error, 0, "Host %s failed, you cannot call this function", host->cname()); - surf_action_set_data(synchro->io.surf_io, synchro); + 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); XBT_DEBUG("Create io synchro %p", synchro); return synchro; @@ -147,48 +126,34 @@ smx_synchro_t SIMIX_file_open(const char* fullpath, sg_host_t host) //SIMIX FILE CLOSE 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); + smx_activity_t synchro = SIMIX_file_close(fd, host); + 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_activity_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)); - } - - 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); + if (host->isOff()) + THROWF(host_error, 0, "Host %s failed, you cannot call this function", host->cname()); - surf_action_set_data(synchro->io.surf_io, synchro); + 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); XBT_DEBUG("Create io synchro %p", synchro); return synchro; } - //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", host->cname()); 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) @@ -196,7 +161,7 @@ sg_size_t simcall_HANDLER_file_get_size(smx_simcall_t simcall, smx_file_t fd) return SIMIX_file_get_size(simcall->issuer, fd); } -sg_size_t SIMIX_file_get_size(smx_process_t process, smx_file_t fd) +sg_size_t SIMIX_file_get_size(smx_actor_t process, smx_file_t fd) { sg_host_t host = process->host; return surf_host_get_size(host, fd->surf_file); @@ -207,7 +172,7 @@ sg_size_t simcall_HANDLER_file_tell(smx_simcall_t simcall, smx_file_t fd) return SIMIX_file_tell(simcall->issuer, fd); } -sg_size_t SIMIX_file_tell(smx_process_t process, smx_file_t fd) +sg_size_t SIMIX_file_tell(smx_actor_t process, smx_file_t fd) { sg_host_t host = process->host; return surf_host_file_tell(host, fd->surf_file); @@ -219,7 +184,7 @@ xbt_dynar_t simcall_HANDLER_file_get_info(smx_simcall_t simcall, smx_file_t fd) return SIMIX_file_get_info(simcall->issuer, fd); } -xbt_dynar_t SIMIX_file_get_info(smx_process_t process, smx_file_t fd) +xbt_dynar_t SIMIX_file_get_info(smx_actor_t process, smx_file_t fd) { sg_host_t host = process->host; return surf_host_get_info(host, fd->surf_file); @@ -230,7 +195,7 @@ int simcall_HANDLER_file_seek(smx_simcall_t simcall, smx_file_t fd, sg_offset_t return SIMIX_file_seek(simcall->issuer, fd, offset, origin); } -int SIMIX_file_seek(smx_process_t process, smx_file_t fd, sg_offset_t offset, int origin) +int SIMIX_file_seek(smx_actor_t process, smx_file_t fd, sg_offset_t offset, int origin) { sg_host_t host = process->host; return surf_host_file_seek(host, fd->surf_file, offset, origin); @@ -241,14 +206,13 @@ int simcall_HANDLER_file_move(smx_simcall_t simcall, smx_file_t file, const char return SIMIX_file_move(simcall->issuer, file, fullpath); } -int SIMIX_file_move(smx_process_t process, smx_file_t file, const char* fullpath) +int SIMIX_file_move(smx_actor_t process, smx_file_t file, const char* fullpath) { sg_host_t host = process->host; return surf_host_file_move(host, file->surf_file, 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); } @@ -257,7 +221,7 @@ sg_size_t simcall_HANDLER_storage_get_free_size(smx_simcall_t simcall, smx_stora return SIMIX_storage_get_free_size(simcall->issuer, storage); } -sg_size_t SIMIX_storage_get_free_size(smx_process_t process, smx_storage_t storage) +sg_size_t SIMIX_storage_get_free_size(smx_actor_t process, smx_storage_t storage) { return surf_storage_get_free_size(storage); } @@ -267,119 +231,58 @@ sg_size_t simcall_HANDLER_storage_get_used_size(smx_simcall_t simcall, smx_stora return SIMIX_storage_get_used_size(simcall->issuer, storage); } -sg_size_t SIMIX_storage_get_used_size(smx_process_t process, smx_storage_t storage) +sg_size_t SIMIX_storage_get_used_size(smx_actor_t process, smx_storage_t storage) { return surf_storage_get_used_size(storage); } 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) +void SIMIX_io_destroy(smx_activity_t synchro) { + simgrid::kernel::activity::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) +void SIMIX_io_finish(smx_activity_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 (surf_host_get_state(surf_host_resource_priv(simcall->issuer->host)) != SURF_RESOURCE_ON) { + if (simcall->issuer->host->isOff()) { simcall->issuer->context->iwannadie = 1; } - simcall->issuer->waiting_synchro = NULL; + simcall->issuer->waiting_synchro = nullptr; SIMIX_simcall_answer(simcall); }