X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3d3a632d7de077980120453b3863065bed65201c..89047acf6125582321f8e86f9765b0f57e350e2c:/src/simix/smx_io.cpp diff --git a/src/simix/smx_io.cpp b/src/simix/smx_io.cpp index 5f40cb95bb..bdc916652b 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. */ @@ -6,148 +6,55 @@ #include #include #include -#include #include "simgrid/s4u/Host.hpp" #include "simgrid/s4u/Storage.hpp" -#include "src/surf/FileImpl.hpp" +#include "smx_private.hpp" +#include "src/simix/smx_io_private.hpp" +#include "src/surf/HostImpl.hpp" #include "src/surf/StorageImpl.hpp" -#include "surf/surf.h" - -#include - #include "src/surf/surf_interface.hpp" -#include "smx_private.h" +#include "surf/surf.hpp" #include "src/kernel/activity/SynchroIo.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->cname()); - simgrid::kernel::activity::IoImpl* synchro = new simgrid::kernel::activity::IoImpl(); - synchro->host = host; - synchro->surf_io = surf_host_read(host, 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, surf_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); - simcall->issuer->waiting_synchro = synchro; -} + synchro->surf_io = st->read(size); -smx_activity_t SIMIX_file_write(surf_file_t file, sg_size_t size, sg_host_t host) -{ - 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); + synchro->surf_io->set_data(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) +void simcall_HANDLER_storage_write(smx_simcall_t simcall, surf_storage_t st, sg_size_t size) { - smx_activity_t synchro = SIMIX_file_open(mount, path, st); - 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_open(const char* mount, const char* path, sg_storage_t st) +smx_activity_t SIMIX_storage_write(surf_storage_t st, sg_size_t size) { - if (st->host()->isOff()) - THROWF(host_error, 0, "Host %s failed, you cannot call this function", st->host()->cname()); - 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_io = st->write(size); + synchro->surf_io->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) -{ - 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->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); - XBT_DEBUG("Create io synchro %p", synchro); - - return synchro; -} - -//SIMIX FILE UNLINK -int SIMIX_file_unlink(surf_file_t file, sg_host_t host) -{ - if (host->isOff()) - THROWF(host_error, 0, "Host %s failed, you cannot call this function", host->cname()); - - return surf_host_unlink(host, file); -} - -sg_size_t SIMIX_file_get_size(surf_file_t fd) -{ - return fd->size(); -} - -sg_size_t SIMIX_file_tell(surf_file_t fd) -{ - return fd->tell(); -} - -int SIMIX_file_seek(surf_file_t fd, sg_offset_t offset, int origin) -{ - return fd->seek(offset, origin); -} - -int simcall_HANDLER_file_move(smx_simcall_t simcall, surf_file_t file, const char* fullpath) -{ - return SIMIX_file_move(simcall->issuer, file, fullpath); -} - -int SIMIX_file_move(smx_actor_t process, surf_file_t file, const char* fullpath) -{ - sg_host_t host = process->host; - return surf_host_file_move(host, file, fullpath); -} - void SIMIX_io_destroy(smx_activity_t synchro) { simgrid::kernel::activity::IoImplPtr io = boost::static_pointer_cast(synchro); @@ -158,8 +65,8 @@ void SIMIX_io_destroy(smx_activity_t 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; @@ -170,7 +77,7 @@ 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()) {