X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e5b7ca2bccfd542f49b069ef8239391ecadcbc55..62a32394d08487c948e60b95817e03d81f1af91d:/src/simix/smx_io.cpp diff --git a/src/simix/smx_io.cpp b/src/simix/smx_io.cpp index 41a1ff352f..5f40cb95bb 100644 --- a/src/simix/smx_io.cpp +++ b/src/simix/smx_io.cpp @@ -1,5 +1,4 @@ -/* Copyright (c) 2007-2010, 2012-2015. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2007-2017. 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,70 +8,38 @@ #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 "src/simix/SynchroIo.hpp" +#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 nullptr) - */ -smx_storage_t SIMIX_storage_create(const char *name, void *storage, void *data) -{ - smx_storage_priv_t smx_storage = xbt_new0(s_smx_storage_priv_t, 1); - - smx_storage->data = data; - - /* 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 = (smx_storage_priv_t) s; - - 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) +void simcall_HANDLER_file_read(smx_simcall_t simcall, surf_file_t fd, sg_size_t size, sg_host_t host) { - smx_synchro_t synchro = SIMIX_file_read(fd, size, host); + 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(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", sg_host_get_name(host)); + THROWF(host_error, 0, "Host %s failed, you cannot call this function", host->cname()); - - simgrid::simix::Io *synchro = new simgrid::simix::Io(); + simgrid::kernel::activity::IoImpl* synchro = new simgrid::kernel::activity::IoImpl(); synchro->host = host; - synchro->surf_io = surf_host_read(host, fd->surf_file, size); + synchro->surf_io = surf_host_read(host, file, size); synchro->surf_io->setData(synchro); XBT_DEBUG("Create io synchro %p", synchro); @@ -81,21 +48,21 @@ 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) +void simcall_HANDLER_file_write(smx_simcall_t simcall, surf_file_t fd, sg_size_t size, sg_host_t host) { - smx_synchro_t synchro = SIMIX_file_write(fd, size, host); + 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(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", sg_host_get_name(host)); + THROWF(host_error, 0, "Host %s failed, you cannot call this function", host->cname()); - simgrid::simix::Io *synchro = new simgrid::simix::Io(); + simgrid::kernel::activity::IoImpl* synchro = new simgrid::kernel::activity::IoImpl(); synchro->host = host; - synchro->surf_io = surf_host_write(host, fd->surf_file, size); + synchro->surf_io = surf_host_write(host, file, size); synchro->surf_io->setData(synchro); XBT_DEBUG("Create io synchro %p", synchro); @@ -103,21 +70,21 @@ 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) +void simcall_HANDLER_file_open(smx_simcall_t simcall, const char* mount, const char* path, sg_storage_t st) { - smx_synchro_t synchro = SIMIX_file_open(fullpath, host); + smx_activity_t synchro = SIMIX_file_open(mount, path, st); 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* mount, const char* path, sg_storage_t st) { - if (host->isOff()) - THROWF(host_error, 0, "Host %s failed, you cannot call this function", sg_host_get_name(host)); + if (st->host()->isOff()) + THROWF(host_error, 0, "Host %s failed, you cannot call this function", st->host()->cname()); - simgrid::simix::Io *synchro = new simgrid::simix::Io(); - synchro->host = host; - synchro->surf_io = surf_host_open(host, fullpath); + 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); XBT_DEBUG("Create io synchro %p", synchro); @@ -125,169 +92,85 @@ 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) +void simcall_HANDLER_file_close(smx_simcall_t simcall, surf_file_t fd, sg_host_t host) { - smx_synchro_t synchro = SIMIX_file_close(fd, host); + 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(surf_file_t file, sg_host_t host) { if (host->isOff()) - THROWF(host_error, 0, "Host %s failed, you cannot call this function", sg_host_get_name(host)); + THROWF(host_error, 0, "Host %s failed, you cannot call this function", host->cname()); - simgrid::simix::Io *synchro = new simgrid::simix::Io(); + simgrid::kernel::activity::IoImpl* synchro = new simgrid::kernel::activity::IoImpl(); synchro->host = host; - synchro->surf_io = surf_host_close(host, fd->surf_file); + 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(smx_file_t fd, sg_host_t host) +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", sg_host_get_name(host)); + 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 surf_host_unlink(host, file); } -sg_size_t simcall_HANDLER_file_get_size(smx_simcall_t simcall, smx_file_t fd) +sg_size_t SIMIX_file_get_size(surf_file_t fd) { - return SIMIX_file_get_size(simcall->issuer, fd); + return fd->size(); } -sg_size_t SIMIX_file_get_size(smx_process_t process, smx_file_t fd) +sg_size_t SIMIX_file_tell(surf_file_t fd) { - sg_host_t host = process->host; - return surf_host_get_size(host, fd->surf_file); + return fd->tell(); } -sg_size_t simcall_HANDLER_file_tell(smx_simcall_t simcall, smx_file_t fd) +int SIMIX_file_seek(surf_file_t fd, sg_offset_t offset, int origin) { - return SIMIX_file_tell(simcall->issuer, fd); + return fd->seek(offset, origin); } -sg_size_t SIMIX_file_tell(smx_process_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_process_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_process_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) +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_process_t process, smx_file_t file, const char* 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->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_process_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_process_t process, smx_storage_t storage) -{ - return surf_storage_get_used_size(storage); + return surf_host_file_move(host, file, fullpath); } -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); -} - -void SIMIX_post_io(smx_synchro_t synchro) +void SIMIX_io_destroy(smx_activity_t synchro) { -} - -void SIMIX_io_destroy(smx_synchro_t synchro) -{ - simgrid::simix::Io *io = static_cast(synchro); - XBT_DEBUG("Destroy synchro %p", 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(); - delete io; } -void SIMIX_io_finish(smx_synchro_t synchro) +void SIMIX_io_finish(smx_activity_t synchro) { 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 (simcall->issuer->host->isOff()) {