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 surf {
+namespace kernel {
+namespace resource {
/*********
* Model *
: 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)
{
s4u::Storage::on_state_change(this->piface_);
}
}
-xbt::signal<void(StorageAction*, kernel::resource::Action::State, kernel::resource::Action::State)>
+xbt::signal<void(StorageAction const&, kernel::resource::Action::State, kernel::resource::Action::State)>
StorageAction::on_state_change;
/**********
{
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