X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/583b45fc459df9a4d3990cbf74009b3ffb63ef4a..22997c2908133c72109c4938e2b503e20fab81e7:/src/simix/smx_io.c diff --git a/src/simix/smx_io.c b/src/simix/smx_io.c index dde44a38c4..eee26b21f5 100644 --- a/src/simix/smx_io.c +++ b/src/simix/smx_io.c @@ -1,11 +1,11 @@ -/* Copyright (c) 2007, 2008, 2009, 2010. The SimGrid Team. +/* Copyright (c) 2007-2010, 2012-2014. 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 "surf/storage_private.h" #include "xbt/sysdep.h" #include "xbt/log.h" #include "xbt/dict.h" @@ -15,23 +15,55 @@ 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 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); + + 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 != NULL), "Invalid parameters"); + if (storage->data) + free(storage->data); + + /* Clean storage structure */ + free(storage); +} + //SIMIX FILE READ -void SIMIX_pre_file_read(smx_simcall_t simcall, void *ptr, size_t size, - size_t nmemb, smx_file_t stream) +void SIMIX_pre_file_read(smx_simcall_t simcall, smx_file_t fd, sg_size_t size) { - smx_action_t action = SIMIX_file_read(simcall->issuer, ptr, size, nmemb, stream); + smx_action_t action = SIMIX_file_read(simcall->issuer, fd, size); xbt_fifo_push(action->simcalls, simcall); simcall->issuer->waiting_action = action; } -smx_action_t SIMIX_file_read(smx_process_t process, void* ptr, size_t size, size_t nmemb, smx_file_t stream) +smx_action_t SIMIX_file_read(smx_process_t process, smx_file_t fd, sg_size_t size) { smx_action_t action; smx_host_t host = process->smx_host; /* check if the host is active */ - if (surf_workstation_model->extension. - workstation.get_state(host) != SURF_RESOURCE_ON) { + if (surf_resource_get_state(surf_workstation_resource_priv(host)) != SURF_RESOURCE_ON) { THROWF(host_error, 0, "Host %s failed, you cannot call this function", sg_host_name(host)); } @@ -44,31 +76,29 @@ smx_action_t SIMIX_file_read(smx_process_t process, void* ptr, size_t size, size #endif action->io.host = host; - action->io.surf_io = surf_workstation_model->extension.workstation.read(host, ptr, size, nmemb, stream->surf_file); + action->io.surf_io = surf_workstation_read(host, fd->surf_file, size); - surf_workstation_model->action_data_set(action->io.surf_io, action); + surf_action_set_data(action->io.surf_io, action); XBT_DEBUG("Create io action %p", action); return action; } //SIMIX FILE WRITE -void SIMIX_pre_file_write(smx_simcall_t simcall, const void *ptr, size_t size, - size_t nmemb, smx_file_t stream) +void SIMIX_pre_file_write(smx_simcall_t simcall, smx_file_t fd, sg_size_t size) { - smx_action_t action = SIMIX_file_write(simcall->issuer, ptr, size, nmemb, stream); + smx_action_t action = SIMIX_file_write(simcall->issuer, fd, size); xbt_fifo_push(action->simcalls, simcall); simcall->issuer->waiting_action = action; } -smx_action_t SIMIX_file_write(smx_process_t process, const void* ptr, size_t size, size_t nmemb, smx_file_t stream) +smx_action_t SIMIX_file_write(smx_process_t process, smx_file_t fd, sg_size_t size) { smx_action_t action; smx_host_t host = process->smx_host; /* check if the host is active */ - if (surf_workstation_model->extension. - workstation.get_state(host) != SURF_RESOURCE_ON) { + if (surf_resource_get_state(surf_workstation_resource_priv(host)) != SURF_RESOURCE_ON) { THROWF(host_error, 0, "Host %s failed, you cannot call this function", sg_host_name(host)); } @@ -81,9 +111,9 @@ smx_action_t SIMIX_file_write(smx_process_t process, const void* ptr, size_t siz #endif action->io.host = host; - action->io.surf_io = surf_workstation_model->extension.workstation.write(host, ptr, size, nmemb, stream->surf_file); + action->io.surf_io = surf_workstation_write(host, fd->surf_file, size); - surf_workstation_model->action_data_set(action->io.surf_io, action); + surf_action_set_data(action->io.surf_io, action); XBT_DEBUG("Create io action %p", action); return action; @@ -91,21 +121,21 @@ smx_action_t SIMIX_file_write(smx_process_t process, const void* ptr, size_t siz //SIMIX FILE OPEN void SIMIX_pre_file_open(smx_simcall_t simcall, const char* mount, - const char* path, const char* mode) + const char* path) { - smx_action_t action = SIMIX_file_open(simcall->issuer, mount, path, mode); + smx_action_t action = SIMIX_file_open(simcall->issuer, mount, path); xbt_fifo_push(action->simcalls, simcall); simcall->issuer->waiting_action = action; } -smx_action_t SIMIX_file_open(smx_process_t process ,const char* mount, const char* path, const char* mode) +smx_action_t SIMIX_file_open(smx_process_t process ,const char* mount, + const char* path) { smx_action_t action; smx_host_t host = process->smx_host; /* check if the host is active */ - if (surf_workstation_model->extension. - workstation.get_state(host) != SURF_RESOURCE_ON) { + if (surf_resource_get_state(surf_workstation_resource_priv(host)) != SURF_RESOURCE_ON) { THROWF(host_error, 0, "Host %s failed, you cannot call this function", sg_host_name(host)); } @@ -118,9 +148,9 @@ smx_action_t SIMIX_file_open(smx_process_t process ,const char* mount, const cha #endif action->io.host = host; - action->io.surf_io = surf_workstation_model->extension.workstation.open(host, mount, path, mode); + action->io.surf_io = surf_workstation_open(host, mount, path); - surf_workstation_model->action_data_set(action->io.surf_io, action); + surf_action_set_data(action->io.surf_io, action); XBT_DEBUG("Create io action %p", action); return action; @@ -140,8 +170,7 @@ smx_action_t SIMIX_file_close(smx_process_t process, smx_file_t fd) smx_host_t host = process->smx_host; /* check if the host is active */ - if (surf_workstation_model->extension. - workstation.get_state(host) != SURF_RESOURCE_ON) { + if (surf_resource_get_state(surf_workstation_resource_priv(host)) != SURF_RESOURCE_ON) { THROWF(host_error, 0, "Host %s failed, you cannot call this function", sg_host_name(host)); } @@ -154,9 +183,9 @@ smx_action_t SIMIX_file_close(smx_process_t process, smx_file_t fd) #endif action->io.host = host; - action->io.surf_io = surf_workstation_model->extension.workstation.close(host, fd->surf_file); + action->io.surf_io = surf_workstation_close(host, fd->surf_file); - surf_workstation_model->action_data_set(action->io.surf_io, action); + surf_action_set_data(action->io.surf_io, action); XBT_DEBUG("Create io action %p", action); return action; @@ -164,38 +193,25 @@ smx_action_t SIMIX_file_close(smx_process_t process, smx_file_t fd) //SIMIX FILE UNLINK -void SIMIX_pre_file_unlink(smx_simcall_t simcall, smx_file_t fd) +int SIMIX_pre_file_unlink(smx_simcall_t simcall, smx_file_t fd) { - smx_action_t action = SIMIX_file_unlink(simcall->issuer, fd); - xbt_fifo_push(action->simcalls, simcall); - simcall->issuer->waiting_action = action; + return SIMIX_file_unlink(simcall->issuer, fd); } -smx_action_t SIMIX_file_unlink(smx_process_t process, smx_file_t fd) +int SIMIX_file_unlink(smx_process_t process, smx_file_t fd) { - smx_action_t action; smx_host_t host = process->smx_host; /* check if the host is active */ - if (surf_workstation_model->extension. - workstation.get_state(host) != SURF_RESOURCE_ON) { + if (surf_resource_get_state(surf_workstation_resource_priv(host)) != SURF_RESOURCE_ON) { THROWF(host_error, 0, "Host %s failed, you cannot call this function", sg_host_name(host)); } - action = xbt_mallocator_get(simix_global->action_mallocator); - action->type = SIMIX_ACTION_IO; - action->name = NULL; -#ifdef HAVE_TRACING - action->category = NULL; -#endif - - action->io.host = host; - action->io.surf_io = surf_workstation_model->extension.workstation.unlink(host, fd->surf_file); - - surf_workstation_model->action_data_set(action->io.surf_io, action); - XBT_DEBUG("Create io action %p", action); - - return action; + if (surf_workstation_unlink(host, fd->surf_file)){ + xbt_free(fd); + return 1; + } else + return 0; } //SIMIX FILE LS @@ -211,7 +227,7 @@ smx_action_t SIMIX_file_ls(smx_process_t process, const char* mount, const char smx_action_t action; smx_host_t host = process->smx_host; /* check if the host is active */ - if (surf_workstation_model->extension.workstation.get_state(host) != SURF_RESOURCE_ON) { + if (surf_resource_get_state(surf_workstation_resource_priv(host)) != SURF_RESOURCE_ON) { THROWF(host_error, 0, "Host %s failed, you cannot call this function", sg_host_name(host)); } @@ -224,48 +240,129 @@ smx_action_t SIMIX_file_ls(smx_process_t process, const char* mount, const char #endif action->io.host = host; - action->io.surf_io = surf_workstation_model->extension.workstation.ls(host,mount,path); + action->io.surf_io = surf_workstation_ls(host,mount,path); - surf_workstation_model->action_data_set(action->io.surf_io, action); + surf_action_set_data(action->io.surf_io, action); XBT_DEBUG("Create io action %p", action); return action; } -void SIMIX_pre_file_get_size(smx_simcall_t simcall, smx_file_t fd) +sg_size_t SIMIX_pre_file_get_size(smx_simcall_t simcall, smx_file_t fd) { - smx_action_t action = SIMIX_file_get_size(simcall->issuer, fd); - xbt_fifo_push(action->simcalls, simcall); - simcall->issuer->waiting_action = action; + return SIMIX_file_get_size(simcall->issuer, fd); } -smx_action_t SIMIX_file_get_size(smx_process_t process, smx_file_t fd) +sg_size_t SIMIX_file_get_size(smx_process_t process, smx_file_t fd) { - smx_action_t action; smx_host_t host = process->smx_host; + return surf_workstation_get_size(host, fd->surf_file); +} - /* check if the host is active */ - if (surf_workstation_model->extension. - workstation.get_state(host) != SURF_RESOURCE_ON) { - THROWF(host_error, 0, "Host %s failed, you cannot call this function", - sg_host_name(host)); - } +sg_size_t SIMIX_pre_file_tell(smx_simcall_t simcall, smx_file_t fd) +{ + return SIMIX_file_tell(simcall->issuer, fd); +} - action = xbt_mallocator_get(simix_global->action_mallocator); - action->type = SIMIX_ACTION_IO; - action->name = NULL; -#ifdef HAVE_TRACING - action->category = NULL; -#endif +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); +} - action->io.host = host; - action->io.surf_io = surf_workstation_model->extension.workstation.get_size(host, fd->surf_file); - surf_workstation_model->action_data_set(action->io.surf_io, action); - XBT_DEBUG("Create io action %p", action); +xbt_dynar_t SIMIX_pre_file_get_info(smx_simcall_t simcall, smx_file_t fd) +{ + return SIMIX_file_get_info(simcall->issuer, fd); +} - return action; +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); } +int SIMIX_pre_file_seek(smx_simcall_t simcall, smx_file_t fd, sg_size_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_size_t offset, int origin) +{ + smx_host_t host = process->smx_host; + return surf_workstation_file_seek(host, fd->surf_file, offset, origin); +} + +void SIMIX_pre_storage_file_rename(smx_simcall_t simcall, smx_storage_t storage, const char* src, const char* dest) +{ + return SIMIX_storage_file_rename(simcall->issuer, storage, src, dest); +} + +void SIMIX_storage_file_rename(smx_process_t process, smx_storage_t storage, const char* src, const char* dest) +{ + return surf_storage_rename(storage, src, dest); +} + +sg_size_t SIMIX_pre_storage_get_free_size(smx_simcall_t simcall, const char* name) +{ + return SIMIX_storage_get_free_size(simcall->issuer, name); +} + +sg_size_t SIMIX_storage_get_free_size(smx_process_t process, const char* name) +{ + smx_host_t host = process->smx_host; + return surf_workstation_get_free_size(host, name); +} + +sg_size_t SIMIX_pre_storage_get_used_size(smx_simcall_t simcall, const char* name) +{ + return SIMIX_storage_get_used_size(simcall->issuer, name); +} + +sg_size_t SIMIX_storage_get_used_size(smx_process_t process, const char* name) +{ + smx_host_t host = process->smx_host; + return surf_workstation_get_used_size(host, name); +} + +xbt_dict_t SIMIX_pre_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)); +} + +const char* SIMIX_pre_storage_get_name(smx_simcall_t simcall, smx_storage_t storage){ + return SIMIX_storage_get_name(storage); +} + +const char* SIMIX_storage_get_name(smx_storage_t storage){ + xbt_assert((storage != NULL), "Invalid parameters"); + return sg_storage_name(storage); +} + +xbt_dict_t SIMIX_pre_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); +} + +sg_size_t SIMIX_storage_get_size(smx_storage_t storage){ + xbt_assert((storage != NULL), "Invalid parameters (simix storage is NULL)"); + return surf_storage_get_size(storage); +} + +const char* SIMIX_pre_storage_get_host(smx_simcall_t simcall, smx_storage_t storage){ + return SIMIX_storage_get_host(storage); +} + +const char* SIMIX_storage_get_host(smx_storage_t storage){ + xbt_assert((storage != NULL), "Invalid parameters"); + return surf_storage_get_host(storage); +} void SIMIX_post_io(smx_action_t action) { @@ -278,28 +375,22 @@ void SIMIX_post_io(smx_action_t action) xbt_fifo_foreach(action->simcalls,i,simcall,smx_simcall_t) { switch (simcall->call) { - case SIMCALL_FILE_OPEN:; + case SIMCALL_FILE_OPEN: { smx_file_t tmp = xbt_new(s_smx_file_t,1); - tmp->surf_file = (action->io.surf_io)->file; + tmp->surf_file = surf_storage_action_get_file(action->io.surf_io); simcall_file_open__set__result(simcall, tmp); break; - + } case SIMCALL_FILE_CLOSE: xbt_free(simcall_file_close__get__fd(simcall)); simcall_file_close__set__result(simcall, 0); break; - case SIMCALL_FILE_WRITE: - simcall_file_write__set__result(simcall, (action->io.surf_io)->cost); + simcall_file_write__set__result(simcall, surf_action_get_cost(action->io.surf_io)); break; case SIMCALL_FILE_READ: - simcall_file_read__set__result(simcall, (action->io.surf_io)->cost); - break; - - case SIMCALL_FILE_UNLINK: - xbt_free(simcall_file_unlink__get__fd(simcall)); - simcall_file_unlink__set__result(simcall, 0); + simcall_file_read__set__result(simcall, surf_action_get_cost(action->io.surf_io)); break; case SIMCALL_FILE_LS: @@ -311,19 +402,14 @@ void SIMIX_post_io(smx_action_t action) // xbt_dict_set((action->io.surf_io)->ls_dict,key,dst,xbt_free); // } // } - simcall_file_ls__set__result(simcall, (action->io.surf_io)->ls_dict); - break; - case SIMCALL_FILE_GET_SIZE: - simcall_file_get_size__set__result(simcall, - ((action->io.surf_io)->file->size)); + simcall_file_ls__set__result(simcall, surf_storage_action_get_ls_dict(action->io.surf_io)); break; - default: break; } } - switch (surf_workstation_model->action_state_get(action->io.surf_io)) { + switch (surf_action_get_state(action->io.surf_io)) { case SURF_ACTION_FAILED: action->state = SIMIX_FAILED; @@ -345,7 +431,7 @@ void SIMIX_io_destroy(smx_action_t action) { XBT_DEBUG("Destroy action %p", action); if (action->io.surf_io) - action->io.surf_io->model_type->action_unref(action->io.surf_io); + surf_action_unref(action->io.surf_io); xbt_mallocator_release(simix_global->action_mallocator, action); } @@ -375,8 +461,7 @@ void SIMIX_io_finish(smx_action_t action) (int)action->state); } - if (surf_workstation_model->extension. - workstation.get_state(simcall->issuer->smx_host) != SURF_RESOURCE_ON) { + if (surf_resource_get_state(surf_workstation_resource_priv(simcall->issuer->smx_host)) != SURF_RESOURCE_ON) { simcall->issuer->context->iwannadie = 1; }