X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7a21edf0ad00eee185ec492e9bbf094901fa25fe..f9e6853d2c5b7b867211700bc12f0ee57f640b30:/src/simix/smx_io.c diff --git a/src/simix/smx_io.c b/src/simix/smx_io.c index 1c16b3b73f..4b5b1f28ca 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" @@ -21,7 +21,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_io, simix, * \param storage the SURF storage to encapsulate * \param data some user data (may be NULL) */ -smx_host_t SIMIX_storage_create(const char *name, void *storage, void *data) +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); @@ -32,45 +32,37 @@ smx_host_t SIMIX_storage_create(const char *name, void *storage, void *data) 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; -void* SIMIX_pre_file_get_data(smx_simcall_t simcall,smx_file_t fd){ - return SIMIX_file_get_data(fd); -} - -void* SIMIX_file_get_data(smx_file_t fd){ - xbt_assert((fd != NULL), "Invalid parameters (simix file is NULL)"); - - return fd->data; -} - -void SIMIX_pre_file_set_data(smx_simcall_t simcall, smx_file_t fd, void *data) { - SIMIX_file_set_data(fd, data); -} - -void SIMIX_file_set_data(smx_file_t fd, void *data){ - xbt_assert((fd != NULL), "Invalid parameter"); + xbt_assert((storage != NULL), "Invalid parameters"); + if (storage->data) + free(storage->data); - fd->data = data; + /* Clean storage structure */ + free(storage); } //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_host_t host) { - smx_action_t action = SIMIX_file_read(simcall->issuer, size, fd); + smx_action_t action = SIMIX_file_read(simcall->issuer, fd, size, host); 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_host_t host) { 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)); } @@ -83,34 +75,28 @@ 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_host_t host) { - smx_action_t action = SIMIX_file_write(simcall->issuer, size, fd); + smx_action_t action = SIMIX_file_write(simcall->issuer, fd, size, host); 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_host_t host) { 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)); } @@ -123,34 +109,29 @@ 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; } //SIMIX FILE OPEN -void SIMIX_pre_file_open(smx_simcall_t simcall, const char* mount, - const char* path) +void SIMIX_pre_file_open(smx_simcall_t simcall, const char* fullpath) { - smx_action_t action = SIMIX_file_open(simcall->issuer, mount, path); + smx_action_t action = SIMIX_file_open(simcall->issuer, fullpath); 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) +smx_action_t SIMIX_file_open(smx_process_t process, const char* fullpath) { 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)); } @@ -163,10 +144,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, fullpath); - 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; @@ -186,8 +166,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)); } @@ -200,9 +179,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; @@ -219,14 +198,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; @@ -245,7 +223,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)); } @@ -258,25 +236,36 @@ 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); +} + +sg_size_t SIMIX_pre_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) +{ + smx_host_t host = process->smx_host; + return surf_workstation_file_tell(host, fd->surf_file); +} + + xbt_dynar_t SIMIX_pre_file_get_info(smx_simcall_t simcall, smx_file_t fd) { return SIMIX_file_get_info(simcall->issuer, fd); @@ -285,30 +274,62 @@ 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); +} + +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); +} + +int SIMIX_pre_file_move(smx_simcall_t simcall, smx_file_t file, const char* fullpath) +{ + return SIMIX_file_move(simcall->issuer, file, fullpath); } -size_t SIMIX_pre_storage_get_free_size(smx_simcall_t simcall, const char* name) +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); +} + +int SIMIX_pre_file_rcopy(smx_simcall_t simcall, smx_file_t fd, smx_host_t host, const char* fullpath) +{ + return SIMIX_file_rcopy(simcall->issuer, fd, host, fullpath); +} + +int SIMIX_file_rcopy(smx_process_t process, smx_file_t file, smx_host_t host_dest, const char* fullpath) +{ + smx_host_t host = process->smx_host; + return surf_workstation_file_rcopy(host, file->surf_file, host_dest, fullpath); +} + +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){ @@ -316,42 +337,39 @@ 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_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); } -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; +xbt_dict_t SIMIX_pre_storage_get_content(smx_simcall_t simcall, smx_storage_t storage){ + return SIMIX_storage_get_content(storage); } -void* SIMIX_pre_storage_get_data(smx_simcall_t simcall,smx_storage_t storage){ - return SIMIX_storage_get_data(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); } -void* SIMIX_storage_get_data(smx_storage_t storage){ +sg_size_t SIMIX_storage_get_size(smx_storage_t storage){ xbt_assert((storage != NULL), "Invalid parameters (simix storage is NULL)"); - - return SIMIX_storage_priv(storage)->data; + return surf_storage_get_size(storage); } -xbt_dict_t SIMIX_pre_storage_get_content(smx_simcall_t simcall, smx_storage_t storage){ - return SIMIX_storage_get_content(storage); +const char* SIMIX_pre_storage_get_host(smx_simcall_t simcall, smx_storage_t storage){ + return SIMIX_storage_get_host(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_model->extension.storage.get_content(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) @@ -365,23 +383,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); + simcall_file_read__set__result(simcall, surf_action_get_cost(action->io.surf_io)); break; case SIMCALL_FILE_LS: @@ -393,14 +410,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; @@ -422,7 +439,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); } @@ -452,8 +469,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; }