A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
use consistent namespaces
[simgrid.git]
/
include
/
simgrid
/
s4u
/
Storage.hpp
diff --git
a/include/simgrid/s4u/Storage.hpp
b/include/simgrid/s4u/Storage.hpp
index
32c7bcc
..
4ac1666
100644
(file)
--- a/
include/simgrid/s4u/Storage.hpp
+++ b/
include/simgrid/s4u/Storage.hpp
@@
-26,26
+26,26
@@
namespace s4u {
*/
class XBT_PUBLIC Storage : public simgrid::xbt::Extendable<Storage> {
*/
class XBT_PUBLIC Storage : public simgrid::xbt::Extendable<Storage> {
- friend
simgrid::s4u::
Engine;
- friend
simgrid::s4u::
Io;
- friend
simgrid::surf
::StorageImpl;
+ friend Engine;
+ friend Io;
+ friend
kernel::resource
::StorageImpl;
public:
public:
- explicit Storage(
std::string name, surf::StorageImpl
* pimpl);
+ explicit Storage(
const std::string& name, kernel::resource::StorageImpl
* pimpl);
protected:
virtual ~Storage() = default;
public:
/** @brief Callback signal fired when a new Storage is created */
protected:
virtual ~Storage() = default;
public:
/** @brief Callback signal fired when a new Storage is created */
- static
simgrid::
xbt::signal<void(s4u::Storage&)> on_creation;
+ static xbt::signal<void(s4u::Storage&)> on_creation;
/** @brief Callback signal fired when a Storage is destroyed */
/** @brief Callback signal fired when a Storage is destroyed */
- static
simgrid::
xbt::signal<void(s4u::Storage&)> on_destruction;
+ static xbt::signal<void(s4u::Storage&)> on_destruction;
/** @brief Callback signal fired when a Storage's state changes */
/** @brief Callback signal fired when a Storage's state changes */
- static
simgrid::
xbt::signal<void(s4u::Storage&)> on_state_change;
+ static xbt::signal<void(s4u::Storage&)> on_state_change;
/** Retrieve a Storage by its name. It must exist in the platform file */
/** Retrieve a Storage by its name. It must exist in the platform file */
- static Storage* by_name(
std::string
name);
- static Storage* by_name_or_null(
std::string
name);
+ static Storage* by_name(
const std::string&
name);
+ static Storage* by_name_or_null(
const std::string&
name);
/** @brief Retrieves the name of that storage as a C++ string */
std::string const& get_name() const { return name_; }
/** @brief Retrieves the name of that storage as a C++ string */
std::string const& get_name() const { return name_; }
@@
-57,8
+57,8
@@
public:
void set_host(Host* host) { attached_to_ = host; }
std::unordered_map<std::string, std::string>* get_properties();
void set_host(Host* host) { attached_to_ = host; }
std::unordered_map<std::string, std::string>* get_properties();
- const char* get_property(
std::string
key);
- void set_property(
std::string, std::string
value);
+ const char* get_property(
const std::string&
key);
+ void set_property(
const std::string&, const std::string&
value);
void set_data(void* data) { userdata_ = data; }
void* get_data() { return userdata_; }
void set_data(void* data) { userdata_ = data; }
void* get_data() { return userdata_; }
@@
-70,12
+70,12
@@
public:
IoPtr write_async(sg_size_t size);
sg_size_t write(sg_size_t size);
IoPtr write_async(sg_size_t size);
sg_size_t write(sg_size_t size);
-
surf
::StorageImpl* get_impl() { return pimpl_; }
+
kernel::resource
::StorageImpl* get_impl() { return pimpl_; }
// Deprecated functions
#ifndef DOXYGEN
/** @deprecated Storage::by_name() */
// Deprecated functions
#ifndef DOXYGEN
/** @deprecated Storage::by_name() */
- XBT_ATTRIB_DEPRECATED_v323("Please use Storage::by_name()") Storage* byName(
std::string
name)
+ XBT_ATTRIB_DEPRECATED_v323("Please use Storage::by_name()") Storage* byName(
const std::string&
name)
{
return by_name(name);
}
{
return by_name(name);
}
@@
-102,7
+102,8
@@
public:
return get_property(key);
}
/** @deprecated Storage::set_property() */
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)
+ XBT_ATTRIB_DEPRECATED_v323("Please use Storage::set_property()") void setProperty(const std::string& key,
+ const std::string& value)
{
set_property(key, value);
}
{
set_property(key, value);
}
@@
-113,8
+114,8
@@
public:
#endif
private:
#endif
private:
- Host* attached_to_
= nullptr;
-
surf::StorageImpl* const pimpl_ = nullptr
;
+ Host* attached_to_ = nullptr;
+
kernel::resource::StorageImpl* const pimpl_
;
std::string name_;
void* userdata_ = nullptr;
};
std::string name_;
void* userdata_ = nullptr;
};