/* 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. */
-#include <xbt/base.h>
-#include <xbt/signal.hpp>
-
#include "simgrid/kernel/resource/Action.hpp"
#include "simgrid/kernel/resource/Model.hpp"
#include "simgrid/kernel/resource/Resource.hpp"
#include "simgrid/s4u/Storage.hpp"
#include "src/surf/PropertyHolder.hpp"
+#include "src/surf/trace_mgr.hpp"
#include "surf_interface.hpp"
#include <map>
* Callbacks *
*************/
-/** @ingroup SURF_callbacks
- * @brief Callbacks handler which emit the callbacks after Storage creation *
- * @details Callback functions have the following signature: `void(Storage*)`
- */
-XBT_PUBLIC_DATA simgrid::xbt::signal<void(StorageImpl*)> storageCreatedCallbacks;
-
-/** @ingroup SURF_callbacks
- * @brief Callbacks handler which emit the callbacks after Storage destruction *
- * @details Callback functions have the following signature: `void(StoragePtr)`
- */
-XBT_PUBLIC_DATA simgrid::xbt::signal<void(StorageImpl*)> storageDestructedCallbacks;
-
-/** @ingroup SURF_callbacks
- * @brief Callbacks handler which emit the callbacks after Storage State changed *
- * @details Callback functions have the following signature: `void(StorageAction *action, int previouslyOn, int
- * currentlyOn)`
- */
-XBT_PUBLIC_DATA simgrid::xbt::signal<void(StorageImpl*, int, int)> storageStateChangedCallbacks;
-
/** @ingroup SURF_callbacks
* @brief Callbacks handler which emit the callbacks after StorageAction State changed *
* @details Callback functions have the following signature: `void(StorageAction *action,
*/
XBT_PUBLIC_DATA
simgrid::xbt::signal<void(StorageAction*, kernel::resource::Action::State, kernel::resource::Action::State)>
- storageActionStateChangedCallbacks;
+ on_state_change;
/*********
* Model *
void apply_event(tmgr_trace_event_t event, double value) override;
- void turnOn() override;
- void turnOff() override;
+ void turn_on() override;
+ void turn_off() override;
+
+ void destroy(); // Must be called instead of the destructor
/**
* @brief Read a file
sg_size_t size_; // Only used at parsing time then goes to the FileSystemExtension
private:
+ bool currentlyDestroying_ = false;
// Name of the host to which this storage is attached. Only used at platform parsing time, then the interface stores
// the Host directly.
std::string attach_;
*/
class StorageAction : public kernel::resource::Action {
public:
+ static xbt::signal<void(StorageAction*, kernel::resource::Action::State, kernel::resource::Action::State)>
+ on_state_change;
+
/**
* @brief StorageAction constructor
*