-/* Copyright (c) 2013-2015. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2013-2017. 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 "storage_n11.hpp"
-#include "simgrid/s4u/engine.hpp"
+#include "simgrid/s4u/Engine.hpp"
#include "src/kernel/routing/NetPoint.hpp"
-#include "surf_private.h"
#include <math.h> /*ceil*/
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_storage);
/*************
* CallBacks *
*************/
-
-static inline void routing_storage_type_free(void *r)
-{
- storage_type_t stype = (storage_type_t) r;
- free(stype->model);
- free(stype->type_id);
- free(stype->content);
- free(stype->content_type);
- xbt_dict_free(&(stype->properties));
- xbt_dict_free(&(stype->model_properties));
- free(stype);
-}
+extern std::map<std::string, storage_type_t> storage_types;
static void check_disk_attachment()
{
instr_routing_define_callbacks();
ROUTING_STORAGE_LEVEL = xbt_lib_add_level(storage_lib, xbt_free_f);
- ROUTING_STORAGE_TYPE_LEVEL = xbt_lib_add_level(storage_type_lib, routing_storage_type_free);
SURF_STORAGE_LEVEL = xbt_lib_add_level(storage_lib, [](void *self) {
delete static_cast<simgrid::surf::Storage*>(self);
});
xbt_assert(!surf_storage_resource_priv(surf_storage_resource_by_name(id)),
"Storage '%s' declared several times in the platform file", id);
- storage_type_t storage_type = (storage_type_t) xbt_lib_get_or_null(storage_type_lib, type_id,ROUTING_STORAGE_TYPE_LEVEL);
+ storage_type_t storage_type = storage_types.at(type_id);
- double Bread = surf_parse_get_bandwidth((char*)xbt_dict_get(storage_type->model_properties, "Bread"),
- "property Bread, storage",type_id);
- double Bwrite = surf_parse_get_bandwidth((char*)xbt_dict_get(storage_type->model_properties, "Bwrite"),
- "property Bwrite, storage",type_id);
- double Bconnection = surf_parse_get_bandwidth((char*)xbt_dict_get(storage_type->model_properties, "Bconnection"),
- "property Bconnection, storage",type_id);
+ double Bread =
+ surf_parse_get_bandwidth(storage_type->model_properties->at("Bread").c_str(), "property Bread, storage", type_id);
+ double Bwrite = surf_parse_get_bandwidth(storage_type->model_properties->at("Bwrite").c_str(),
+ "property Bwrite, storage", type_id);
+ double Bconnection = surf_parse_get_bandwidth(storage_type->model_properties->at("Bconnection").c_str(),
+ "property Bconnection, storage", type_id);
Storage* storage = new StorageN11(this, id, maxminSystem_, Bread, Bwrite, Bconnection, type_id, (char*)content_name,
content_type, storage_type->size, (char*)attach);
// which becomes the new file size
action->file_->size = action->file_->current_position;
- sg_size_t *psize = xbt_new(sg_size_t,1);
- *psize = action->file_->size;
- xbt_dict_t content_dict = action->storage_->content_;
- xbt_dict_set(content_dict, action->file_->name, psize, nullptr);
+ sg_size_t* psize = new sg_size_t;
+ *psize = action->file_->size;
+ std::map<std::string, sg_size_t*>* content_dict = action->storage_->content_;
+ auto entry = content_dict->find(action->file_->name);
+ delete entry->second;
+ entry->second = psize;
}
action->updateRemains(lmm_variable_getvalue(action->getVariable()) * delta);
XBT_DEBUG("\tOpen file '%s'",path);
sg_size_t size;
- sg_size_t* psize = (sg_size_t*)xbt_dict_get_or_null(content_, path);
+ sg_size_t* psize = nullptr;
// if file does not exist create an empty file
- if(psize)
- size = *psize;
+ if (content_->find(path) != content_->end())
+ size = *(content_->at(path));
else {
- psize = xbt_new(sg_size_t,1);
- size = 0;
+ psize = new sg_size_t;
+ size = 0;
*psize = size;
- xbt_dict_set(content_, path, psize, nullptr);
+ content_->insert({path, psize});
XBT_DEBUG("File '%s' was not found, file created.",path);
}
surf_file_t file = xbt_new0(s_surf_file_t,1);