static void display_storage_properties(simgrid::s4u::Storage* storage)
{
- xbt_dict_cursor_t cursor = NULL;
- char* key;
- char* data;
xbt_dict_t props = storage->properties();
if (xbt_dict_length(props) > 0) {
XBT_INFO("\tProperties of mounted storage: %s", storage->name());
+
+ xbt_dict_cursor_t cursor = NULL;
+ char* key;
+ char* data;
xbt_dict_foreach (props, cursor, key, data)
XBT_INFO("\t\t'%s' -> '%s'", key, data);
} else {
static void display_storage_content(simgrid::s4u::Storage* storage)
{
XBT_INFO("Print the content of the storage element: %s", storage->name());
- xbt_dict_cursor_t cursor = NULL;
- char* file;
- sg_size_t* psize;
- xbt_dict_t content = storage->content();
- if (content) {
- xbt_dict_foreach (content, cursor, file, psize)
- XBT_INFO("\t%s size: %llu bytes", file, *psize);
+ std::map<std::string, sg_size_t*>* content = storage->content();
+ if (not content->empty()) {
+ for (auto entry : *content)
+ XBT_INFO("\t%s size: %llu bytes", entry.first.c_str(), *entry.second);
} else {
XBT_INFO("\tNo content.");
}
- xbt_dict_free(&content);
}
static void dump_storage_by_name(char* name)
XBT_INFO("*** GET/SET DATA for storage element: %s ***", storage_name);
simgrid::s4u::Storage& storage = simgrid::s4u::Storage::byName(storage_name);
- char* data = (char*)storage.userdata();
+ char* data = static_cast<char*>(storage.userdata());
XBT_INFO("Get data: '%s'", data);
storage.setUserdata(xbt_strdup("Some data"));
- data = (char*)storage.userdata();
+ data = static_cast<char*>(storage.userdata());
XBT_INFO("\tSet and get data: '%s'", data);
xbt_free(data);
}
-// static void dump_platform_storages(void){
-// unsigned int cursor;
-// xbt_dynar_t storages = MSG_storages_as_dynar();
-// msg_storage_t storage;
-// xbt_dynar_foreach(storages, cursor, storage){
-// XBT_INFO("Storage %s is attached to %s", MSG_storage_get_name(storage), MSG_storage_get_host(storage));
-// MSG_storage_set_property_value(storage, "other usage", xbt_strdup("gpfs"));
-// }
-// xbt_dynar_free(&storages);
-// Expected output in tesh file
-//> [ 1.207952] (server@alice) Storage Disk1 is attached to bob
-//> [ 1.207952] (server@alice) Storage Disk2 is attached to alice
-//> [ 1.207952] (server@alice) Storage Disk3 is attached to carl
-//> [ 1.207952] (server@alice) Storage Disk4 is attached to denise
-//}
+static void dump_platform_storages()
+{
+ std::unordered_map<std::string, simgrid::s4u::Storage*>* storages = simgrid::s4u::Storage().allStorages();
+
+ for (auto storage : *storages) {
+ XBT_INFO("Storage %s is attached to %s", storage.first.c_str(), storage.second->host());
+ storage.second->setProperty("other usage", xbt_strdup("gpfs"));
+ }
+ // Expected output in tesh file that's missing for now
+ //> [ 1.207952] (server@alice) Storage Disk3 is attached to carl
+ //> [ 1.207952] (server@alice) Storage Disk4 is attached to denise
+}
static void storage_info(simgrid::s4u::Host* host)
{
XBT_INFO("Server waiting for transfers ...");
while (1) {
char* msg = static_cast<char*>(simgrid::s4u::this_actor::recv(mailbox));
- if (!strcmp(msg, "finalize")) { // Shutdown ...
+ if (not strcmp(msg, "finalize")) { // Shutdown ...
xbt_free(msg);
break;
} else { // Receive file to save
char* dest = strtok_r(msg, " ", &saveptr);
sg_size_t size_to_write = std::stoull(strtok_r(nullptr, " ", &saveptr));
write_local_file(dest, size_to_write);
+ xbt_free(dest);
}
}
storage_info(simgrid::s4u::this_actor::host());
- // dump_platform_storages();
+ dump_platform_storages();
}
int main(int argc, char* argv[])