X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/15af6f9bf88ff4bfdd0b8e87039e666ee092fbfe..358b3ac1d1ce9e2cfcc7583271916ebd96eff6da:/src/simix/smx_io.cpp diff --git a/src/simix/smx_io.cpp b/src/simix/smx_io.cpp index c4a1033589..759226131b 100644 --- a/src/simix/smx_io.cpp +++ b/src/simix/smx_io.cpp @@ -1,71 +1,39 @@ -/* 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. */ -#include "src/surf/surf_interface.hpp" -#include "smx_private.h" -#include "xbt/sysdep.h" -#include "xbt/log.h" -#include "xbt/dict.h" -#include "mc/mc.h" - -#include "src/simix/SynchroIo.hpp" - -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_io, simix, "Logging specific to SIMIX (io)"); +#include +#include +#include +#include +#include "simgrid/s4u/Host.hpp" -/** - * \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 NULL) - */ -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); +#include - 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; +#include "src/surf/surf_interface.hpp" +#include "smx_private.h" - xbt_assert((storage != NULL), "Invalid parameters"); - if (storage->data) - free(storage->data); +#include "src/kernel/activity/SynchroIo.hpp" - /* Clean storage structure */ - free(storage); -} +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, smx_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(smx_file_t fd, 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::Io *synchro = new simgrid::kernel::activity::Io(); synchro->host = host; synchro->surf_io = surf_host_read(host, fd->surf_file, size); @@ -78,17 +46,17 @@ 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) { - 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(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)); + 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::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); @@ -100,17 +68,17 @@ 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) { - smx_synchro_t synchro = SIMIX_file_open(fullpath, host); + smx_activity_t synchro = SIMIX_file_open(fullpath, host); 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* 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)); + 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::Io *synchro = new simgrid::kernel::activity::Io(); synchro->host = host; synchro->surf_io = surf_host_open(host, fullpath); synchro->surf_io->setData(synchro); @@ -122,17 +90,17 @@ 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) { - 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(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)); + 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::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); @@ -141,16 +109,15 @@ smx_synchro_t SIMIX_file_close(smx_file_t fd, sg_host_t host) 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)); + 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 res; } sg_size_t simcall_HANDLER_file_get_size(smx_simcall_t simcall, smx_file_t fd) @@ -158,7 +125,7 @@ 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_process_t process, smx_file_t 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); @@ -169,7 +136,7 @@ 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_process_t process, smx_file_t 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); @@ -181,7 +148,7 @@ 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) +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); @@ -192,7 +159,7 @@ int simcall_HANDLER_file_seek(smx_simcall_t simcall, smx_file_t fd, sg_offset_t 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) +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); @@ -203,36 +170,12 @@ int simcall_HANDLER_file_move(smx_simcall_t simcall, smx_file_t file, const char 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, 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_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); -} - xbt_dict_t SIMIX_storage_get_properties(smx_storage_t storage){ return surf_storage_get_properties(storage); } @@ -241,55 +184,37 @@ 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_synchro_t synchro) +void SIMIX_io_destroy(smx_activity_t synchro) { - simgrid::simix::Io *io = static_cast(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; } -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()) { simcall->issuer->context->iwannadie = 1; } - simcall->issuer->waiting_synchro = NULL; + simcall->issuer->waiting_synchro = nullptr; SIMIX_simcall_answer(simcall); }