X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1c8c73ef7e2f1307c815cd11071f8c584436f9d5..4ebc53f4ea63c0ec84680e5484ad9c9a81c85ff3:/src/simix/smx_io.cpp diff --git a/src/simix/smx_io.cpp b/src/simix/smx_io.cpp index 5bc58f7017..d2a31185c2 100644 --- a/src/simix/smx_io.cpp +++ b/src/simix/smx_io.cpp @@ -1,4 +1,4 @@ -/* 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. */ @@ -9,103 +9,47 @@ #include "simgrid/s4u/Host.hpp" #include "simgrid/s4u/Storage.hpp" -#include "src/surf/FileImpl.hpp" + +#include "smx_private.hpp" +#include "src/kernel/activity/IoImpl.hpp" +#include "src/simix/smx_io_private.hpp" #include "src/surf/HostImpl.hpp" #include "src/surf/StorageImpl.hpp" -#include "surf/surf.h" - #include "src/surf/surf_interface.hpp" -#include "smx_private.h" - -#include "src/kernel/activity/SynchroIo.hpp" +#include "surf/surf.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) +void simcall_HANDLER_storage_read(smx_simcall_t simcall, surf_storage_t st, sg_size_t size) { - smx_activity_t synchro = SIMIX_file_read(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_read(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) { - /* check if the host is active */ - if (host->isOff()) - THROWF(host_error, 0, "Host %s failed, you cannot call this function", host->getCname()); - simgrid::kernel::activity::IoImpl* synchro = new simgrid::kernel::activity::IoImpl(); - synchro->host = host; - synchro->surf_io = host->pimpl_->read(file, size); + synchro->surf_action_ = st->read(size); - synchro->surf_io->setData(synchro); + synchro->surf_action_->set_data(synchro); XBT_DEBUG("Create io synchro %p", synchro); return synchro; } -//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_write(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_write(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_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->getCname()); - - simgrid::kernel::activity::IoImpl* synchro = new simgrid::kernel::activity::IoImpl(); - synchro->host = host; - synchro->surf_io = host->pimpl_->write(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->getHost()->isOff()) - THROWF(host_error, 0, "Host %s failed, you cannot call this function", st->getHost()->getCname()); - - simgrid::kernel::activity::IoImpl* synchro = new simgrid::kernel::activity::IoImpl(); - synchro->host = st->getHost(); - synchro->surf_io = st->pimpl_->open(mount, path); - 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, surf_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(surf_file_t file, sg_host_t host) -{ - if (host->isOff()) - THROWF(host_error, 0, "Host %s failed, you cannot call this function", host->getCname()); - simgrid::kernel::activity::IoImpl* synchro = new simgrid::kernel::activity::IoImpl(); - synchro->host = host; - synchro->surf_io = host->pimpl_->close(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; @@ -115,14 +59,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; @@ -133,11 +77,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;