X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c8880fd8bfe302109bdec0629929499479d714b0..7ad85b03568dabade546f7948aaf7279059e9269:/src/simix/smx_io.c diff --git a/src/simix/smx_io.c b/src/simix/smx_io.c index 365c90bdd4..241e56954f 100644 --- a/src/simix/smx_io.c +++ b/src/simix/smx_io.c @@ -1,11 +1,10 @@ -/* Copyright (c) 2007-2010, 2012-2014. The SimGrid Team. +/* Copyright (c) 2007-2010, 2012-2015. 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 "smx_private.h" -//#include "surf/storage_private.h" #include "xbt/sysdep.h" #include "xbt/log.h" #include "xbt/dict.h" @@ -50,32 +49,30 @@ void SIMIX_storage_destroy(void *s) } //SIMIX FILE READ -void simcall_HANDLER_file_read(smx_simcall_t simcall, smx_file_t fd, sg_size_t size, smx_host_t host) +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(simcall->issuer, fd, size, host); + smx_synchro_t synchro = SIMIX_file_read(fd, size, host); xbt_fifo_push(synchro->simcalls, simcall); simcall->issuer->waiting_synchro = synchro; } -smx_synchro_t SIMIX_file_read(smx_process_t process, smx_file_t fd, sg_size_t size, smx_host_t host) +smx_synchro_t SIMIX_file_read(smx_file_t fd, sg_size_t size, sg_host_t host) { smx_synchro_t synchro; /* check if the host is active */ - if (surf_resource_get_state(surf_workstation_resource_priv(host)) != SURF_RESOURCE_ON) { + if (surf_host_get_state(surf_host_resource_priv(host)) != SURF_RESOURCE_ON) { THROWF(host_error, 0, "Host %s failed, you cannot call this function", - sg_host_name(host)); + sg_host_get_name(host)); } synchro = xbt_mallocator_get(simix_global->synchro_mallocator); synchro->type = SIMIX_SYNC_IO; synchro->name = NULL; -#ifdef HAVE_TRACING synchro->category = NULL; -#endif synchro->io.host = host; - synchro->io.surf_io = surf_workstation_read(host, fd->surf_file, size); + synchro->io.surf_io = surf_host_read(host, fd->surf_file, size); surf_action_set_data(synchro->io.surf_io, synchro); XBT_DEBUG("Create io synchro %p", synchro); @@ -84,32 +81,30 @@ smx_synchro_t SIMIX_file_read(smx_process_t process, smx_file_t fd, sg_size_t si } //SIMIX FILE WRITE -void simcall_HANDLER_file_write(smx_simcall_t simcall, smx_file_t fd, sg_size_t size, smx_host_t host) +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(simcall->issuer, fd, size, host); + smx_synchro_t synchro = SIMIX_file_write(fd, size, host); xbt_fifo_push(synchro->simcalls, simcall); simcall->issuer->waiting_synchro = synchro; } -smx_synchro_t SIMIX_file_write(smx_process_t process, smx_file_t fd, sg_size_t size, smx_host_t host) +smx_synchro_t SIMIX_file_write(smx_file_t fd, sg_size_t size, sg_host_t host) { smx_synchro_t synchro; /* check if the host is active */ - if (surf_resource_get_state(surf_workstation_resource_priv(host)) != SURF_RESOURCE_ON) { + if (surf_host_get_state(surf_host_resource_priv(host)) != SURF_RESOURCE_ON) { THROWF(host_error, 0, "Host %s failed, you cannot call this function", - sg_host_name(host)); + sg_host_get_name(host)); } synchro = xbt_mallocator_get(simix_global->synchro_mallocator); synchro->type = SIMIX_SYNC_IO; synchro->name = NULL; -#ifdef HAVE_TRACING synchro->category = NULL; -#endif synchro->io.host = host; - synchro->io.surf_io = surf_workstation_write(host, fd->surf_file, size); + synchro->io.surf_io = surf_host_write(host, fd->surf_file, size); surf_action_set_data(synchro->io.surf_io, synchro); XBT_DEBUG("Create io synchro %p", synchro); @@ -118,32 +113,30 @@ smx_synchro_t SIMIX_file_write(smx_process_t process, smx_file_t fd, sg_size_t s } //SIMIX FILE OPEN -void simcall_HANDLER_file_open(smx_simcall_t simcall, const char* fullpath, smx_host_t host) +void simcall_HANDLER_file_open(smx_simcall_t simcall, const char* fullpath, sg_host_t host) { - smx_synchro_t synchro = SIMIX_file_open(simcall->issuer, fullpath, host); + smx_synchro_t synchro = SIMIX_file_open(fullpath, host); xbt_fifo_push(synchro->simcalls, simcall); simcall->issuer->waiting_synchro = synchro; } -smx_synchro_t SIMIX_file_open(smx_process_t process, const char* fullpath, smx_host_t host) +smx_synchro_t SIMIX_file_open(const char* fullpath, sg_host_t host) { smx_synchro_t synchro; /* check if the host is active */ - if (surf_resource_get_state(surf_workstation_resource_priv(host)) != SURF_RESOURCE_ON) { + if (surf_host_get_state(surf_host_resource_priv(host)) != SURF_RESOURCE_ON) { THROWF(host_error, 0, "Host %s failed, you cannot call this function", - sg_host_name(host)); + sg_host_get_name(host)); } synchro = xbt_mallocator_get(simix_global->synchro_mallocator); synchro->type = SIMIX_SYNC_IO; synchro->name = NULL; -#ifdef HAVE_TRACING synchro->category = NULL; -#endif synchro->io.host = host; - synchro->io.surf_io = surf_workstation_open(host, fullpath); + synchro->io.surf_io = surf_host_open(host, fullpath); surf_action_set_data(synchro->io.surf_io, synchro); XBT_DEBUG("Create io synchro %p", synchro); @@ -152,32 +145,30 @@ smx_synchro_t SIMIX_file_open(smx_process_t process, const char* fullpath, smx_h } //SIMIX FILE CLOSE -void simcall_HANDLER_file_close(smx_simcall_t simcall, smx_file_t fd, smx_host_t host) +void simcall_HANDLER_file_close(smx_simcall_t simcall, smx_file_t fd, sg_host_t host) { - smx_synchro_t synchro = SIMIX_file_close(simcall->issuer, fd, host); + smx_synchro_t synchro = SIMIX_file_close(fd, host); xbt_fifo_push(synchro->simcalls, simcall); simcall->issuer->waiting_synchro = synchro; } -smx_synchro_t SIMIX_file_close(smx_process_t process, smx_file_t fd, smx_host_t host) +smx_synchro_t SIMIX_file_close(smx_file_t fd, sg_host_t host) { smx_synchro_t synchro; /* check if the host is active */ - if (surf_resource_get_state(surf_workstation_resource_priv(host)) != SURF_RESOURCE_ON) { + if (surf_host_get_state(surf_host_resource_priv(host)) != SURF_RESOURCE_ON) { THROWF(host_error, 0, "Host %s failed, you cannot call this function", - sg_host_name(host)); + sg_host_get_name(host)); } synchro = xbt_mallocator_get(simix_global->synchro_mallocator); synchro->type = SIMIX_SYNC_IO; synchro->name = NULL; -#ifdef HAVE_TRACING synchro->category = NULL; -#endif synchro->io.host = host; - synchro->io.surf_io = surf_workstation_close(host, fd->surf_file); + synchro->io.surf_io = surf_host_close(host, fd->surf_file); surf_action_set_data(synchro->io.surf_io, synchro); XBT_DEBUG("Create io synchro %p", synchro); @@ -187,20 +178,15 @@ smx_synchro_t SIMIX_file_close(smx_process_t process, smx_file_t fd, smx_host_t //SIMIX FILE UNLINK -int simcall_HANDLER_file_unlink(smx_simcall_t simcall, smx_file_t fd, smx_host_t host) -{ - return SIMIX_file_unlink(simcall->issuer, fd, host); -} - -int SIMIX_file_unlink(smx_process_t process, smx_file_t fd, smx_host_t host) +int SIMIX_file_unlink(smx_file_t fd, sg_host_t host) { /* check if the host is active */ - if (surf_resource_get_state(surf_workstation_resource_priv(host)) != SURF_RESOURCE_ON) { + if (surf_host_get_state(surf_host_resource_priv(host)) != SURF_RESOURCE_ON) { THROWF(host_error, 0, "Host %s failed, you cannot call this function", - sg_host_name(host)); + sg_host_get_name(host)); } - int res = surf_workstation_unlink(host, fd->surf_file); + int res = surf_host_unlink(host, fd->surf_file); xbt_free(fd); return !!res; } @@ -212,8 +198,8 @@ sg_size_t simcall_HANDLER_file_get_size(smx_simcall_t simcall, smx_file_t fd) sg_size_t SIMIX_file_get_size(smx_process_t process, smx_file_t fd) { - smx_host_t host = process->smx_host; - return surf_workstation_get_size(host, fd->surf_file); + sg_host_t host = process->host; + return surf_host_get_size(host, fd->surf_file); } sg_size_t simcall_HANDLER_file_tell(smx_simcall_t simcall, smx_file_t fd) @@ -223,8 +209,8 @@ sg_size_t simcall_HANDLER_file_tell(smx_simcall_t simcall, smx_file_t fd) sg_size_t SIMIX_file_tell(smx_process_t process, smx_file_t fd) { - smx_host_t host = process->smx_host; - return surf_workstation_file_tell(host, fd->surf_file); + sg_host_t host = process->host; + return surf_host_file_tell(host, fd->surf_file); } @@ -235,8 +221,8 @@ xbt_dynar_t simcall_HANDLER_file_get_info(smx_simcall_t simcall, smx_file_t fd) xbt_dynar_t SIMIX_file_get_info(smx_process_t process, smx_file_t fd) { - smx_host_t host = process->smx_host; - return surf_workstation_get_info(host, fd->surf_file); + 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) @@ -246,8 +232,8 @@ int simcall_HANDLER_file_seek(smx_simcall_t simcall, smx_file_t fd, sg_offset_t int SIMIX_file_seek(smx_process_t process, smx_file_t fd, sg_offset_t offset, int origin) { - smx_host_t host = process->smx_host; - return surf_workstation_file_seek(host, fd->surf_file, offset, 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) @@ -257,8 +243,8 @@ int simcall_HANDLER_file_move(smx_simcall_t simcall, smx_file_t file, const char int SIMIX_file_move(smx_process_t process, smx_file_t file, const char* fullpath) { - smx_host_t host = process->smx_host; - return surf_workstation_file_move(host, file->surf_file, 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){ @@ -286,9 +272,6 @@ sg_size_t SIMIX_storage_get_used_size(smx_process_t process, smx_storage_t stora return surf_storage_get_used_size(storage); } -xbt_dict_t simcall_HANDLER_storage_get_properties(smx_simcall_t simcall, smx_storage_t storage){ - return SIMIX_storage_get_properties(storage); -} xbt_dict_t SIMIX_storage_get_properties(smx_storage_t storage){ xbt_assert((storage != NULL), "Invalid parameters (simix storage is NULL)"); return surf_resource_get_properties(surf_storage_resource_priv(storage)); @@ -299,10 +282,6 @@ const char* SIMIX_storage_get_name(smx_storage_t storage){ return sg_storage_name(storage); } -xbt_dict_t simcall_HANDLER_storage_get_content(smx_simcall_t simcall, smx_storage_t storage){ - return SIMIX_storage_get_content(storage); -} - xbt_dict_t SIMIX_storage_get_content(smx_storage_t storage){ xbt_assert((storage != NULL), "Invalid parameters (simix storage is NULL)"); return surf_storage_get_content(storage); @@ -395,7 +374,7 @@ void SIMIX_io_finish(smx_synchro_t synchro) (int)synchro->state); } - if (surf_resource_get_state(surf_workstation_resource_priv(simcall->issuer->smx_host)) != SURF_RESOURCE_ON) { + if (surf_host_get_state(surf_host_resource_priv(simcall->issuer->host)) != SURF_RESOURCE_ON) { simcall->issuer->context->iwannadie = 1; }