X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/827b5fc241bd5cd1c65354d0566197196179ab84..939476f1fc7630eb237535b07ed0deef77ce1b24:/src/simix/smx_io.cpp diff --git a/src/simix/smx_io.cpp b/src/simix/smx_io.cpp index 50897316fe..1f9d6fd955 100644 --- a/src/simix/smx_io.cpp +++ b/src/simix/smx_io.cpp @@ -1,113 +1,62 @@ -/* Copyright (c) 2007-2017. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2007-2018. 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 "simgrid/s4u/Host.hpp" -#include "simgrid/s4u/Storage.hpp" -#include "src/surf/FileImpl.hpp" -#include "src/surf/StorageImpl.hpp" -#include "surf/surf.h" - -#include - -#include "src/surf/surf_interface.hpp" -#include "smx_private.h" +#include "xbt/ex.hpp" -#include "src/kernel/activity/SynchroIo.hpp" +#include "smx_private.hpp" +#include "src/kernel/activity/IoImpl.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)"); -//SIMIX FILE READ -void simcall_HANDLER_file_read(smx_simcall_t simcall, surf_file_t fd, sg_size_t size, sg_host_t host) +simgrid::kernel::activity::IoImplPtr SIMIX_io_start(std::string name, sg_size_t size, sg_storage_t storage) { - smx_activity_t synchro = SIMIX_file_read(fd, size, host); - synchro->simcalls.push_back(simcall); - simcall->issuer->waiting_synchro = synchro; -} + /* set surf's action */ + simgrid::kernel::resource::Action* surf_action = storage->pimpl_->io_start(size); -smx_activity_t SIMIX_file_read(surf_file_t file, sg_size_t size, sg_host_t host) -{ - /* check if the host is active */ - if (host->isOff()) - THROWF(host_error, 0, "Host %s failed, you cannot call this function", host->cname()); - - simgrid::kernel::activity::IoImpl* synchro = new simgrid::kernel::activity::IoImpl(); - synchro->host = host; - synchro->surf_io = surf_host_read(host, file, size); + simgrid::kernel::activity::IoImplPtr io = + simgrid::kernel::activity::IoImplPtr(new simgrid::kernel::activity::IoImpl(name, surf_action, storage)); - synchro->surf_io->setData(synchro); - XBT_DEBUG("Create io synchro %p", synchro); + XBT_DEBUG("Create IO synchro %p %s", io.get(), name.c_str()); + simgrid::kernel::activity::IoImpl::on_creation(io); - return synchro; + return io; } -//SIMIX FILE WRITE -void simcall_HANDLER_file_write(smx_simcall_t simcall, surf_file_t fd, sg_size_t size, sg_host_t host) +void simcall_HANDLER_storage_read(smx_simcall_t simcall, surf_storage_t st, sg_size_t size) { - smx_activity_t synchro = SIMIX_file_write(fd, size, host); - synchro->simcalls.push_back(simcall); + smx_activity_t synchro = SIMIX_storage_read(st, size); + synchro->simcalls_.push_back(simcall); simcall->issuer->waiting_synchro = synchro; } -smx_activity_t SIMIX_file_write(surf_file_t file, sg_size_t size, sg_host_t host) +smx_activity_t SIMIX_storage_read(surf_storage_t st, sg_size_t size) { - if (host->isOff()) - THROWF(host_error, 0, "Host %s failed, you cannot call this function", host->cname()); - simgrid::kernel::activity::IoImpl* synchro = new simgrid::kernel::activity::IoImpl(); - synchro->host = host; - synchro->surf_io = surf_host_write(host, 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* mount, const char* path, sg_storage_t st) -{ - smx_activity_t synchro = SIMIX_file_open(mount, path, st); - synchro->simcalls.push_back(simcall); - simcall->issuer->waiting_synchro = synchro; -} - -smx_activity_t SIMIX_file_open(const char* mount, const char* path, sg_storage_t st) -{ - if (st->host()->isOff()) - THROWF(host_error, 0, "Host %s failed, you cannot call this function", st->host()->cname()); + synchro->surf_action_ = st->read(size); - simgrid::kernel::activity::IoImpl* synchro = new simgrid::kernel::activity::IoImpl(); - synchro->host = st->host(); - synchro->surf_io = st->pimpl_->open(mount, path); - synchro->surf_io->setData(synchro); + synchro->surf_action_->set_data(synchro); XBT_DEBUG("Create io synchro %p", synchro); return synchro; } -//SIMIX FILE CLOSE -void simcall_HANDLER_file_close(smx_simcall_t simcall, surf_file_t fd, sg_host_t host) +void simcall_HANDLER_storage_write(smx_simcall_t simcall, surf_storage_t st, sg_size_t size) { - smx_activity_t synchro = SIMIX_file_close(fd, host); - synchro->simcalls.push_back(simcall); + smx_activity_t synchro = SIMIX_storage_write(st, size); + synchro->simcalls_.push_back(simcall); simcall->issuer->waiting_synchro = synchro; } -smx_activity_t SIMIX_file_close(surf_file_t file, sg_host_t host) +smx_activity_t SIMIX_storage_write(surf_storage_t st, sg_size_t size) { - if (host->isOff()) - THROWF(host_error, 0, "Host %s failed, you cannot call this function", host->cname()); - simgrid::kernel::activity::IoImpl* synchro = new simgrid::kernel::activity::IoImpl(); - synchro->host = host; - synchro->surf_io = surf_host_close(host, file); - synchro->surf_io->setData(synchro); + synchro->surf_action_ = st->write(size); + synchro->surf_action_->set_data(synchro); XBT_DEBUG("Create io synchro %p", synchro); return synchro; @@ -117,14 +66,14 @@ void SIMIX_io_destroy(smx_activity_t synchro) { simgrid::kernel::activity::IoImplPtr io = boost::static_pointer_cast(synchro); XBT_DEBUG("Destroy synchro %p", synchro.get()); - if (io->surf_io) - io->surf_io->unref(); + if (io->surf_action_) + io->surf_action_->unref(); } 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; @@ -135,11 +84,11 @@ 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 = 1; } simcall->issuer->waiting_synchro = nullptr;