X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/01d1fb6aad0f3085ab2027950852d44caf9cff29..0c43de62fbe4bfc243d6512296e09207e80bcd54:/src/simix/smx_io.c diff --git a/src/simix/smx_io.c b/src/simix/smx_io.c index 3561716337..9f1585be08 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-2013. 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,6 +15,41 @@ 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_or_null(storage_lib, name, SIMIX_STORAGE_LEVEL); +} + +/** + * \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); +} + void* SIMIX_pre_file_get_data(smx_simcall_t simcall,smx_file_t fd){ return SIMIX_file_get_data(fd); } @@ -36,23 +71,20 @@ void SIMIX_file_set_data(smx_file_t fd, void *data){ } //SIMIX FILE READ -void SIMIX_pre_file_read(smx_simcall_t simcall, size_t size, - smx_file_t fd) +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, size, fd); + 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, size_t size, - smx_file_t fd) +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)); } @@ -65,34 +97,29 @@ smx_action_t SIMIX_file_read(smx_process_t process, size_t size, #endif action->io.host = host; - action->io.surf_io = - surf_workstation_model->extension.workstation.read(host, size, - fd->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, size_t size, - smx_file_t fd) +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, size, fd); + 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, - size_t size, smx_file_t fd) +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)); } @@ -105,11 +132,9 @@ smx_action_t SIMIX_file_write(smx_process_t process, #endif action->io.host = host; - action->io.surf_io = - surf_workstation_model->extension.workstation.write(host, size, - fd->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; @@ -131,8 +156,7 @@ smx_action_t SIMIX_file_open(smx_process_t process ,const char* mount, 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)); } @@ -145,10 +169,9 @@ smx_action_t SIMIX_file_open(smx_process_t process ,const char* mount, #endif action->io.host = host; - action->io.surf_io = - surf_workstation_model->extension.workstation.open(host, mount, path); + 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; @@ -168,8 +191,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)); } @@ -182,9 +204,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; @@ -201,14 +223,13 @@ int SIMIX_file_unlink(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)); } - if (surf_workstation_model->extension.workstation.unlink(host, fd->surf_file)){ - fd->surf_file = NULL; + if (surf_workstation_unlink(host, fd->surf_file)){ + xbt_free(fd); return 1; } else return 0; @@ -227,7 +248,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)); } @@ -240,23 +261,22 @@ 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; } -size_t 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) { return SIMIX_file_get_size(simcall->issuer, fd); } -size_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_host_t host = process->smx_host; - return surf_workstation_model->extension.workstation.get_size(host, - fd->surf_file); + return surf_workstation_get_size(host, fd->surf_file); } xbt_dynar_t SIMIX_pre_file_get_info(smx_simcall_t simcall, smx_file_t fd) @@ -267,30 +287,39 @@ xbt_dynar_t SIMIX_pre_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_model->extension.workstation.get_info(host, - fd->surf_file); + return surf_workstation_get_info(host, fd->surf_file); +} + +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); } -size_t SIMIX_pre_storage_get_free_size(smx_simcall_t simcall, const char* name) +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); } -size_t SIMIX_storage_get_free_size(smx_process_t process, const char* 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_model->extension.workstation.get_free_size(host,name); + return surf_workstation_get_free_size(host, name); } -size_t SIMIX_pre_storage_get_used_size(smx_simcall_t simcall, const char* 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); } -size_t SIMIX_storage_get_used_size(smx_process_t process, const char* 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_model->extension.workstation.get_used_size(host,name); + return surf_workstation_get_used_size(host, name); } xbt_dict_t SIMIX_pre_storage_get_properties(smx_simcall_t simcall, smx_storage_t storage){ @@ -298,7 +327,50 @@ xbt_dict_t SIMIX_pre_storage_get_properties(smx_simcall_t simcall, smx_storage_t } xbt_dict_t SIMIX_storage_get_properties(smx_storage_t storage){ xbt_assert((storage != NULL), "Invalid parameters (simix storage is NULL)"); - return surf_storage_model->extension.storage.get_properties(storage); + return surf_resource_get_properties(surf_workstation_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); +} + +void SIMIX_pre_storage_set_data(smx_simcall_t simcall, smx_storage_t storage, void *data) { + SIMIX_storage_set_data(storage, data); +} +void SIMIX_storage_set_data(smx_storage_t storage, void *data){ + xbt_assert((storage != NULL), "Invalid parameters"); + xbt_assert((SIMIX_storage_priv(storage)->data == NULL), "Data already set"); + + SIMIX_storage_priv(storage)->data = data; +} + +void* SIMIX_pre_storage_get_data(smx_simcall_t simcall,smx_storage_t storage){ + return SIMIX_storage_get_data(storage); +} + +void* SIMIX_storage_get_data(smx_storage_t storage){ + xbt_assert((storage != NULL), "Invalid parameters (simix storage is NULL)"); + + return SIMIX_storage_priv(storage)->data; +} + +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); } void SIMIX_post_io(smx_action_t action) @@ -314,7 +386,7 @@ void SIMIX_post_io(smx_action_t action) switch (simcall->call) { 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; @@ -322,13 +394,12 @@ void SIMIX_post_io(smx_action_t action) 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); + simcall_file_read__set__result(simcall, surf_action_get_cost(action->io.surf_io)); break; case SIMCALL_FILE_LS: @@ -340,14 +411,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); + 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; @@ -369,7 +440,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); } @@ -399,8 +470,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; }