/* 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 "src/surf/HostImpl.hpp"
#include "src/plugins/vm/VirtualMachineImpl.hpp"
#include <string>
}
/** @brief use destroy() instead of this destructor */
-HostImpl::~HostImpl() = default;
+HostImpl::~HostImpl()
+{
+ for (auto mnt : storage_)
+ xbt_free(mnt.name);
+}
simgrid::surf::Storage* HostImpl::findStorageOnMountList(const char* mount)
{
simgrid::surf::Storage* st = nullptr;
- s_mount_t mnt;
- unsigned int cursor;
XBT_DEBUG("Search for storage name '%s' on '%s'", mount, piface_->cname());
- xbt_dynar_foreach (storage_, cursor, mnt) {
+ for (auto mnt : storage_) {
XBT_DEBUG("See '%s'", mnt.name);
if (!strcmp(mount, mnt.name)) {
st = static_cast<simgrid::surf::Storage*>(mnt.storage);
xbt_dict_t HostImpl::getMountedStorageList()
{
- s_mount_t mnt;
- unsigned int i;
xbt_dict_t storage_list = xbt_dict_new_homogeneous(nullptr);
char* storage_name = nullptr;
- xbt_dynar_foreach (storage_, i, mnt) {
+ for (auto mnt : storage_) {
storage_name = (char*)static_cast<simgrid::surf::Storage*>(mnt.storage)->cname();
xbt_dict_set(storage_list, mnt.name, storage_name, nullptr);
}
return storage_list;
}
-xbt_dynar_t HostImpl::getAttachedStorageList()
+void HostImpl::getAttachedStorageList(std::vector<const char*>* storages)
{
xbt_lib_cursor_t cursor;
char* key;
void** data;
- 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) != 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(static_cast<const char*>(storage->attach_), piface_->cname())) {
- xbt_dynar_push_as(result, void*, (void*)storage->cname());
+ storages->push_back(storage->cname());
}
}
}
- return result;
}
Action* HostImpl::open(const char* fullpath)
{
simgrid::surf::Storage* st = nullptr;
- s_mount_t mnt;
- unsigned int cursor;
size_t longest_prefix_length = 0;
std::string path;
std::string mount_name;
XBT_DEBUG("Search for storage name for '%s' on '%s'", fullpath, piface_->cname());
- xbt_dynar_foreach (storage_, cursor, mnt) {
+ for (auto mnt : storage_) {
XBT_DEBUG("See '%s'", mnt.name);
std::string file_mount_name = std::string(fullpath).substr(0, strlen(mnt.name));