-/* Copyright (c) 2006-2017. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2006-2018. 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 <string>
#include <unordered_map>
+#include "simgrid/plugins/file_system.h"
#include "simgrid/s4u.hpp"
-#include "src/plugins/file_system/FileSystem.hpp"
XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_test, "a sample log category");
public:
void show_info(std::unordered_map<std::string, simgrid::s4u::Storage*> const& mounts)
{
- XBT_INFO("Storage info on %s:", simgrid::s4u::Host::current()->getCname());
+ XBT_INFO("Storage info on %s:", simgrid::s4u::Host::current()->get_cname());
for (auto const& kv : mounts) {
std::string mountpoint = kv.first;
simgrid::s4u::Storage* storage = kv.second;
// Retrieve disk's information
- XBT_INFO(" %s (%s) Used: %llu; Free: %llu; Total: %llu.", storage->getCname(), mountpoint.c_str(),
+ XBT_INFO(" %s (%s) Used: %llu; Free: %llu; Total: %llu.", storage->get_cname(), mountpoint.c_str(),
sg_storage_get_size_used(storage), sg_storage_get_size_free(storage), sg_storage_get_size(storage));
}
}
delete file;
// Now attach some user data to disk1
- XBT_INFO("Get/set data for storage element: %s", storage->getCname());
+ XBT_INFO("Get/set data for storage element: %s", storage->get_cname());
XBT_INFO(" Uninitialized storage data: '%s'", static_cast<char*>(storage->getUserdata()));
storage->setUserdata(new std::string("Some user data"));
file = new simgrid::s4u::File("/home/tmp/simgrid.readme", nullptr);
XBT_INFO("Unlink file: '%s'", file->getPath());
file->unlink();
+ delete file; // Unlinking the file on "disk" does not free the object
show_info(mounts);
}
{
simgrid::s4u::Engine e(&argc, argv);
sg_storage_file_system_init();
- e.loadPlatform(argv[1]);
- simgrid::s4u::Actor::createActor("host", simgrid::s4u::Host::by_name("denise"), MyHost());
+ e.load_platform(argv[1]);
+ simgrid::s4u::Actor::create("host", simgrid::s4u::Host::by_name("denise"), MyHost());
e.run();
return 0;