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, xbt_dict_t props){
+HostImpl *HostModel::createHost(const char *name, 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, props, storageList, cpu);
+ HostImpl *host = new simgrid::surf::HostImpl(surf_host_model, name, storageList, cpu);
XBT_DEBUG("Create host %s with %ld mounted disks", name, xbt_dynar_length(host->p_storage));
return host;
}
/* 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);
}
}
}
double *bytes_amount,
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]);
THROW_UNIMPLEMENTED; /* This model does not implement parallel tasks for more than 2 hosts */
#undef cost_or_zero
xbt_free(host_list);
+ if(action==nullptr)
+ xbt_die("This model doesn't support tasks with 0 comm and 0 computation, please use ptak_L07 instead");
return action;
}
}
}
-HostImpl::HostImpl(simgrid::surf::HostModel *model, const char *name, xbt_dict_t props,
- xbt_dynar_t storage, Cpu *cpu)
+HostImpl::HostImpl(simgrid::surf::HostModel *model, const char *name, xbt_dynar_t storage, Cpu *cpu)
: Resource(model, name)
- , PropertyHolder(props)
+ , PropertyHolder(nullptr)
, p_storage(storage), p_cpu(cpu)
{
p_params.ramsize = 0;
}
-HostImpl::HostImpl(simgrid::surf::HostModel *model, const char *name, xbt_dict_t props, lmm_constraint_t constraint,
+HostImpl::HostImpl(simgrid::surf::HostModel *model, const char *name, lmm_constraint_t constraint,
xbt_dynar_t storage, Cpu *cpu)
: Resource(model, name, constraint)
- , PropertyHolder(props)
+ , PropertyHolder(nullptr)
, p_storage(storage), p_cpu(cpu)
{
p_params.ramsize = 0;
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;
{
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())){
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);
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());
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;
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);
}
