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
cosmetics around surf::Resouce::apply_event()
[simgrid.git]
/
src
/
surf
/
storage_interface.hpp
diff --git
a/src/surf/storage_interface.hpp
b/src/surf/storage_interface.hpp
index
125962e
..
8848f3a
100644
(file)
--- a/
src/surf/storage_interface.hpp
+++ b/
src/surf/storage_interface.hpp
@@
-5,6
+5,7
@@
* under the terms of the license (GNU LGPL) which comes with this package. */
#include <xbt/base.h>
* under the terms of the license (GNU LGPL) which comes with this package. */
#include <xbt/base.h>
+#include <xbt/signal.hpp>
#include "surf_interface.hpp"
#include "src/surf/PropertyHolder.hpp"
#include "surf_interface.hpp"
#include "src/surf/PropertyHolder.hpp"
@@
-33,25
+34,25
@@
class StorageAction;
* @brief Callbacks handler which emit the callbacks after Storage creation *
* @details Callback functions have the following signature: `void(Storage*)`
*/
* @brief Callbacks handler which emit the callbacks after Storage creation *
* @details Callback functions have the following signature: `void(Storage*)`
*/
-XBT_PUBLIC_DATA(simgrid::
surf
::signal<void(simgrid::surf::Storage*)>) storageCreatedCallbacks;
+XBT_PUBLIC_DATA(simgrid::
xbt
::signal<void(simgrid::surf::Storage*)>) storageCreatedCallbacks;
/** @ingroup SURF_callbacks
* @brief Callbacks handler which emit the callbacks after Storage destruction *
* @details Callback functions have the following signature: `void(StoragePtr)`
*/
/** @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::
surf
::signal<void(simgrid::surf::Storage*)>) storageDestructedCallbacks;
+XBT_PUBLIC_DATA(simgrid::
xbt
::signal<void(simgrid::surf::Storage*)>) 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)`
*/
/** @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::
surf
::signal<void(simgrid::surf::Storage*, int, int)>) storageStateChangedCallbacks;
+XBT_PUBLIC_DATA(simgrid::
xbt
::signal<void(simgrid::surf::Storage*, 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, e_surf_action_state_t old, e_surf_action_state_t current)`
*/
/** @ingroup SURF_callbacks
* @brief Callbacks handler which emit the callbacks after StorageAction State changed *
* @details Callback functions have the following signature: `void(StorageAction *action, e_surf_action_state_t old, e_surf_action_state_t current)`
*/
-XBT_PUBLIC_DATA(simgrid::
surf
::signal<void(simgrid::surf::StorageAction*, e_surf_action_state_t, e_surf_action_state_t)>) storageActionStateChangedCallbacks;
+XBT_PUBLIC_DATA(simgrid::
xbt
::signal<void(simgrid::surf::StorageAction*, e_surf_action_state_t, e_surf_action_state_t)>) storageActionStateChangedCallbacks;
/*********
* Model *
/*********
* Model *
@@
-82,7
+83,7
@@
public:
xbt_dict_t properties,
const char *attach) = 0;
xbt_dict_t properties,
const char *attach) = 0;
- bool
shareResourcesI
sIdempotent() {return true;}
+ bool
next_occuring_event_i
sIdempotent() {return true;}
xbt_dynar_t p_storageList;
};
xbt_dynar_t p_storageList;
};
@@
-95,7
+96,7
@@
public:
* @details A Storage represent a storage unit (e.g.: hard drive, usb key)
*/
class Storage : public simgrid::surf::Resource,
* @details A Storage represent a storage unit (e.g.: hard drive, usb key)
*/
class Storage : public simgrid::surf::Resource,
-
public simgrid::surf::PropertyHolder {
+ public simgrid::surf::PropertyHolder {
public:
/**
* @brief Storage constructor
public:
/**
* @brief Storage constructor
@@
-137,16
+138,9
@@
public:
~Storage();
/** @brief Check if the Storage is used (if an action currently uses its resources) */
~Storage();
/** @brief Check if the Storage is used (if an action currently uses its resources) */
- bool isUsed();
+ bool isUsed()
override
;
- /**
- * @brief Update the state of the current Storage
- *
- * @param event_type [description]
- * @param value [description]
- * @param date [description]
- */
- void updateState(tmgr_trace_event_t event_type, double value, double date);
+ void apply_event(tmgr_trace_iterator_t event, double value) override;
void turnOn() override;
void turnOff() override;
void turnOn() override;
void turnOff() override;