X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b8ba0bc2f48c6b9b96dfedd8fd383b941d5fdd0b..583b45fc459df9a4d3990cbf74009b3ffb63ef4a:/src/simix/smx_io.c diff --git a/src/simix/smx_io.c b/src/simix/smx_io.c index 57206589c4..dde44a38c4 100644 --- a/src/simix/smx_io.c +++ b/src/simix/smx_io.c @@ -5,6 +5,7 @@ * 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" @@ -15,27 +16,24 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_io, simix, //SIMIX FILE READ -void SIMIX_pre_file_read(smx_simcall_t simcall) +void SIMIX_pre_file_read(smx_simcall_t simcall, void *ptr, size_t size, + size_t nmemb, smx_file_t stream) { - smx_action_t action = SIMIX_file_read(simcall->issuer, - simcall->file_read.ptr, - simcall->file_read.size, - simcall->file_read.nmemb, - simcall->file_read.stream); + smx_action_t action = SIMIX_file_read(simcall->issuer, ptr, size, nmemb, stream); 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, void* ptr, size_t size, size_t nmemb, smx_file_t stream) { 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->host) != SURF_RESOURCE_ON) { + workstation.get_state(host) != SURF_RESOURCE_ON) { THROWF(host_error, 0, "Host %s failed, you cannot call this function", - host->name); + sg_host_name(host)); } action = xbt_mallocator_get(simix_global->action_mallocator); @@ -46,9 +44,7 @@ smx_action_t SIMIX_file_read(smx_process_t process, void* ptr, size_t size, size #endif action->io.host = host; - // TODO in surf model disk??? - // action->io.surf_io = surf_workstation_model->extension.storage.read(host->host, name), - action->io.surf_io = surf_workstation_model->extension.workstation.sleep(host->host, 1.0); + action->io.surf_io = surf_workstation_model->extension.workstation.read(host, ptr, size, nmemb, stream->surf_file); surf_workstation_model->action_data_set(action->io.surf_io, action); XBT_DEBUG("Create io action %p", action); @@ -57,27 +53,24 @@ smx_action_t SIMIX_file_read(smx_process_t process, void* ptr, size_t size, size } //SIMIX FILE WRITE -void SIMIX_pre_file_write(smx_simcall_t simcall) +void SIMIX_pre_file_write(smx_simcall_t simcall, const void *ptr, size_t size, + size_t nmemb, smx_file_t stream) { - smx_action_t action = SIMIX_file_write(simcall->issuer, - simcall->file_write.ptr, - simcall->file_write.size, - simcall->file_write.nmemb, - simcall->file_write.stream); + smx_action_t action = SIMIX_file_write(simcall->issuer, ptr, size, nmemb, stream); 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, const void* ptr, size_t size, size_t nmemb, smx_file_t stream) { 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->host) != SURF_RESOURCE_ON) { + workstation.get_state(host) != SURF_RESOURCE_ON) { THROWF(host_error, 0, "Host %s failed, you cannot call this function", - host->name); + sg_host_name(host)); } action = xbt_mallocator_get(simix_global->action_mallocator); @@ -88,9 +81,7 @@ smx_action_t SIMIX_file_write(smx_process_t process, const void* ptr, size_t siz #endif action->io.host = host; - // TODO in surf model disk??? - // action->io.surf_io = surf_workstation_model->extension.storage.write(host->host, name), - action->io.surf_io = surf_workstation_model->extension.workstation.sleep(host->host, 2.0); + action->io.surf_io = surf_workstation_model->extension.workstation.write(host, ptr, size, nmemb, stream->surf_file); surf_workstation_model->action_data_set(action->io.surf_io, action); XBT_DEBUG("Create io action %p", action); @@ -99,25 +90,24 @@ 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) +void SIMIX_pre_file_open(smx_simcall_t simcall, const char* mount, + const char* path, const char* mode) { - smx_action_t action = SIMIX_file_open(simcall->issuer, - simcall->file_open.path, - simcall->file_open.mode); + smx_action_t action = SIMIX_file_open(simcall->issuer, mount, path, mode); xbt_fifo_push(action->simcalls, simcall); simcall->issuer->waiting_action = action; } -smx_action_t SIMIX_file_open(smx_process_t process, const char* path, const char* mode) +smx_action_t SIMIX_file_open(smx_process_t process ,const char* mount, const char* path, const char* mode) { 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->host) != SURF_RESOURCE_ON) { + workstation.get_state(host) != SURF_RESOURCE_ON) { THROWF(host_error, 0, "Host %s failed, you cannot call this function", - host->name); + sg_host_name(host)); } action = xbt_mallocator_get(simix_global->action_mallocator); @@ -128,9 +118,7 @@ smx_action_t SIMIX_file_open(smx_process_t process, const char* path, const char #endif action->io.host = host; - // TODO in surf model disk??? - // action->io.surf_io = surf_workstation_model->extension.storage.open(host->host, name), - action->io.surf_io = surf_workstation_model->extension.workstation.sleep(host->host, 3.0); + action->io.surf_io = surf_workstation_model->extension.workstation.open(host, mount, path, mode); surf_workstation_model->action_data_set(action->io.surf_io, action); XBT_DEBUG("Create io action %p", action); @@ -139,24 +127,23 @@ smx_action_t SIMIX_file_open(smx_process_t process, const char* path, const char } //SIMIX FILE CLOSE -void SIMIX_pre_file_close(smx_simcall_t simcall) +void SIMIX_pre_file_close(smx_simcall_t simcall, smx_file_t fd) { - smx_action_t action = SIMIX_file_close(simcall->issuer, - simcall->file_close.fp); + smx_action_t action = SIMIX_file_close(simcall->issuer, fd); xbt_fifo_push(action->simcalls, simcall); simcall->issuer->waiting_action = action; } -smx_action_t SIMIX_file_close(smx_process_t process, smx_file_t* fp) +smx_action_t SIMIX_file_close(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->host) != SURF_RESOURCE_ON) { + workstation.get_state(host) != SURF_RESOURCE_ON) { THROWF(host_error, 0, "Host %s failed, you cannot call this function", - host->name); + sg_host_name(host)); } action = xbt_mallocator_get(simix_global->action_mallocator); @@ -167,9 +154,7 @@ smx_action_t SIMIX_file_close(smx_process_t process, smx_file_t* fp) #endif action->io.host = host; - // TODO in surf model disk??? - // action->io.surf_io = surf_workstation_model->extension.storage.close(host->host, name), - action->io.surf_io = surf_workstation_model->extension.workstation.sleep(host->host, 4.0); + action->io.surf_io = surf_workstation_model->extension.workstation.close(host, fd->surf_file); surf_workstation_model->action_data_set(action->io.surf_io, action); XBT_DEBUG("Create io action %p", action); @@ -177,26 +162,92 @@ smx_action_t SIMIX_file_close(smx_process_t process, smx_file_t* fp) return action; } -//SIMIX FILE STAT -void SIMIX_pre_file_stat(smx_simcall_t simcall) + +//SIMIX FILE UNLINK +void 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; +} + +smx_action_t 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) { + 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; +} + +//SIMIX FILE LS +void SIMIX_pre_file_ls(smx_simcall_t simcall, + const char* mount, const char* path) +{ + smx_action_t action = SIMIX_file_ls(simcall->issuer, mount, path); + xbt_fifo_push(action->simcalls, simcall); + simcall->issuer->waiting_action = action; +} +smx_action_t SIMIX_file_ls(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) { + 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.ls(host,mount,path); + + surf_workstation_model->action_data_set(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) { - smx_action_t action = SIMIX_file_stat(simcall->issuer, - simcall->file_stat.fd, - simcall->file_stat.buf); + smx_action_t action = SIMIX_file_get_size(simcall->issuer, fd); xbt_fifo_push(action->simcalls, simcall); simcall->issuer->waiting_action = action; } -smx_action_t SIMIX_file_stat(smx_process_t process, int fd, void* buf) +smx_action_t SIMIX_file_get_size(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->host) != SURF_RESOURCE_ON) { + workstation.get_state(host) != SURF_RESOURCE_ON) { THROWF(host_error, 0, "Host %s failed, you cannot call this function", - host->name); + sg_host_name(host)); } action = xbt_mallocator_get(simix_global->action_mallocator); @@ -207,9 +258,7 @@ smx_action_t SIMIX_file_stat(smx_process_t process, int fd, void* buf) #endif action->io.host = host; - // TODO in surf model disk??? - // action->io.surf_io = surf_workstation_model->extension.storage.stat(host->host, name), - action->io.surf_io = surf_workstation_model->extension.workstation.sleep(host->host, 5.0); + 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); @@ -217,8 +266,63 @@ smx_action_t SIMIX_file_stat(smx_process_t process, int fd, void* buf) return action; } + void SIMIX_post_io(smx_action_t action) { + xbt_fifo_item_t i; + smx_simcall_t simcall; +// char* key; +// xbt_dict_cursor_t cursor = NULL; +// s_file_stat_t *dst = NULL; +// s_file_stat_t *src = NULL; + + xbt_fifo_foreach(action->simcalls,i,simcall,smx_simcall_t) { + 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; + 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); + 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); + break; + + case SIMCALL_FILE_LS: +// xbt_dict_foreach((action->io.surf_io)->ls_dict,cursor,key, src){ +// // if there is a stat we have to duplicate it +// if(src){ +// dst = xbt_new0(s_file_stat_t,1); +// file_stat_copy(src, dst); +// 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)); + break; + + default: + break; + } + } + switch (surf_workstation_model->action_state_get(action->io.surf_io)) { case SURF_ACTION_FAILED: @@ -247,7 +351,7 @@ void SIMIX_io_destroy(smx_action_t action) void SIMIX_io_finish(smx_action_t action) { - volatile xbt_fifo_item_t item; + xbt_fifo_item_t item; smx_simcall_t simcall; xbt_fifo_foreach(action->simcalls, item, simcall, smx_simcall_t) { @@ -259,27 +363,23 @@ void SIMIX_io_finish(smx_action_t action) break; case SIMIX_FAILED: - TRY { - THROWF(io_error, 0, "IO failed"); - } - CATCH(simcall->issuer->running_ctx->exception) { - simcall->issuer->doexception = 1; - } - break; + SMX_EXCEPTION(simcall->issuer, io_error, 0, "IO failed"); + break; case SIMIX_CANCELED: - TRY { - THROWF(cancel_error, 0, "Canceled"); - } - CATCH(simcall->issuer->running_ctx->exception) { - simcall->issuer->doexception = 1; - } - break; + SMX_EXCEPTION(simcall->issuer, cancel_error, 0, "Canceled"); + break; default: xbt_die("Internal error in SIMIX_io_finish: unexpected action state %d", - action->state); + (int)action->state); } + + if (surf_workstation_model->extension. + workstation.get_state(simcall->issuer->smx_host) != SURF_RESOURCE_ON) { + simcall->issuer->context->iwannadie = 1; + } + simcall->issuer->waiting_action = NULL; SIMIX_simcall_answer(simcall); }