X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/bc5903068a99bfc50a9f7a479cc3305326f774e9..73662a7c0b0d1e462f2b99322183295be3a24a5a:/src/surf/workstation_interface.cpp diff --git a/src/surf/workstation_interface.cpp b/src/surf/workstation_interface.cpp index d43fd4ab1c..06a52f62aa 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,58 @@ 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 pos = 0; + char *path, *mount_name; + + 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); + char *file_mount_name = NULL; + file_mount_name = xbt_new(char,strlen(mnt.name)+1); + strncpy(file_mount_name,fullpath,strlen(mnt.name)); + file_mount_name[strlen(mnt.name)] = '\0'; + + if(!strcmp(file_mount_name,mnt.name) && strlen(mnt.name)>pos) + {/* The current mount name is found in the full path and is bigger than the previous*/ + pos = strlen(mnt.name); + mount_name = mnt.name; + st = static_cast(mnt.storage); + } + xbt_free(file_mount_name); + } + if(pos>0) + { /* Mount point found, deduce path + file name from full path (full path = mount name + path + file name)*/ + path = xbt_new(char, strlen(fullpath)-strlen(mount_name)); + strncpy(path, fullpath+pos, strlen(fullpath)-strlen(mount_name)+1); + XBT_INFO("TROUVE"); + } + else + xbt_die("Can't find mount point for '%s' on '%s'", fullpath, getName()); + + return st->open(mount_name, path); } ActionPtr Workstation::close(surf_file_t fd) { @@ -301,20 +347,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 +362,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; } /**********