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
comestics in src/kernel
[simgrid.git]
/
src
/
s4u
/
s4u_Storage.cpp
diff --git
a/src/s4u/s4u_Storage.cpp
b/src/s4u/s4u_Storage.cpp
index
2b6b7f5
..
09fb106
100644
(file)
--- a/
src/s4u/s4u_Storage.cpp
+++ b/
src/s4u/s4u_Storage.cpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2006-201
8
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2006-201
9
. 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. */
/* 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. */
@@
-13,25
+13,25
@@
namespace simgrid {
namespace xbt {
template class Extendable<simgrid::s4u::Storage>;
namespace simgrid {
namespace xbt {
template class Extendable<simgrid::s4u::Storage>;
-}
+}
// namespace xbt
namespace s4u {
namespace s4u {
-
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;
+
xbt::signal<void(
Storage&)> Storage::on_creation;
+
xbt::signal<void(
Storage&)> Storage::on_destruction;
+
xbt::signal<void(
Storage&)> Storage::on_state_change;
-Storage::Storage(
std::string name, surf
::StorageImpl* pimpl) : pimpl_(pimpl), name_(name)
+Storage::Storage(
const std::string& name, kernel::resource
::StorageImpl* pimpl) : pimpl_(pimpl), name_(name)
{
{
-
simgrid::s4u::Engine::get_instance()->storage_register(name
, this);
+
Engine::get_instance()->storage_register(name_
, this);
}
}
-Storage* Storage::by_name(
std::string
name)
+Storage* Storage::by_name(
const std::string&
name)
{
return Engine::get_instance()->storage_by_name(name);
}
{
return Engine::get_instance()->storage_by_name(name);
}
-Storage* Storage::by_name_or_null(
std::string
name)
+Storage* Storage::by_name_or_null(
const std::string&
name)
{
return Engine::get_instance()->storage_by_name_or_null(name);
}
{
return Engine::get_instance()->storage_by_name_or_null(name);
}
@@
-46,50
+46,44
@@
std::unordered_map<std::string, std::string>* Storage::get_properties()
return simgrid::simix::simcall([this] { return pimpl_->get_properties(); });
}
return simgrid::simix::simcall([this] { return pimpl_->get_properties(); });
}
-const char* Storage::get_property(
std::string
key)
+const char* Storage::get_property(
const std::string&
key)
{
return this->pimpl_->get_property(key);
}
{
return this->pimpl_->get_property(key);
}
-void Storage::set_property(
std::string key, std::string
value)
+void Storage::set_property(
const std::string& key, const std::string&
value)
{
{
- simgrid::simix::simcall([this,
key,
value] { this->pimpl_->set_property(key, value); });
+ simgrid::simix::simcall([this,
&key, &
value] { this->pimpl_->set_property(key, value); });
}
}
-IoPtr Storage::io_init(sg_size_t size)
+IoPtr Storage::io_init(sg_size_t size
, Io::OpType type
)
{
{
- IoPtr res = IoPtr(new Io());
- res->size_ = size;
- res->storage_ = this;
- res->set_remaining(size);
- return res;
+ return IoPtr(new Io(this, size, type));
+}
+
+IoPtr Storage::read_async(sg_size_t size)
+{
+ return IoPtr(io_init(size, Io::OpType::READ))->start();
}
sg_size_t Storage::read(sg_size_t size)
{
}
sg_size_t Storage::read(sg_size_t size)
{
- IoPtr i = io_init(size);
- i->set_io_type(Io::OpType::READ);
- i->start()->wait();
- return i->get_performed_ioops();
+ return IoPtr(io_init(size, Io::OpType::READ))->start()->wait()->get_performed_ioops();
}
}
-
sg_size_t Storage::write
(sg_size_t size)
+
IoPtr Storage::write_async
(sg_size_t size)
{
{
- IoPtr i = io_init(size);
- i->set_io_type(Io::OpType::WRITE);
- i->start()->wait();
- return i->get_performed_ioops();
+
+ return IoPtr(io_init(size, Io::OpType::WRITE)->start());
}
}
-// Deprecated functions
-void getStorageList(std::map<std::string, Storage*>* whereTo)
+sg_size_t Storage::write(sg_size_t size)
{
{
- for (auto const& s : simgrid::s4u::Engine::get_instance()->get_all_storages())
- whereTo->insert({s->get_name(), s});
+ return IoPtr(io_init(size, Io::OpType::WRITE))->start()->wait()->get_performed_ioops();
}
}
-} /
* namespace s4u */
-} /
* namespace simgrid */
+} /
/ namespace s4u
+} /
/ namespace simgrid
/* **************************** Public C interface *************************** */
/* **************************** Public C interface *************************** */