X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/fa45ee4a5c6eb99a3d7bb445875d8035e492bdc7..8f40bcc6ebbd357b82f7a10584daef769922c482:/src/surf/workstation_interface.cpp diff --git a/src/surf/workstation_interface.cpp b/src/surf/workstation_interface.cpp index 9783d2a69a..d967225057 100644 --- a/src/surf/workstation_interface.cpp +++ b/src/surf/workstation_interface.cpp @@ -4,11 +4,14 @@ /* 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 "simix/smx_private.h" #include "workstation_interface.hpp" #include "vm_workstation_interface.hpp" #include "cpu_cas01.hpp" #include "simgrid/sg_config.h" +#include "network_interface.hpp" + XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_workstation, surf, "Logging specific to the SURF workstation module"); @@ -20,8 +23,17 @@ WorkstationModelPtr surf_workstation_model = NULL; surf_callback(void, WorkstationPtr) workstationCreatedCallbacks; surf_callback(void, WorkstationPtr) workstationDestructedCallbacks; -surf_callback(void, WorkstationPtr) workstationStateChangedCallbacks; -surf_callback(void, WorkstationActionPtr) workstationActionStateChangedCallbacks; +surf_callback(void, WorkstationPtr, e_surf_resource_state_t, e_surf_resource_state_t) workstationStateChangedCallbacks; +surf_callback(void, WorkstationActionPtr, e_surf_action_state_t, e_surf_action_state_t) workstationActionStateChangedCallbacks; + +void workstation_parse_init(sg_platf_host_cbarg_t host) +{ + surf_workstation_model->createWorkstation(host->id); +} + +void workstation_add_traces(){ + surf_workstation_model->addTraces(); +} /********* * Model * @@ -110,8 +122,9 @@ Workstation::~Workstation(){ } void Workstation::setState(e_surf_resource_state_t state){ + e_surf_resource_state_t old = Resource::getState(); Resource::setState(state); - surf_callback_emit(workstationStateChangedCallbacks, this); + surf_callback_emit(workstationStateChangedCallbacks, this, old, state); } int Workstation::getCore(){ @@ -194,7 +207,7 @@ xbt_dynar_t Workstation::getAttachedStorageList() if(xbt_lib_get_level(xbt_lib_get_elm_or_null(storage_lib, key), SURF_STORAGE_LEVEL) != NULL) { StoragePtr storage = static_cast(xbt_lib_get_level(xbt_lib_get_elm_or_null(storage_lib, key), SURF_STORAGE_LEVEL)); if(!strcmp((const char*)storage->p_attach,this->getName())){ - xbt_dynar_push_as(result, void *,(void *)static_cast(storage)->getName()); + xbt_dynar_push_as(result, void *, (void*)storage->getName()); } } } @@ -238,6 +251,7 @@ ActionPtr Workstation::open(const char* fullpath) { else xbt_die("Can't find mount point for '%s' on '%s'", fullpath, getName()); + XBT_DEBUG("OPEN %s on disk '%s'",fd->name, st->getName()); ActionPtr action = st->open((const char*)mount_name, (const char*)path); free((char*)path); free((char*)mount_name); @@ -246,26 +260,26 @@ ActionPtr Workstation::open(const char* fullpath) { ActionPtr Workstation::close(surf_file_t fd) { StoragePtr st = findStorageOnMountList(fd->mount); - XBT_DEBUG("CLOSE on disk '%s'",st->getName()); + XBT_DEBUG("CLOSE %s on disk '%s'",fd->name, st->getName()); return st->close(fd); } ActionPtr Workstation::read(surf_file_t fd, sg_size_t size) { StoragePtr st = findStorageOnMountList(fd->mount); - XBT_DEBUG("READ on disk '%s'",st->getName()); + XBT_DEBUG("READ %s on disk '%s'",fd->name, st->getName()); return st->read(fd, size); } ActionPtr Workstation::write(surf_file_t fd, sg_size_t size) { StoragePtr st = findStorageOnMountList(fd->mount); - XBT_DEBUG("WRITE on disk '%s'",st->getName()); + XBT_DEBUG("WRITE %s on disk '%s'",fd->name, st->getName()); return st->write(fd, size); } int Workstation::unlink(surf_file_t fd) { if (!fd){ XBT_WARN("No such file descriptor. Impossible to unlink"); - return 0; + return -1; } else { StoragePtr st = findStorageOnMountList(fd->mount); @@ -273,28 +287,22 @@ int Workstation::unlink(surf_file_t fd) { if (!xbt_dict_get_or_null(st->p_content, fd->name)){ XBT_WARN("File %s is not on disk %s. Impossible to unlink", fd->name, st->getName()); - return 0; + return -1; } else { - XBT_DEBUG("UNLINK on disk '%s'",st->getName()); + XBT_DEBUG("UNLINK %s on disk '%s'",fd->name, st->getName()); st->m_usedSize -= fd->size; // Remove the file from storage xbt_dict_remove(st->p_content, fd->name); - free(fd->name); - free(fd->mount); + xbt_free(fd->name); + xbt_free(fd->mount); xbt_free(fd); - return 1; + return 0; } } } -ActionPtr Workstation::ls(const char* mount, const char *path){ - XBT_DEBUG("LS on mount '%s' and file '%s'", mount, path); - StoragePtr st = findStorageOnMountList(mount); - return st->ls(path); -} - sg_size_t Workstation::getSize(surf_file_t fd){ return fd->size; } @@ -318,131 +326,51 @@ sg_size_t Workstation::fileTell(surf_file_t fd){ return fd->current_position; } -int Workstation::fileSeek(surf_file_t fd, sg_size_t offset, int origin){ +int Workstation::fileSeek(surf_file_t fd, sg_offset_t offset, int origin){ switch (origin) { case SEEK_SET: - fd->current_position = 0; - return MSG_OK; + fd->current_position = offset; + return 0; case SEEK_CUR: - if(offset > fd->size) - offset = fd->size; - fd->current_position = offset; - return MSG_OK; + fd->current_position += offset; + return 0; case SEEK_END: - fd->current_position = fd->size; - return MSG_OK; + fd->current_position = fd->size + offset; + return 0; default: - return MSG_TASK_CANCELED; + return -1; } } int Workstation::fileMove(surf_file_t fd, const char* fullpath){ - /* Check if the new full path is on the same mount point */ - if(!strncmp((const char*)fd->mount, fullpath, strlen(fd->mount))) - { + if(!strncmp((const char*)fd->mount, fullpath, strlen(fd->mount))) { sg_size_t *psize, *new_psize; - psize = (sg_size_t*) xbt_dict_get_or_null(findStorageOnMountList(fd->mount)->p_content,fd->name); + psize = (sg_size_t*) + xbt_dict_get_or_null(findStorageOnMountList(fd->mount)->p_content, + fd->name); new_psize = xbt_new(sg_size_t, 1); *new_psize = *psize; if (psize){// src file exists - xbt_dict_remove(findStorageOnMountList(fd->mount)->p_content, fd->name); - - char *path = (char *) xbt_malloc ((strlen(fullpath)-strlen(fd->mount)+1));; - strncpy(path, fullpath+strlen(fd->mount), strlen(fullpath)-strlen(fd->mount)+1); - xbt_dict_set(findStorageOnMountList(fd->mount)->p_content, path, new_psize,NULL); - XBT_DEBUG("Move file from %s to %s, size '%llu'",fd->name, fullpath, *psize); - free(path); - return MSG_OK; - } - else - XBT_WARN("File %s doesn't exist", fd->name); - return MSG_TASK_CANCELED; + xbt_dict_remove(findStorageOnMountList(fd->mount)->p_content, fd->name); + char *path = (char *) xbt_malloc ((strlen(fullpath)-strlen(fd->mount)+1)); + strncpy(path, fullpath+strlen(fd->mount), + strlen(fullpath)-strlen(fd->mount)+1); + xbt_dict_set(findStorageOnMountList(fd->mount)->p_content, path, + new_psize,NULL); + XBT_DEBUG("Move file from %s to %s, size '%llu'",fd->name, fullpath, *psize); + free(path); + return 0; + } else { + XBT_WARN("File %s doesn't exist", fd->name); + return -1; } - else - { - XBT_WARN("New full path %s is not on the same mount point: %s. Action has been canceled.", fullpath, fd->mount); - return MSG_TASK_CANCELED; - } -} - -int Workstation::fileRcopy(surf_file_t fd, surf_resource_t host_dest, const char* fullpath){ - - XBT_INFO("FILE %s WKS %s FULLPATH %s",fd->name, host_dest->key, fullpath); - - /* Find the host src where the file is located */ - StoragePtr storage = findStorageOnMountList(fd->mount); - const char* host_name_src = (const char*)storage->p_attach; - - /* Find the host dest where the file will be stored */ - s_mount_t mnt; - unsigned int cursor; - StoragePtr storage_dest = NULL; - const char* host_name_dest; - char *file_mount_name = NULL; - size_t longest_prefix_length = 0; - xbt_dynar_foreach(((WorkstationPtr)host_dest)->p_storage,cursor,mnt) - { - file_mount_name = (char *) xbt_malloc ((strlen(mnt.name)+1)); - strncpy(file_mount_name,fullpath,strlen(mnt.name)+1); - file_mount_name[strlen(mnt.name)] = '\0'; - - if(!strcmp(file_mount_name,mnt.name) && strlen(mnt.name)>longest_prefix_length) - {/* The current mount name is found in the full path and is bigger than the previous*/ - longest_prefix_length = strlen(mnt.name); - storage_dest = static_cast(mnt.storage); - } - free(file_mount_name); - } - if(longest_prefix_length>0) - { /* Mount point found */ - host_name_dest = storage_dest->p_attach; - } - else - { - XBT_WARN("Can't find mount point for '%s' on destination host '%s'", fullpath, host_dest->key); - return MSG_TASK_CANCELED; + } else { + XBT_WARN("New full path %s is not on the same mount point: %s. Action has been canceled.", + fullpath, fd->mount); + return -1; } - XBT_INFO("SRC %s DEST %s", host_name_src, host_name_dest); - return MSG_OK; - - -// /* Check that file to copy is local to the src workstation (storage is attached to src workstation) */ -// StoragePtr storage = findStorageOnMountList(fd->mount); -// if(!strcmp((const char*)storage->p_attach, this->getName())) -// { -// /* Check that there is a route between src and dest workstations */ -// xbt_dynar_t route = NULL; -// routing_get_route_and_latency(this->p_netElm, ((WorkstationPtr)host_dest)->p_netElm, &route, NULL); -// if(route){ -// -// ATTENTION DISCUSSION AVEC FRED ! -// return MSG_OK; -// } -// else -// { -// XBT_WARN("There is no route between %s and %s. Action has been canceled", this->getName(), host_dest->key); -// return MSG_TASK_CANCELED; -// } -// } -// else -// { -// XBT_WARN("File %s is not local to %s but to %s. Action has been canceled", fd->name,this->getName(), storage->p_attach); -// return MSG_TASK_CANCELED; -// } -} - -sg_size_t Workstation::getFreeSize(const char* name) -{ - StoragePtr st = findStorageOnMountList(name); - return st->m_size - st->m_usedSize; -} - -sg_size_t Workstation::getUsedSize(const char* name) -{ - StoragePtr st = findStorageOnMountList(name); - return st->m_usedSize; } xbt_dynar_t Workstation::getVms() @@ -478,6 +406,7 @@ void Workstation::setParams(ws_params_t params) **********/ void WorkstationAction::setState(e_surf_action_state_t state){ + e_surf_action_state_t old = getState(); Action::setState(state); - surf_callback_emit(workstationActionStateChangedCallbacks, this); + surf_callback_emit(workstationActionStateChangedCallbacks, this, old, state); }