X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4b597ac2a550a08c142293e59e4c4d2bdad8ff5d..5a00610e05eab122e23f56b589d5bb240e6ceda7:/src/surf/HostImpl.cpp diff --git a/src/surf/HostImpl.cpp b/src/surf/HostImpl.cpp index 63995901bc..c7e5ec9a0d 100644 --- a/src/surf/HostImpl.cpp +++ b/src/surf/HostImpl.cpp @@ -1,5 +1,4 @@ -/* Copyright (c) 2013-2015. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2013-2016. 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. */ @@ -17,7 +16,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_host, surf, "Logging specific to the SURF host module"); -simgrid::surf::HostModel *surf_host_model = NULL; +simgrid::surf::HostModel *surf_host_model = nullptr; /************* * Callbacks * @@ -31,7 +30,7 @@ simgrid::xbt::Extension HostImpl::EXTENSION_ID; /********* * Model * *********/ -HostImpl *HostModel::createHost(const char *name, NetCard *netElm, Cpu *cpu){ +HostImpl *HostModel::createHost(const char *name, kernel::routing::NetCard *netElm, Cpu *cpu){ xbt_dynar_t storageList = (xbt_dynar_t)xbt_lib_get_or_null(storage_lib, name, ROUTING_STORAGE_HOST_LEVEL); HostImpl *host = new simgrid::surf::HostImpl(surf_host_model, name, storageList, cpu); @@ -76,9 +75,10 @@ Action *HostModel::executeParallelTask(int host_nb, sg_host_t *host_list, double *flops_amount, double *bytes_amount, - double rate){ + double rate) +{ #define cost_or_zero(array,pos) ((array)?(array)[pos]:0.0) - Action *action =NULL; + Action *action =nullptr; if ((host_nb == 1) && (cost_or_zero(bytes_amount, 0) == 0.0)){ action = host_list[0]->pimpl_cpu->execution_start(flops_amount[0]); @@ -99,13 +99,17 @@ Action *HostModel::executeParallelTask(int host_nb, value = cost_or_zero(bytes_amount, i); } } - if (nb == 1){ + if (nb == 1) { action = surf_network_model->communicate(host_list[0]->pimpl_netcard, - host_list[1]->pimpl_netcard, - value, rate); + host_list[1]->pimpl_netcard, + value, rate); + } else if (nb == 0) { + xbt_die("Cannot have a communication with no flop to exchange in this model. You should consider using the ptask model"); + } else { + xbt_die("Cannot have a communication that is not a simple point-to-point in this model. You should consider using the ptask model"); } - } else - THROW_UNIMPLEMENTED; /* This model does not implement parallel tasks for more than 2 hosts */ + } else + xbt_die("This model only accepts one of the following. You should consider using the ptask model for the other cases.\n - execution with one host only and no communication\n - Self-comms with one host only\n - Communications with two hosts and no computation"); #undef cost_or_zero xbt_free(host_list); return action; @@ -147,10 +151,10 @@ HostImpl::~HostImpl() void HostImpl::attach(simgrid::s4u::Host* host) { - if (p_host != nullptr) + if (piface != nullptr) xbt_die("Already attached to host %s", host->name().c_str()); host->extension_set(this); - p_host = host; + piface = host; } bool HostImpl::isOn() const { @@ -162,19 +166,19 @@ bool HostImpl::isOff() const { void HostImpl::turnOn(){ if (isOff()) { p_cpu->turnOn(); - simgrid::s4u::Host::onStateChange(*this->p_host); + simgrid::s4u::Host::onStateChange(*this->piface); } } void HostImpl::turnOff(){ if (isOn()) { p_cpu->turnOff(); - simgrid::s4u::Host::onStateChange(*this->p_host); + simgrid::s4u::Host::onStateChange(*this->piface); } } simgrid::surf::Storage *HostImpl::findStorageOnMountList(const char* mount) { - simgrid::surf::Storage *st = NULL; + simgrid::surf::Storage *st = nullptr; s_mount_t mnt; unsigned int cursor; @@ -195,12 +199,12 @@ xbt_dict_t HostImpl::getMountedStorageList() { s_mount_t mnt; unsigned int i; - xbt_dict_t storage_list = xbt_dict_new_homogeneous(NULL); - char *storage_name = NULL; + xbt_dict_t storage_list = xbt_dict_new_homogeneous(nullptr); + char *storage_name = nullptr; xbt_dynar_foreach(p_storage,i,mnt){ storage_name = (char *)static_cast(mnt.storage)->getName(); - xbt_dict_set(storage_list,mnt.name,storage_name,NULL); + xbt_dict_set(storage_list,mnt.name,storage_name,nullptr); } return storage_list; } @@ -210,9 +214,9 @@ xbt_dynar_t HostImpl::getAttachedStorageList() xbt_lib_cursor_t cursor; char *key; void **data; - xbt_dynar_t result = xbt_dynar_new(sizeof(void*), NULL); + xbt_dynar_t result = xbt_dynar_new(sizeof(void*), nullptr); 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) { + if(xbt_lib_get_level(xbt_lib_get_elm_or_null(storage_lib, key), SURF_STORAGE_LEVEL) != nullptr) { simgrid::surf::Storage *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*)storage->getName()); @@ -224,13 +228,13 @@ xbt_dynar_t HostImpl::getAttachedStorageList() Action *HostImpl::open(const char* fullpath) { - simgrid::surf::Storage *st = NULL; + simgrid::surf::Storage *st = nullptr; 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; + char *path = nullptr; + char *file_mount_name = nullptr; + char *mount_name = nullptr; XBT_DEBUG("Search for storage name for '%s' on '%s'", fullpath, getName()); xbt_dynar_foreach(p_storage,cursor,mnt) @@ -320,7 +324,7 @@ xbt_dynar_t HostImpl::getInfo( surf_file_t fd) simgrid::surf::Storage *st = findStorageOnMountList(fd->mount); sg_size_t *psize = xbt_new(sg_size_t, 1); *psize = fd->size; - xbt_dynar_t info = xbt_dynar_new(sizeof(void*), NULL); + xbt_dynar_t info = xbt_dynar_new(sizeof(void*), nullptr); xbt_dynar_push_as(info, sg_size_t *, psize); xbt_dynar_push_as(info, void *, fd->mount); xbt_dynar_push_as(info, void *, (void *)st->getName()); @@ -366,7 +370,7 @@ int HostImpl::fileMove(surf_file_t fd, const char* fullpath){ strncpy(path, fullpath+strlen(fd->mount), strlen(fullpath)-strlen(fd->mount)+1); xbt_dict_set(findStorageOnMountList(fd->mount)->p_content, path, - new_psize,NULL); + new_psize,nullptr); XBT_DEBUG("Move file from %s to %s, size '%llu'",fd->name, fullpath, *psize); free(path); return 0; @@ -383,7 +387,7 @@ int HostImpl::fileMove(surf_file_t fd, const char* fullpath){ xbt_dynar_t HostImpl::getVms() { - xbt_dynar_t dyn = xbt_dynar_new(sizeof(simgrid::surf::VirtualMachine*), NULL); + xbt_dynar_t dyn = xbt_dynar_new(sizeof(simgrid::surf::VirtualMachine*), nullptr); /* iterate for all virtual machines */ for (simgrid::surf::VMModel::vm_list_t::iterator iter = @@ -409,5 +413,4 @@ void HostImpl::setParams(vm_params_t params) p_params = *params; } -} -} +}}