-/* 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 "xbt/sysdep.h"
#include "xbt/log.h"
#include "xbt/dict.h"
"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 simcall_HANDLER_file_read(smx_simcall_t simcall, smx_file_t fd, sg_size_t size, sg_host_t host)
{
- 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);
- xbt_fifo_push(action->simcalls, simcall);
- simcall->issuer->waiting_action = action;
+ smx_synchro_t synchro = SIMIX_file_read(fd, size, host);
+ xbt_fifo_push(synchro->simcalls, simcall);
+ simcall->issuer->waiting_synchro = synchro;
}
-smx_action_t SIMIX_file_read(smx_process_t process, void* ptr, size_t size, size_t nmemb, smx_file_t stream)
+smx_synchro_t SIMIX_file_read(smx_file_t fd, sg_size_t size, sg_host_t host)
{
- smx_action_t action;
- smx_host_t host = process->smx_host;
+ smx_synchro_t synchro;
/* check if the host is active */
- if (surf_workstation_model->extension.
- workstation.get_state(host->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",
- host->name);
+ 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
+ synchro = xbt_mallocator_get(simix_global->synchro_mallocator);
+ synchro->type = SIMIX_SYNC_IO;
+ synchro->name = NULL;
+ synchro->category = NULL;
- action->io.host = host;
- action->io.surf_io = surf_workstation_model->extension.workstation.read(host->host, ptr, size, nmemb, stream->surf_file);
+ synchro->io.host = host;
+ synchro->io.surf_io = surf_host_read(host, fd->surf_file, size);
- surf_workstation_model->action_data_set(action->io.surf_io, action);
- XBT_DEBUG("Create io action %p", action);
+ surf_action_set_data(synchro->io.surf_io, synchro);
+ XBT_DEBUG("Create io synchro %p", synchro);
- return action;
+ return synchro;
}
//SIMIX FILE WRITE
-void SIMIX_pre_file_write(smx_simcall_t simcall)
+void simcall_HANDLER_file_write(smx_simcall_t simcall, smx_file_t fd, sg_size_t size, sg_host_t host)
{
- 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);
- xbt_fifo_push(action->simcalls, simcall);
- simcall->issuer->waiting_action = action;
+ smx_synchro_t synchro = SIMIX_file_write(fd, size, host);
+ xbt_fifo_push(synchro->simcalls, simcall);
+ simcall->issuer->waiting_synchro = synchro;
}
-smx_action_t SIMIX_file_write(smx_process_t process, const void* ptr, size_t size, size_t nmemb, smx_file_t stream)
+smx_synchro_t SIMIX_file_write(smx_file_t fd, sg_size_t size, sg_host_t host)
{
- smx_action_t action;
- smx_host_t host = process->smx_host;
+ smx_synchro_t synchro;
/* check if the host is active */
- if (surf_workstation_model->extension.
- workstation.get_state(host->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",
- host->name);
+ 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
+ synchro = xbt_mallocator_get(simix_global->synchro_mallocator);
+ synchro->type = SIMIX_SYNC_IO;
+ synchro->name = NULL;
+ synchro->category = NULL;
- action->io.host = host;
- action->io.surf_io = surf_workstation_model->extension.workstation.write(host->host, ptr, size, nmemb, stream->surf_file);
+ synchro->io.host = host;
+ synchro->io.surf_io = surf_host_write(host, fd->surf_file, size);
- surf_workstation_model->action_data_set(action->io.surf_io, action);
- XBT_DEBUG("Create io action %p", action);
+ surf_action_set_data(synchro->io.surf_io, synchro);
+ XBT_DEBUG("Create io synchro %p", synchro);
- return action;
+ return synchro;
}
//SIMIX FILE OPEN
-void SIMIX_pre_file_open(smx_simcall_t simcall)
+void simcall_HANDLER_file_open(smx_simcall_t simcall, const char* fullpath, sg_host_t host)
{
- smx_action_t action = SIMIX_file_open(simcall->issuer,
- simcall->file_open.mount,
- simcall->file_open.path,
- simcall->file_open.mode);
- xbt_fifo_push(action->simcalls, simcall);
- simcall->issuer->waiting_action = action;
+ smx_synchro_t synchro = SIMIX_file_open(fullpath, host);
+ xbt_fifo_push(synchro->simcalls, simcall);
+ simcall->issuer->waiting_synchro = synchro;
}
-smx_action_t SIMIX_file_open(smx_process_t process ,const char* mount, const char* path, const char* mode)
+smx_synchro_t SIMIX_file_open(const char* fullpath, sg_host_t host)
{
- smx_action_t action;
- smx_host_t host = process->smx_host;
+ smx_synchro_t synchro;
/* check if the host is active */
- if (surf_workstation_model->extension.
- workstation.get_state(host->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",
- host->name);
+ 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
+ synchro = xbt_mallocator_get(simix_global->synchro_mallocator);
+ synchro->type = SIMIX_SYNC_IO;
+ synchro->name = NULL;
+ synchro->category = NULL;
- action->io.host = host;
- action->io.surf_io = surf_workstation_model->extension.workstation.open(host->host, mount, path, mode);
+ synchro->io.host = host;
+ synchro->io.surf_io = surf_host_open(host, fullpath);
- surf_workstation_model->action_data_set(action->io.surf_io, action);
- XBT_DEBUG("Create io action %p", action);
+ surf_action_set_data(synchro->io.surf_io, synchro);
+ XBT_DEBUG("Create io synchro %p", synchro);
- return action;
+ return synchro;
}
//SIMIX FILE CLOSE
-void SIMIX_pre_file_close(smx_simcall_t simcall)
+void simcall_HANDLER_file_close(smx_simcall_t simcall, smx_file_t fd, sg_host_t host)
{
- smx_action_t action = SIMIX_file_close(simcall->issuer,
- simcall->file_close.fp);
- xbt_fifo_push(action->simcalls, simcall);
- simcall->issuer->waiting_action = action;
+ smx_synchro_t synchro = SIMIX_file_close(fd, host);
+ xbt_fifo_push(synchro->simcalls, simcall);
+ simcall->issuer->waiting_synchro = synchro;
}
-smx_action_t SIMIX_file_close(smx_process_t process, smx_file_t fp)
+smx_synchro_t SIMIX_file_close(smx_file_t fd, sg_host_t host)
{
- smx_action_t action;
- smx_host_t host = process->smx_host;
+ smx_synchro_t synchro;
/* check if the host is active */
- if (surf_workstation_model->extension.
- workstation.get_state(host->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",
- host->name);
+ 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
+ synchro = xbt_mallocator_get(simix_global->synchro_mallocator);
+ synchro->type = SIMIX_SYNC_IO;
+ synchro->name = NULL;
+ synchro->category = NULL;
- action->io.host = host;
- action->io.surf_io = surf_workstation_model->extension.workstation.close(host->host, fp->surf_file);
+ synchro->io.host = host;
+ synchro->io.surf_io = surf_host_close(host, fd->surf_file);
- surf_workstation_model->action_data_set(action->io.surf_io, action);
- XBT_DEBUG("Create io action %p", action);
+ surf_action_set_data(synchro->io.surf_io, synchro);
+ XBT_DEBUG("Create io synchro %p", synchro);
- return action;
+ return synchro;
}
-//SIMIX FILE STAT
-void SIMIX_pre_file_stat(smx_simcall_t simcall)
-{
- smx_action_t action = SIMIX_file_stat(simcall->issuer,
- simcall->file_stat.fd,
- simcall->file_stat.buf);
- xbt_fifo_push(action->simcalls, simcall);
- simcall->issuer->waiting_action = action;
-}
-smx_action_t SIMIX_file_stat(smx_process_t process, smx_file_t fd, s_file_stat_t buf)
+//SIMIX FILE UNLINK
+int SIMIX_file_unlink(smx_file_t fd, sg_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->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",
- host->name);
+ 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.stat(host->host, fd->surf_file);
+ int res = surf_host_unlink(host, fd->surf_file);
+ xbt_free(fd);
+ return !!res;
+}
- surf_workstation_model->action_data_set(action->io.surf_io, action);
- XBT_DEBUG("Create io action %p", action);
+sg_size_t simcall_HANDLER_file_get_size(smx_simcall_t simcall, smx_file_t fd)
+{
+ return SIMIX_file_get_size(simcall->issuer, fd);
+}
- return action;
+sg_size_t SIMIX_file_get_size(smx_process_t process, smx_file_t fd)
+{
+ sg_host_t host = process->host;
+ return surf_host_get_size(host, fd->surf_file);
}
-//SIMIX FILE UNLINK
-void SIMIX_pre_file_unlink(smx_simcall_t simcall)
+sg_size_t simcall_HANDLER_file_tell(smx_simcall_t simcall, smx_file_t fd)
{
- smx_action_t action = SIMIX_file_unlink(simcall->issuer,
- simcall->file_unlink.fd);
- xbt_fifo_push(action->simcalls, simcall);
- simcall->issuer->waiting_action = action;
+ return SIMIX_file_tell(simcall->issuer, fd);
}
-smx_action_t SIMIX_file_unlink(smx_process_t process, smx_file_t fd)
+sg_size_t SIMIX_file_tell(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) {
- THROWF(host_error, 0, "Host %s failed, you cannot call this function",
- host->name);
- }
+ sg_host_t host = process->host;
+ return surf_host_file_tell(host, fd->surf_file);
+}
- 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->host, fd->surf_file);
+xbt_dynar_t simcall_HANDLER_file_get_info(smx_simcall_t simcall, smx_file_t fd)
+{
+ return SIMIX_file_get_info(simcall->issuer, fd);
+}
- surf_workstation_model->action_data_set(action->io.surf_io, action);
- XBT_DEBUG("Create io action %p", action);
+xbt_dynar_t SIMIX_file_get_info(smx_process_t process, smx_file_t fd)
+{
+ sg_host_t host = process->host;
+ return surf_host_get_info(host, fd->surf_file);
+}
- return action;
+int simcall_HANDLER_file_seek(smx_simcall_t simcall, smx_file_t fd, sg_offset_t offset, int origin)
+{
+ return SIMIX_file_seek(simcall->issuer, fd, offset, origin);
}
-//SIMIX FILE LS
-void SIMIX_pre_file_ls(smx_simcall_t simcall)
+int SIMIX_file_seek(smx_process_t process, smx_file_t fd, sg_offset_t offset, int origin)
{
- smx_action_t action = SIMIX_file_ls(simcall->issuer,
- simcall->file_ls.mount, simcall->file_ls.path);
- xbt_fifo_push(action->simcalls, simcall);
- simcall->issuer->waiting_action = action;
+ sg_host_t host = process->host;
+ return surf_host_file_seek(host, fd->surf_file, offset, origin);
}
-smx_action_t SIMIX_file_ls(smx_process_t process, const char* mount, const char *path)
+
+int simcall_HANDLER_file_move(smx_simcall_t simcall, smx_file_t file, 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->host) != SURF_RESOURCE_ON) {
- THROWF(host_error, 0, "Host %s failed, you cannot call this function",
- host->name);
- }
+ return SIMIX_file_move(simcall->issuer, file, fullpath);
+}
- action = xbt_mallocator_get(simix_global->action_mallocator);
- action->type = SIMIX_ACTION_IO;
- action->name = NULL;
-#ifdef HAVE_TRACING
- action->category = NULL;
-#endif
+int SIMIX_file_move(smx_process_t process, smx_file_t file, const char* fullpath)
+{
+ sg_host_t host = process->host;
+ return surf_host_file_move(host, file->surf_file, fullpath);
+}
- action->io.host = host;
- action->io.surf_io = surf_workstation_model->extension.workstation.ls(host->host,mount,path);
+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);
+}
- surf_workstation_model->action_data_set(action->io.surf_io, action);
- XBT_DEBUG("Create io action %p", action);
- return action;
+sg_size_t simcall_HANDLER_storage_get_free_size(smx_simcall_t simcall, smx_storage_t storage)
+{
+ return SIMIX_storage_get_free_size(simcall->issuer, storage);
}
-static void free_file_stat(void *p)
+sg_size_t SIMIX_storage_get_free_size(smx_process_t process, smx_storage_t storage)
{
- file_stat_t fs = p;
- xbt_free(fs->date);
- xbt_free(fs->group);
- xbt_free(fs->time);
- xbt_free(fs->user);
- xbt_free(fs->user_rights);
- xbt_free(fs);
+ return surf_storage_get_free_size(storage);
+}
+
+sg_size_t simcall_HANDLER_storage_get_used_size(smx_simcall_t simcall, smx_storage_t storage)
+{
+ return SIMIX_storage_get_used_size(simcall->issuer, storage);
+}
+
+sg_size_t SIMIX_storage_get_used_size(smx_process_t process, smx_storage_t storage)
+{
+ return surf_storage_get_used_size(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));
}
-void SIMIX_post_io(smx_action_t action)
+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_storage_get_content(smx_storage_t storage){
+ xbt_assert((storage != NULL), "Invalid parameters (simix storage is NULL)");
+ return surf_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_synchro_t synchro)
{
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) {
+ xbt_fifo_foreach(synchro->simcalls,i,simcall,smx_simcall_t) {
switch (simcall->call) {
- case SIMCALL_FILE_OPEN:
- simcall->file_open.result = xbt_new(s_smx_file_t,1);
- simcall->file_open.result->surf_file = (action->io.surf_io)->file;
+ case SIMCALL_FILE_OPEN: {
+ smx_file_t tmp = xbt_new(s_smx_file_t,1);
+ tmp->surf_file = surf_storage_action_get_file(synchro->io.surf_io);
+ simcall_file_open__set__result(simcall, tmp);
break;
-
+ }
case SIMCALL_FILE_CLOSE:
- xbt_free(simcall->file_close.fp);
- simcall->file_close.result = 0;
+ xbt_free(simcall_file_close__get__fd(simcall));
+ simcall_file_close__set__result(simcall, 0);
break;
-
case SIMCALL_FILE_WRITE:
- simcall->file_write.result = (action->io.surf_io)->cost;
+ simcall_file_write__set__result(simcall, surf_action_get_cost(synchro->io.surf_io));
break;
case SIMCALL_FILE_READ:
- simcall->file_read.result = (action->io.surf_io)->cost;
- break;
-
- case SIMCALL_FILE_STAT:
- simcall->file_stat.result = 0;
- dst = &(simcall->file_stat.buf);
- src = &((action->io.surf_io)->stat);
- file_stat_copy(src,dst);
- break;
-
- case SIMCALL_FILE_UNLINK:
- xbt_free(simcall->file_unlink.fd);
- simcall->file_unlink.result = 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,free_file_stat);
- }
- }
- simcall->file_ls.result = (action->io.surf_io)->ls_dict;
+ simcall_file_read__set__result(simcall, surf_action_get_cost(synchro->io.surf_io));
break;
default:
}
}
- switch (surf_workstation_model->action_state_get(action->io.surf_io)) {
+ switch (surf_action_get_state(synchro->io.surf_io)) {
case SURF_ACTION_FAILED:
- action->state = SIMIX_FAILED;
+ synchro->state = SIMIX_FAILED;
break;
case SURF_ACTION_DONE:
- action->state = SIMIX_DONE;
+ synchro->state = SIMIX_DONE;
break;
default:
break;
}
- SIMIX_io_finish(action);
+ SIMIX_io_finish(synchro);
}
-void SIMIX_io_destroy(smx_action_t action)
+void SIMIX_io_destroy(smx_synchro_t synchro)
{
- XBT_DEBUG("Destroy action %p", action);
- if (action->io.surf_io)
- action->io.surf_io->model_type->action_unref(action->io.surf_io);
- xbt_mallocator_release(simix_global->action_mallocator, action);
+ XBT_DEBUG("Destroy synchro %p", synchro);
+ if (synchro->io.surf_io)
+ surf_action_unref(synchro->io.surf_io);
+ xbt_mallocator_release(simix_global->synchro_mallocator, synchro);
}
-void SIMIX_io_finish(smx_action_t action)
+void SIMIX_io_finish(smx_synchro_t synchro)
{
xbt_fifo_item_t item;
smx_simcall_t simcall;
- xbt_fifo_foreach(action->simcalls, item, simcall, smx_simcall_t) {
+ xbt_fifo_foreach(synchro->simcalls, item, simcall, smx_simcall_t) {
- switch (action->state) {
+ switch (synchro->state) {
case SIMIX_DONE:
- /* do nothing, action done */
+ /* do nothing, synchro done */
break;
case SIMIX_FAILED:
break;
default:
- xbt_die("Internal error in SIMIX_io_finish: unexpected action state %d",
- (int)action->state);
+ xbt_die("Internal error in SIMIX_io_finish: unexpected synchro state %d",
+ (int)synchro->state);
}
- if (surf_workstation_model->extension.
- workstation.get_state(simcall->issuer->smx_host->host) != SURF_RESOURCE_ON) {
+ if (surf_host_get_state(surf_host_resource_priv(simcall->issuer->host)) != SURF_RESOURCE_ON) {
simcall->issuer->context->iwannadie = 1;
}
- simcall->issuer->waiting_action = NULL;
+ simcall->issuer->waiting_synchro = NULL;
SIMIX_simcall_answer(simcall);
}
/* We no longer need it */
- SIMIX_io_destroy(action);
+ SIMIX_io_destroy(synchro);
}