X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e81b0628a697bddad304e69a82d898299ff9fe40..19016c1363a1c0409a35940ad406e88057fdba73:/src/simix/smx_io.cpp diff --git a/src/simix/smx_io.cpp b/src/simix/smx_io.cpp index 1485d5903a..602a9e47e2 100644 --- a/src/simix/smx_io.cpp +++ b/src/simix/smx_io.cpp @@ -1,271 +1,60 @@ -/* Copyright (c) 2007-2010, 2012-2015. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2007-2019. The SimGrid Team. All rights reserved. */ /* 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 "mc/mc.h" +#include "simgrid/Exception.hpp" +#include "simgrid/s4u/Host.hpp" +#include "simgrid/s4u/Io.hpp" -#include - -#include - -#include "src/surf/surf_interface.hpp" -#include "smx_private.h" - -#include "src/kernel/activity/SynchroIo.hpp" +#include "smx_private.hpp" +#include "src/kernel/activity/IoImpl.hpp" +#include "src/mc/mc_replay.hpp" +#include "src/simix/smx_io_private.hpp" +#include "src/surf/StorageImpl.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 nullptr) - */ -smx_storage_t SIMIX_storage_create(const char *name, void *storage, void *data) +simgrid::kernel::activity::IoImplPtr SIMIX_io_start(std::string name, sg_size_t size, sg_storage_t storage, + simgrid::s4u::Io::OpType type) { - smx_storage_priv_t smx_storage = xbt_new0(s_smx_storage_priv_t, 1); + /* set surf's action */ + simgrid::kernel::resource::Action* surf_action = storage->get_impl()->io_start(size, type); - smx_storage->data = data; + simgrid::kernel::activity::IoImplPtr io = + simgrid::kernel::activity::IoImplPtr(new simgrid::kernel::activity::IoImpl(name, surf_action, storage)); - /* Update global variables */ - xbt_lib_set(storage_lib,name,SIMIX_STORAGE_LEVEL,smx_storage); - return xbt_lib_get_elm_or_null(storage_lib, name); -} - -/** - * \brief Internal function to destroy a SIMIX storage. - * - * \param s the host to destroy (a smx_storage_t) - */ -void SIMIX_storage_destroy(void *s) -{ - smx_storage_priv_t storage = static_cast(s); + XBT_DEBUG("Create IO synchro %p %s", io.get(), name.c_str()); + simgrid::kernel::activity::IoImpl::on_creation(io); - xbt_assert((storage != nullptr), "Invalid parameters"); - if (storage->data) - free(storage->data); - - /* Clean storage structure */ - free(storage); -} - -//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_activity_t synchro = SIMIX_file_read(fd, size, host); - synchro->simcalls.push_back(simcall); - simcall->issuer->waiting_synchro = synchro; + return io; } -smx_activity_t SIMIX_file_read(smx_file_t fd, sg_size_t size, sg_host_t host) +void simcall_HANDLER_io_wait(smx_simcall_t simcall, smx_activity_t synchro) { - /* check if the host is active */ - if (host->isOff()) - THROWF(host_error, 0, "Host %s failed, you cannot call this function", sg_host_get_name(host)); - + XBT_DEBUG("Wait for execution of synchro %p, state %d", synchro.get(), (int)synchro->state_); - 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->surf_io->setData(synchro); - XBT_DEBUG("Create io synchro %p", synchro); - - return synchro; -} - -//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_activity_t synchro = SIMIX_file_write(fd, size, host); - synchro->simcalls.push_back(simcall); + /* Associate this simcall to the synchro */ + synchro->simcalls_.push_back(simcall); simcall->issuer->waiting_synchro = synchro; -} -smx_activity_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::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; -} - -//SIMIX FILE OPEN -void simcall_HANDLER_file_open(smx_simcall_t simcall, const char* fullpath, sg_host_t host) -{ - smx_activity_t synchro = SIMIX_file_open(fullpath, host); - synchro->simcalls.push_back(simcall); - simcall->issuer->waiting_synchro = synchro; -} - -smx_activity_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::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; -} - -//SIMIX FILE CLOSE -void simcall_HANDLER_file_close(smx_simcall_t simcall, smx_file_t fd, sg_host_t host) -{ - smx_activity_t synchro = SIMIX_file_close(fd, host); - synchro->simcalls.push_back(simcall); - simcall->issuer->waiting_synchro = synchro; -} - -smx_activity_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::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) -{ - 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); - return res; -} - -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_actor_t process, smx_file_t fd) -{ - sg_host_t host = process->host; - return surf_host_get_size(host, fd->surf_file); -} - -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_actor_t process, smx_file_t fd) -{ - sg_host_t host = process->host; - return surf_host_file_tell(host, fd->surf_file); -} - - -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_actor_t process, smx_file_t fd) -{ - sg_host_t host = process->host; - return surf_host_get_info(host, fd->surf_file); -} - -int simcall_HANDLER_file_seek(smx_simcall_t simcall, smx_file_t fd, sg_offset_t offset, int origin) -{ - return SIMIX_file_seek(simcall->issuer, fd, offset, 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); -} - -int simcall_HANDLER_file_move(smx_simcall_t simcall, smx_file_t file, const char* fullpath) -{ - return SIMIX_file_move(simcall->issuer, file, 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){ - return surf_storage_get_size(storage); -} - -sg_size_t simcall_HANDLER_storage_get_free_size(smx_simcall_t simcall, smx_storage_t storage) -{ - return SIMIX_storage_get_free_size(simcall->issuer, storage); -} - -sg_size_t SIMIX_storage_get_free_size(smx_actor_t process, smx_storage_t storage) -{ - return surf_storage_get_free_size(storage); -} - -sg_size_t simcall_HANDLER_storage_get_used_size(smx_simcall_t simcall, smx_storage_t storage) -{ - return SIMIX_storage_get_used_size(simcall->issuer, 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){ - return surf_storage_get_properties(storage); -} - -const char* SIMIX_storage_get_name(smx_storage_t storage){ - return sg_storage_name(storage); -} - -xbt_dict_t SIMIX_storage_get_content(smx_storage_t storage){ - return surf_storage_get_content(storage); -} - -const char* SIMIX_storage_get_host(smx_storage_t storage){ - return surf_storage_get_host(storage); -} + /* set surf's synchro */ + if (MC_is_active() || MC_record_replay_is_active()) { + synchro->state_ = SIMIX_DONE; + SIMIX_io_finish(synchro); + return; + } -void SIMIX_io_destroy(smx_activity_t synchro) -{ - simgrid::kernel::activity::Io *io = static_cast(synchro); - XBT_DEBUG("Destroy synchro %p", synchro); - if (io->surf_io) - io->surf_io->unref(); - delete io; + /* If the synchro is already finished then perform the error handling */ + if (synchro->state_ != SIMIX_RUNNING) + SIMIX_io_finish(synchro); } void SIMIX_io_finish(smx_activity_t synchro) { - for (smx_simcall_t simcall : synchro->simcalls) { - switch (synchro->state) { + for (smx_simcall_t const& simcall : synchro->simcalls_) { + switch (synchro->state_) { case SIMIX_DONE: /* do nothing, synchro done */ break; @@ -276,17 +65,14 @@ void SIMIX_io_finish(smx_activity_t synchro) SMX_EXCEPTION(simcall->issuer, cancel_error, 0, "Canceled"); break; default: - xbt_die("Internal error in SIMIX_io_finish: unexpected synchro state %d", static_cast(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; + if (simcall->issuer->host_->is_off()) { + simcall->issuer->context_->iwannadie = true; } simcall->issuer->waiting_synchro = nullptr; SIMIX_simcall_answer(simcall); } - - /* We no longer need it */ - SIMIX_io_destroy(synchro); }