X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/bc5903068a99bfc50a9f7a479cc3305326f774e9..fa45ee4a5c6eb99a3d7bb445875d8035e492bdc7:/src/surf/workstation_interface.cpp diff --git a/src/surf/workstation_interface.cpp b/src/surf/workstation_interface.cpp index d43fd4ab1c..9783d2a69a 100644 --- a/src/surf/workstation_interface.cpp +++ b/src/surf/workstation_interface.cpp @@ -1,3 +1,9 @@ +/* Copyright (c) 2013-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 "workstation_interface.hpp" #include "vm_workstation_interface.hpp" #include "cpu_cas01.hpp" @@ -40,25 +46,15 @@ WorkstationModel::~WorkstationModel() { * not get any CPU share in the PM layer. */ void WorkstationModel::adjustWeightOfDummyCpuActions() { - /* iterate for all hosts including virtual machines */ - xbt_lib_cursor_t cursor; - char *key; - void **ind_host; + /* iterate for all virtual machines */ + for (WorkstationVMModel::vm_list_t::iterator iter = + WorkstationVMModel::ws_vms.begin(); + iter != WorkstationVMModel::ws_vms.end(); ++iter) { - xbt_lib_foreach(host_lib, cursor, key, ind_host) { - WorkstationPtr ws = static_cast(ind_host[SURF_WKS_LEVEL]); - CpuCas01Ptr cpu_cas01 = static_cast(ind_host[SURF_CPU_LEVEL]); - - if (!ws) - continue; - /* skip if it is not a virtual machine */ - if (ws->getModel() != static_cast(surf_vm_workstation_model)) - continue; + WorkstationVMPtr ws_vm = &*iter; + CpuCas01Ptr cpu_cas01 = static_cast(ws_vm->p_cpu); xbt_assert(cpu_cas01, "cpu-less workstation"); - /* It is a virtual machine, so we can cast it to workstation_VM2013_t */ - WorkstationVMPtr ws_vm = static_cast(ws); - int is_active = lmm_constraint_used(cpu_cas01->getModel()->getMaxminSystem(), cpu_cas01->getConstraint()); // int is_active_old = constraint_is_active(cpu_cas01); @@ -96,6 +92,7 @@ Workstation::Workstation(ModelPtr model, const char *name, xbt_dict_t props, : Resource(model, name, props) , p_storage(storage), p_netElm(netElm), p_cpu(cpu) { + p_params.ramsize = 0; surf_callback_emit(workstationCreatedCallbacks, this); } @@ -104,6 +101,7 @@ Workstation::Workstation(ModelPtr model, const char *name, xbt_dict_t props, lmm : Resource(model, name, props, constraint) , p_storage(storage), p_netElm(netElm), p_cpu(cpu) { + p_params.ramsize = 0; surf_callback_emit(workstationCreatedCallbacks, this); } @@ -172,7 +170,7 @@ StoragePtr Workstation::findStorageOnMountList(const char* mount) return st; } -xbt_dict_t Workstation::getStorageList() +xbt_dict_t Workstation::getMountedStorageList() { s_mount_t mnt; unsigned int i; @@ -186,10 +184,64 @@ xbt_dict_t Workstation::getStorageList() return storage_list; } -ActionPtr Workstation::open(const char* mount, const char* path) { - StoragePtr st = findStorageOnMountList(mount); - XBT_DEBUG("OPEN on disk '%s'", st->getName()); - return st->open(mount, path); +xbt_dynar_t Workstation::getAttachedStorageList() +{ + xbt_lib_cursor_t cursor; + char *key; + void **data; + xbt_dynar_t result = xbt_dynar_new(sizeof(void*), NULL); + xbt_lib_foreach(storage_lib, cursor, key, data) { + 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()); + } + } + } + return result; +} + +ActionPtr Workstation::open(const char* fullpath) { + + StoragePtr st = NULL; + s_mount_t mnt; + unsigned int cursor; + size_t longest_prefix_length = 0; + char *path = NULL; + char *file_mount_name = NULL; + char *mount_name = NULL; + + XBT_DEBUG("Search for storage name for '%s' on '%s'", fullpath, getName()); + xbt_dynar_foreach(p_storage,cursor,mnt) + { + XBT_DEBUG("See '%s'",mnt.name); + 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); + st = static_cast(mnt.storage); + } + free(file_mount_name); + } + if(longest_prefix_length>0) + { /* Mount point found, split fullpath into mount_name and path+filename*/ + path = (char *) xbt_malloc ((strlen(fullpath)-longest_prefix_length+1)); + mount_name = (char *) xbt_malloc ((longest_prefix_length+1)); + strncpy(mount_name, fullpath, longest_prefix_length+1); + strncpy(path, fullpath+longest_prefix_length, strlen(fullpath)-longest_prefix_length+1); + path[strlen(fullpath)-longest_prefix_length] = '\0'; + mount_name[longest_prefix_length] = '\0'; + } + else + xbt_die("Can't find mount point for '%s' on '%s'", fullpath, getName()); + + ActionPtr action = st->open((const char*)mount_name, (const char*)path); + free((char*)path); + free((char*)mount_name); + return action; } ActionPtr Workstation::close(surf_file_t fd) { @@ -215,7 +267,7 @@ int Workstation::unlink(surf_file_t fd) { XBT_WARN("No such file descriptor. Impossible to unlink"); return 0; } else { -// XBT_INFO("%s %zu", fd->storage, fd->size); + StoragePtr st = findStorageOnMountList(fd->mount); /* Check if the file is on this storage */ if (!xbt_dict_get_or_null(st->p_content, fd->name)){ @@ -285,6 +337,102 @@ int Workstation::fileSeek(surf_file_t fd, sg_size_t offset, int origin){ } } +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))) + { + sg_size_t *psize, *new_psize; + 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; + } + 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; + } + 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); @@ -301,20 +449,12 @@ xbt_dynar_t Workstation::getVms() { xbt_dynar_t dyn = xbt_dynar_new(sizeof(smx_host_t), NULL); - /* iterate for all hosts including virtual machines */ - xbt_lib_cursor_t cursor; - char *key; - void **ind_host; - xbt_lib_foreach(host_lib, cursor, key, ind_host) { - WorkstationPtr ws = static_cast(ind_host[SURF_WKS_LEVEL]); - if (!ws) - continue; - /* skip if it is not a virtual machine */ - if (ws->getModel() != static_cast(surf_vm_workstation_model)) - continue; - - /* It is a virtual machine, so we can cast it to workstation_VM2013_t */ - WorkstationVMPtr ws_vm = static_cast(ws); + /* iterate for all virtual machines */ + for (WorkstationVMModel::vm_list_t::iterator iter = + WorkstationVMModel::ws_vms.begin(); + iter != WorkstationVMModel::ws_vms.end(); ++iter) { + + WorkstationVMPtr ws_vm = &*iter; if (this == ws_vm-> p_subWs) xbt_dynar_push(dyn, &ws_vm->p_subWs); } @@ -324,13 +464,13 @@ xbt_dynar_t Workstation::getVms() void Workstation::getParams(ws_params_t params) { - memcpy(params, &p_params, sizeof(s_ws_params_t)); + *params = p_params; } void Workstation::setParams(ws_params_t params) { /* may check something here. */ - memcpy(&p_params, params, sizeof(s_ws_params_t)); + p_params = *params; } /**********