#include <simgrid/forward.h>
#include <xbt/Extendable.hpp>
#include <xbt/base.h>
+#include <xbt/signal.hpp>
#include <map>
#include <string>
+#include <unordered_map>
namespace simgrid {
namespace xbt {
}
namespace s4u {
-XBT_ATTRIB_DEPRECATED_v322(
- "simgrid::s4u::getStorageList() is deprecated in favor of Engine::get_all_storages(). Please switch before v3.22")
- XBT_PUBLIC void getStorageList(std::map<std::string, Storage*>* whereTo);
+/** @deprecated Engine::get_all_storages() */
+XBT_ATTRIB_DEPRECATED_v322("Please use Engine::get_all_storages()") XBT_PUBLIC void getStorageList(std::map<std::string, Storage*>* whereTo);
class XBT_PUBLIC Storage : public simgrid::xbt::Extendable<Storage> {
friend s4u::Engine;
+ friend s4u::Io;
friend simgrid::surf::StorageImpl;
public:
Host* get_host() { return attached_to_; };
void set_host(Host* host) { attached_to_ = host; }
- std::map<std::string, std::string>* get_properties();
+ std::unordered_map<std::string, std::string>* get_properties();
const char* get_property(std::string key);
void set_property(std::string, std::string value);
void set_data(void* data) { userdata_ = data; }
void* get_data() { return userdata_; }
+ static IoPtr io_init(sg_size_t size);
+
sg_size_t read(sg_size_t size);
sg_size_t write(sg_size_t size);
surf::StorageImpl* get_impl() { return pimpl_; }
// Deprecated functions
+ /** @deprecated Storage::by_name() */
XBT_ATTRIB_DEPRECATED_v323("Please use Storage::by_name()") Storage* byName(std::string name)
{
return by_name(name);
}
+ /** @deprecated Storage::get_name() */
XBT_ATTRIB_DEPRECATED_v323("Please use Storage::get_name()") std::string const& getName() const { return get_name(); }
+ /** @deprecated Storage::get_cname() */
XBT_ATTRIB_DEPRECATED_v323("Please use Storage::get_cname()") const char* getCname() const { return get_cname(); }
+ /** @deprecated Storage::get_type() */
XBT_ATTRIB_DEPRECATED_v323("Please use Storage::get_type()") const char* getType() { return get_type(); }
+ /** @deprecated Storage::get_host() */
XBT_ATTRIB_DEPRECATED_v323("Please use Storage::get_host()") Host* getHost() { return get_host(); }
+ /** @deprecated Storage::get_properties() */
XBT_ATTRIB_DEPRECATED_v323("Please use Storage::get_properties()") std::map<std::string, std::string>* getProperties()
{
- return get_properties();
+ std::map<std::string, std::string>* res = new std::map<std::string, std::string>();
+ std::unordered_map<std::string, std::string>* props = get_properties();
+ for (auto const& kv : *props)
+ res->insert(kv);
+ return res;
}
+ /** @deprecated Storage::get_property() */
XBT_ATTRIB_DEPRECATED_v323("Please use Storage::get_property()") const char* getProperty(const char* key)
{
return get_property(key);
}
+ /** @deprecated Storage::set_property() */
XBT_ATTRIB_DEPRECATED_v323("Please use Storage::set_property()") void setProperty(std::string key, std::string value)
{
set_property(key, value);
}
+ /** @deprecated Storage::set_data() */
XBT_ATTRIB_DEPRECATED_v323("Please use Storage::set_data()") void setUserdata(void* data) { set_data(data); }
+ /** @deprecated Storage::get_data() */
XBT_ATTRIB_DEPRECATED_v323("Please use Storage::get_data()") void* getUserdata() { return get_data(); }
private: