-/* 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. */
#include "network_interface.hpp"
#include "virtual_machine.hpp"
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_host, surf,
- "Logging specific to the SURF host module");
+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 *
/*********
* 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);
/* FIXME: we should use lmm_update_variable_weight() ? */
/* FIXME: If we assign 1.05 and 0.05, the system makes apparently wrong values. */
- ws_vm->p_action->setPriority(1);
+ ws_vm->action_->setPriority(1);
} else {
/* no task exits on this VM */
XBT_DEBUG("set the weight of the dummy CPU action on PM to 0");
- ws_vm->p_action->setPriority(0);
+ ws_vm->action_->setPriority(0);
}
}
}
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]);
value = cost_or_zero(bytes_amount, i);
}
}
- if (nb == 1){
- action = surf_network_model->communicate(host_list[0]->pimpl_netcard,
- host_list[1]->pimpl_netcard,
- value, rate);
+ if (nb == 1) {
+ action = surf_network_model->communicate(host_list[0]->pimpl_netcard, 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;
/************
* Resource *
************/
-
-
-void HostImpl::classInit()
-{
- if (!EXTENSION_ID.valid()) {
- EXTENSION_ID = simgrid::s4u::Host::extension_create<simgrid::surf::HostImpl>();
- }
-}
-
HostImpl::HostImpl(simgrid::surf::HostModel *model, const char *name, xbt_dynar_t storage, Cpu *cpu)
: Resource(model, name)
, PropertyHolder(nullptr)
, p_storage(storage), p_cpu(cpu)
{
+ if (!EXTENSION_ID.valid())
+ EXTENSION_ID = simgrid::s4u::Host::extension_create<simgrid::surf::HostImpl>();
p_params.ramsize = 0;
}
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 {
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;
XBT_DEBUG("Search for storage name '%s' on '%s'", mount, getName());
- xbt_dynar_foreach(p_storage,cursor,mnt)
- {
+ xbt_dynar_foreach(p_storage,cursor,mnt){
XBT_DEBUG("See '%s'",mnt.name);
if(!strcmp(mount,mnt.name)){
st = static_cast<simgrid::surf::Storage*>(mnt.storage);
break;
}
}
- if(!st) xbt_die("Can't find mount '%s' for '%s'", mount, getName());
+ if(!st)
+ xbt_die("Can't find mount '%s' for '%s'", mount, getName());
return st;
}
{
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<simgrid::surf::Storage*>(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;
}
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<simgrid::surf::Storage*>(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())){
+ if(!strcmp((const char*)storage->attach_,this->getName())){
xbt_dynar_push_as(result, void *, (void*)storage->getName());
}
}
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)
simgrid::surf::Storage *st = findStorageOnMountList(fd->mount);
/* Check if the file is on this storage */
- if (!xbt_dict_get_or_null(st->p_content, fd->name)){
+ if (!xbt_dict_get_or_null(st->content_, fd->name)){
XBT_WARN("File %s is not on disk %s. Impossible to unlink", fd->name,
st->getName());
return -1;
} else {
XBT_DEBUG("UNLINK %s on disk '%s'",fd->name, st->getName());
- st->m_usedSize -= fd->size;
+ st->usedSize_ -= fd->size;
// Remove the file from storage
- xbt_dict_remove(st->p_content, fd->name);
+ xbt_dict_remove(st->content_, fd->name);
xbt_free(fd->name);
xbt_free(fd->mount);
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());
- xbt_dynar_push_as(info, void *, st->p_typeId);
- xbt_dynar_push_as(info, void *, st->p_contentType);
+ xbt_dynar_push_as(info, void *, st->typeId_);
+ xbt_dynar_push_as(info, void *, st->contentType_);
return info;
}
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,
+ xbt_dict_get_or_null(findStorageOnMountList(fd->mount)->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);
+ xbt_dict_remove(findStorageOnMountList(fd->mount)->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_dict_set(findStorageOnMountList(fd->mount)->content_, path,
+ new_psize,nullptr);
XBT_DEBUG("Move file from %s to %s, size '%llu'",fd->name, fullpath, *psize);
free(path);
return 0;
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 =
iter != simgrid::surf::VMModel::ws_vms.end(); ++iter) {
simgrid::surf::VirtualMachine *ws_vm = &*iter;
- if (this == ws_vm->p_hostPM->extension(simgrid::surf::HostImpl::EXTENSION_ID))
+ if (this == ws_vm->getPm()->extension(simgrid::surf::HostImpl::EXTENSION_ID))
xbt_dynar_push(dyn, &ws_vm);
}
p_params = *params;
}
-}
-}
+}}
