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
Inventive hack to get flex raising exceptions on parse error
[simgrid.git]
/
src
/
surf
/
StorageImpl.cpp
diff --git
a/src/surf/StorageImpl.cpp
b/src/surf/StorageImpl.cpp
index
7870a89
..
801ad1b
100644
(file)
--- a/
src/surf/StorageImpl.cpp
+++ b/
src/surf/StorageImpl.cpp
@@
-11,10
+11,11
@@
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_storage, surf, "Logging specific to the SURF storage module");
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_storage, surf, "Logging specific to the SURF storage module");
-simgrid::
surf
::StorageModel* surf_storage_model = nullptr;
+simgrid::
kernel::resource
::StorageModel* surf_storage_model = nullptr;
namespace simgrid {
namespace simgrid {
-namespace surf {
+namespace kernel {
+namespace resource {
/*********
* Model *
/*********
* Model *
@@
-40,19
+41,19
@@
StorageImpl::StorageImpl(kernel::resource::Model* model, const std::string& name
: Resource(model, name, maxminSystem->constraint_new(this, std::max(bread, bwrite)))
, piface_(name, this)
, typeId_(type_id)
: Resource(model, name, maxminSystem->constraint_new(this, std::max(bread, bwrite)))
, piface_(name, this)
, typeId_(type_id)
- , content_name(content_name)
+ , content_name
_
(content_name)
, size_(size)
, attach_(attach)
{
StorageImpl::turn_on();
XBT_DEBUG("Create resource with Bread '%f' Bwrite '%f' and Size '%llu'", bread, bwrite, size);
, size_(size)
, attach_(attach)
{
StorageImpl::turn_on();
XBT_DEBUG("Create resource with Bread '%f' Bwrite '%f' and Size '%llu'", bread, bwrite, size);
- constraint
R
ead_ = maxminSystem->constraint_new(this, bread);
- constraint
W
rite_ = maxminSystem->constraint_new(this, bwrite);
+ constraint
_r
ead_ = maxminSystem->constraint_new(this, bread);
+ constraint
_w
rite_ = maxminSystem->constraint_new(this, bwrite);
}
StorageImpl::~StorageImpl()
{
}
StorageImpl::~StorageImpl()
{
- xbt_assert(currently
D
estroying_, "Don't delete Storages directly. Call destroy() instead.");
+ xbt_assert(currently
_d
estroying_, "Don't delete Storages directly. Call destroy() instead.");
}
/** @brief Fire the required callbacks and destroy the object
}
/** @brief Fire the required callbacks and destroy the object
@@
-61,8
+62,8
@@
StorageImpl::~StorageImpl()
*/
void StorageImpl::destroy()
{
*/
void StorageImpl::destroy()
{
- if (not currently
D
estroying_) {
- currently
D
estroying_ = true;
+ if (not currently
_d
estroying_) {
+ currently
_d
estroying_ = true;
s4u::Storage::on_destruction(this->piface_);
delete this;
}
s4u::Storage::on_destruction(this->piface_);
delete this;
}
@@
-92,8
+93,7
@@
void StorageImpl::turn_off()
s4u::Storage::on_state_change(this->piface_);
}
}
s4u::Storage::on_state_change(this->piface_);
}
}
-xbt::signal<void(StorageAction*, kernel::resource::Action::State, kernel::resource::Action::State)>
- StorageAction::on_state_change;
+xbt::signal<void(StorageAction const&, Action::State, Action::State)> StorageAction::on_state_change;
/**********
* Action *
/**********
* Action *
@@
-102,7
+102,8
@@
void StorageAction::set_state(Action::State state)
{
Action::State old = get_state();
Action::set_state(state);
{
Action::State old = get_state();
Action::set_state(state);
- on_state_change(this, old, state);
-}
-}
+ on_state_change(*this, old, state);
}
}
+} // namespace resource
+} // namespace kernel
+} // namespace simgrid