void HostImpl::getAttachedStorageList(std::vector<const char*>* storages)
{
- xbt_lib_cursor_t cursor;
- char* key;
- void** data;
- 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) != nullptr) {
- simgrid::surf::StorageImpl* storage = static_cast<simgrid::surf::StorageImpl*>(
- xbt_lib_get_level(xbt_lib_get_elm_or_null(storage_lib, key), SURF_STORAGE_LEVEL));
- if (not strcmp(static_cast<const char*>(storage->attach_), piface_->cname())) {
- storages->push_back(storage->cname());
- }
- }
- }
+ for (auto s : storage_)
+ if (not strcmp(static_cast<const char*>(s.second->attach_), piface_->cname()))
+ storages->push_back(s.second->piface_.name());
}
Action* HostImpl::open(const char* fullpath)
#include <boost/algorithm/string/join.hpp>
#include <boost/algorithm/string/split.hpp>
#include <fstream>
-#include <xbt/lib.h>
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_storage, surf, "Logging specific to the SURF storage module");
-xbt_lib_t storage_lib;
-int SURF_STORAGE_LEVEL = -1;
simgrid::surf::StorageModel* surf_storage_model = nullptr;
namespace simgrid {
static void check_disk_attachment()
{
- xbt_lib_cursor_t cursor;
- char* key;
- void** data;
- 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) != nullptr) {
- simgrid::surf::StorageImpl* storage =
- static_cast<simgrid::surf::StorageImpl*>(xbt_lib_get_or_null(storage_lib, key, SURF_STORAGE_LEVEL));
- simgrid::kernel::routing::NetPoint* host_elm = sg_netpoint_by_name_or_null(storage->attach_);
- if (not host_elm)
- surf_parse_error("Unable to attach storage %s: host %s does not exist.", storage->cname(), storage->attach_);
- }
+ for (auto s : *simgrid::surf::StorageImpl::storagesMap()) {
+ simgrid::kernel::routing::NetPoint* host_elm = sg_netpoint_by_name_or_null(s.second->attach_);
+ if (not host_elm)
+ surf_parse_error("Unable to attach storage %s: host %s does not exist.", s.second->cname(), s.second->attach_);
}
}
{
simgrid::s4u::onPlatformCreated.connect(check_disk_attachment);
instr_routing_define_callbacks();
-
- SURF_STORAGE_LEVEL =
- xbt_lib_add_level(storage_lib, [](void* self) { delete static_cast<simgrid::surf::StorageImpl*>(self); });
}
/*********
StorageImpl* storage = new StorageN11(this, id, maxminSystem_, Bread, Bwrite, type_id, (char*)content_name,
storage_type->size, (char*)attach);
- xbt_lib_set(storage_lib, id, SURF_STORAGE_LEVEL, storage);
storageCreatedCallbacks(storage);
XBT_DEBUG("SURF storage create resource\n\t\tid '%s'\n\t\ttype '%s'\n\t\tBread '%f'\n", id, type_id, Bread);
* under the terms of the license (GNU LGPL) which comes with this package. */
#include <xbt/base.h>
+#include <xbt/lib.h>
#include "StorageImpl.hpp"
XBT_DEBUG("Create all Libs");
USER_HOST_LEVEL = simgrid::s4u::Host::extension_create(nullptr);
- storage_lib = xbt_lib_new();
watched_hosts_lib = xbt_dict_new_homogeneous(nullptr);
- XBT_DEBUG("Add SURF levels");
- SURF_STORAGE_LEVEL = xbt_lib_add_level(storage_lib,surf_storage_free);
-
xbt_init(argc, argv);
if (not all_existing_models)
all_existing_models = new std::vector<simgrid::surf::Model*>();
TRACE_end(); /* Just in case it was not called by the upper layer (or there is no upper layer) */
sg_host_exit();
- xbt_lib_free(&storage_lib);
sg_link_exit();
xbt_dict_free(&watched_hosts_lib);
for (auto e : storage_types) {