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
Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid
[simgrid.git]
/
src
/
s4u
/
s4u_Storage.cpp
diff --git
a/src/s4u/s4u_Storage.cpp
b/src/s4u/s4u_Storage.cpp
index
aa0904d
..
b1e3e71
100644
(file)
--- a/
src/s4u/s4u_Storage.cpp
+++ b/
src/s4u/s4u_Storage.cpp
@@
-5,13
+5,11
@@
#include "simgrid/s4u/Engine.hpp"
#include "simgrid/s4u/Host.hpp"
#include "simgrid/s4u/Engine.hpp"
#include "simgrid/s4u/Host.hpp"
+#include "simgrid/s4u/Io.hpp"
#include "simgrid/s4u/Storage.hpp"
#include "simgrid/storage.h"
#include "src/surf/StorageImpl.hpp"
#include "simgrid/s4u/Storage.hpp"
#include "simgrid/storage.h"
#include "src/surf/StorageImpl.hpp"
-#include <string>
-#include <unordered_map>
-
namespace simgrid {
namespace xbt {
template class Extendable<simgrid::s4u::Storage>;
namespace simgrid {
namespace xbt {
template class Extendable<simgrid::s4u::Storage>;
@@
-19,73
+17,88
@@
template class Extendable<simgrid::s4u::Storage>;
namespace s4u {
namespace s4u {
-void getStorageList(std::map<std::string, Storage*>* whereTo)
-{
- for (auto const& s : simgrid::s4u::Engine::get_instance()->get_all_storages())
- whereTo->insert({s->get_name(), s});
-}
+simgrid::xbt::signal<void(s4u::Storage&)> Storage::on_creation;
+simgrid::xbt::signal<void(s4u::Storage&)> Storage::on_destruction;
+simgrid::xbt::signal<void(s4u::Storage&)> Storage::on_state_change;
Storage::Storage(std::string name, surf::StorageImpl* pimpl) : pimpl_(pimpl), name_(name)
{
simgrid::s4u::Engine::get_instance()->storage_register(name, this);
}
Storage::Storage(std::string name, surf::StorageImpl* pimpl) : pimpl_(pimpl), name_(name)
{
simgrid::s4u::Engine::get_instance()->storage_register(name, this);
}
-Storage* Storage::by
N
ame(std::string name)
+Storage* Storage::by
_n
ame(std::string name)
{
{
- return Engine::get_instance()->storage_by_name
_or_null
(name);
+ return Engine::get_instance()->storage_by_name(name);
}
}
-const std::string& Storage::get_name() const
+Storage* Storage::by_name_or_null(std::string name)
{
{
- return
name_
;
+ return
Engine::get_instance()->storage_by_name_or_null(name)
;
}
}
-const char* Storage::get_
cname() const
+const char* Storage::get_
type()
{
{
- return
name
_.c_str();
+ return
pimpl_->typeId
_.c_str();
}
}
-
const char* Storage::getType
()
+
std::unordered_map<std::string, std::string>* Storage::get_properties
()
{
{
- return
pimpl_->typeId_.c_str(
);
+ return
simgrid::simix::simcall([this] { return pimpl_->get_properties(); }
);
}
}
-
Host* Storage::getHost(
)
+
const char* Storage::get_property(std::string key
)
{
{
- return
attached_to_
;
+ return
this->pimpl_->get_property(key)
;
}
}
-
std::map<std::string, std::string>* Storage::getProperties(
)
+
void Storage::set_property(std::string key, std::string value
)
{
{
-
return simgrid::simix::simcall([this] { return pimpl_->get_properties(
); });
+
simgrid::simix::simcall([this, key, value] { this->pimpl_->set_property(key, value
); });
}
}
-
const char* Storage::getProperty(std::string key
)
+
IoPtr Storage::io_init(sg_size_t size, Io::OpType type
)
{
{
- return this->pimpl_->get_property(key);
+ IoPtr res = IoPtr(new Io(size, type));
+ res->storage_ = this;
+ return res;
}
}
-
void Storage::setProperty(std::string key, std::string valu
e)
+
IoPtr Storage::read_async(sg_size_t siz
e)
{
{
- simgrid::simix::simcall([this, key, value] { this->pimpl_->set_property(key, value); });
+
+ IoPtr res = io_init(size, Io::OpType::READ);
+ res->start();
+ return res;
}
sg_size_t Storage::read(sg_size_t size)
{
}
sg_size_t Storage::read(sg_size_t size)
{
- return simcall_storage_read(pimpl_, size);
+ IoPtr i = io_init(size, Io::OpType::READ);
+ i->start()->wait();
+ return i->get_performed_ioops();
+}
+
+IoPtr Storage::write_async(sg_size_t size)
+{
+
+ IoPtr res = io_init(size, Io::OpType::WRITE);
+ res->start();
+ return res;
}
sg_size_t Storage::write(sg_size_t size)
{
}
sg_size_t Storage::write(sg_size_t size)
{
- return simcall_storage_write(pimpl_, size);
+ IoPtr i = io_init(size, Io::OpType::WRITE);
+ i->start()->wait();
+ return i->get_performed_ioops();
}
}
-/
*************
- * Callbacks *
- *************/
-simgrid::xbt::signal<void(s4u::Storage&)> Storage::on_creation;
-
simgrid::xbt::signal<void(s4u::Storage&)> Storage::on_destruction
;
-simgrid::xbt::signal<void(s4u::Storage&)> Storage::on_state_change;
+/
/ Deprecated functions
+void getStorageList(std::map<std::string, Storage*>* whereTo)
+{
+ for (auto const& s : simgrid::s4u::Engine::get_instance()->get_all_storages())
+
whereTo->insert({s->get_name(), s})
;
+}
} /* namespace s4u */
} /* namespace simgrid */
} /* namespace s4u */
} /* namespace simgrid */
@@
-96,9
+109,9
@@
simgrid::xbt::signal<void(s4u::Storage&)> Storage::on_state_change;
* (#sg_storage_t) and the functions for managing it.
*/
* (#sg_storage_t) and the functions for managing it.
*/
-/**
\
ingroup sg_storage_management
+/**
@
ingroup sg_storage_management
*
*
- *
\
brief Returns the name of the #sg_storage_t.
+ *
@
brief Returns the name of the #sg_storage_t.
*
* This functions checks whether a storage is a valid pointer or not and return its name.
*/
*
* This functions checks whether a storage is a valid pointer or not and return its name.
*/
@@
-111,19
+124,19
@@
const char* sg_storage_get_name(sg_storage_t storage)
const char* sg_storage_get_host(sg_storage_t storage)
{
xbt_assert((storage != nullptr), "Invalid parameters");
const char* sg_storage_get_host(sg_storage_t storage)
{
xbt_assert((storage != nullptr), "Invalid parameters");
- return storage->get
H
ost()->get_cname();
+ return storage->get
_h
ost()->get_cname();
}
}
-/**
\
ingroup sg_storage_management
- *
\
brief Returns a xbt_dict_t consisting of the list of properties assigned to this storage
- *
\
param storage a storage
- *
\
return a dict containing the properties
+/**
@
ingroup sg_storage_management
+ *
@
brief Returns a xbt_dict_t consisting of the list of properties assigned to this storage
+ *
@
param storage a storage
+ *
@
return a dict containing the properties
*/
xbt_dict_t sg_storage_get_properties(sg_storage_t storage)
{
xbt_assert((storage != nullptr), "Invalid parameters (storage is nullptr)");
xbt_dict_t as_dict = xbt_dict_new_homogeneous(xbt_free_f);
*/
xbt_dict_t sg_storage_get_properties(sg_storage_t storage)
{
xbt_assert((storage != nullptr), "Invalid parameters (storage is nullptr)");
xbt_dict_t as_dict = xbt_dict_new_homogeneous(xbt_free_f);
- std::
map<std::string, std::string>* props = storage->getP
roperties();
+ std::
unordered_map<std::string, std::string>* props = storage->get_p
roperties();
if (props == nullptr)
return nullptr;
for (auto const& elm : *props) {
if (props == nullptr)
return nullptr;
for (auto const& elm : *props) {
@@
-132,42
+145,42
@@
xbt_dict_t sg_storage_get_properties(sg_storage_t storage)
return as_dict;
}
return as_dict;
}
-/**
\
ingroup sg_storage_management
- *
\
brief Change the value of a given storage property
+/**
@
ingroup sg_storage_management
+ *
@
brief Change the value of a given storage property
*
*
- *
\
param storage a storage
- *
\
param name a property name
- *
\
param value what to change the property to
+ *
@
param storage a storage
+ *
@
param name a property name
+ *
@
param value what to change the property to
*/
void sg_storage_set_property_value(sg_storage_t storage, const char* name, const char* value)
{
*/
void sg_storage_set_property_value(sg_storage_t storage, const char* name, const char* value)
{
- storage->set
P
roperty(name, value);
+ storage->set
_p
roperty(name, value);
}
}
-/**
\
ingroup sg_storage_management
- *
\
brief Returns the value of a given storage property
+/**
@
ingroup sg_storage_management
+ *
@
brief Returns the value of a given storage property
*
*
- *
\
param storage a storage
- *
\
param name a property name
- *
\
return value of a property (or nullptr if property not set)
+ *
@
param storage a storage
+ *
@
param name a property name
+ *
@
return value of a property (or nullptr if property not set)
*/
const char* sg_storage_get_property_value(sg_storage_t storage, const char* name)
{
*/
const char* sg_storage_get_property_value(sg_storage_t storage, const char* name)
{
- return storage->get
P
roperty(name);
+ return storage->get
_p
roperty(name);
}
}
-/**
\
ingroup sg_storage_management
- *
\
brief Finds a sg_storage_t using its name.
- *
\
param name the name of a storage
- *
\
return the corresponding storage
+/**
@
ingroup sg_storage_management
+ *
@
brief Finds a sg_storage_t using its name.
+ *
@
param name the name of a storage
+ *
@
return the corresponding storage
*/
sg_storage_t sg_storage_get_by_name(const char* name)
{
*/
sg_storage_t sg_storage_get_by_name(const char* name)
{
- return simgrid::s4u::Storage::by
N
ame(name);
+ return simgrid::s4u::Storage::by
_n
ame(name);
}
}
-/**
\
ingroup sg_storage_management
- *
\
brief Returns a dynar containing all the storage elements declared at a given point of time
+/**
@
ingroup sg_storage_management
+ *
@
brief Returns a dynar containing all the storage elements declared at a given point of time
*/
xbt_dynar_t sg_storages_as_dynar()
{
*/
xbt_dynar_t sg_storages_as_dynar()
{
@@
-181,12
+194,12
@@
xbt_dynar_t sg_storages_as_dynar()
void* sg_storage_get_data(sg_storage_t storage)
{
xbt_assert((storage != nullptr), "Invalid parameters");
void* sg_storage_get_data(sg_storage_t storage)
{
xbt_assert((storage != nullptr), "Invalid parameters");
- return storage->get
User
data();
+ return storage->get
_
data();
}
void sg_storage_set_data(sg_storage_t storage, void* data)
{
}
void sg_storage_set_data(sg_storage_t storage, void* data)
{
- storage->set
User
data(data);
+ storage->set
_
data(data);
}
sg_size_t sg_storage_read(sg_storage_t storage, sg_size_t size)
}
sg_size_t sg_storage_read(sg_storage_t storage, sg_size_t size)