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
/
surf_interface.hpp
diff --git
a/src/surf/surf_interface.hpp
b/src/surf/surf_interface.hpp
index
e2cfb09
..
de6cfa5
100644
(file)
--- a/
src/surf/surf_interface.hpp
+++ b/
src/surf/surf_interface.hpp
@@
-22,10
+22,8
@@
#include "simgrid/platf_interface.h"
#include "surf/surf.h"
#include "src/surf/surf_private.h"
#include "simgrid/platf_interface.h"
#include "surf/surf.h"
#include "src/surf/surf_private.h"
-#include "src/surf/trace_mgr.hpp"
#include "src/internal_config.h"
#include "src/internal_config.h"
-extern XBT_PRIVATE sg_future_evt_set_t future_evt_set;
#define NO_MAX_DURATION -1.0
/*********
#define NO_MAX_DURATION -1.0
/*********
@@
-73,10
+71,6
@@
enum heap_action_type{
*********/
/* For the trace and trace:connect tag (store their content till the end of the parsing) */
XBT_PUBLIC_DATA(xbt_dict_t) traces_set_list;
*********/
/* For the trace and trace:connect tag (store their content till the end of the parsing) */
XBT_PUBLIC_DATA(xbt_dict_t) traces_set_list;
-XBT_PUBLIC_DATA(xbt_dict_t) trace_connect_list_host_speed;
-XBT_PUBLIC_DATA(xbt_dict_t) trace_connect_list_link_avail;
-XBT_PUBLIC_DATA(xbt_dict_t) trace_connect_list_link_bw;
-XBT_PUBLIC_DATA(xbt_dict_t) trace_connect_list_link_lat;
/**********
* Action *
/**********
* Action *
@@
-279,8
+273,6
@@
public:
Model();
virtual ~Model();
Model();
virtual ~Model();
- virtual void addTraces() =0;
-
/** @brief Get the set of [actions](@ref Action) in *ready* state */
virtual ActionList* getReadyActionSet() {return p_readyActionSet;}
/** @brief Get the set of [actions](@ref Action) in *ready* state */
virtual ActionList* getReadyActionSet() {return p_readyActionSet;}
@@
-314,12
+306,11
@@
public:
* @param now The current time of the simulation
* @return The delta of time till the next action will finish
*/
* @param now The current time of the simulation
* @return The delta of time till the next action will finish
*/
- virtual double
shareResources
(double now);
- virtual double
shareResourcesL
azy(double now);
- virtual double
shareResourcesF
ull(double now);
+ virtual double
next_occuring_event
(double now);
+ virtual double
next_occuring_event_l
azy(double now);
+ virtual double
next_occuring_event_f
ull(double now);
double shareResourcesMaxMin(ActionList* running_actions,
double shareResourcesMaxMin(ActionList* running_actions,
- lmm_system_t sys,
- void (*solve) (lmm_system_t));
+ lmm_system_t sys, void (*solve) (lmm_system_t));
/**
* @brief Update action to the current time
/**
* @brief Update action to the current time
@@
-336,7
+327,7
@@
public:
* The only model that is not is NS3: computing the next timestamp moves the model up to that point,
* so we need to call it only when the next timestamp of other sources is computed.
*/
* The only model that is not is NS3: computing the next timestamp moves the model up to that point,
* so we need to call it only when the next timestamp of other sources is computed.
*/
- virtual bool
shareResourcesI
sIdempotent()=0;
+ virtual bool
next_occuring_event_i
sIdempotent()=0;
protected:
ActionLmmListPtr p_modifiedSet;
protected:
ActionLmmListPtr p_modifiedSet;
@@
-414,14
+405,12
@@
public:
const char *getName();
/**
const char *getName();
/**
- * @brief Update the state of the current Resource
- * @details [TODO]
+ * @brief Apply an event of external load event to that storage
*
*
- * @param event
_type [TODO]
+ * @param event
What happened
* @param value [TODO]
* @param value [TODO]
- * @param date [TODO]
*/
*/
- virtual void
updateState(tmgr_trace_iterator_t event_type, double value, double dat
e)=0;
+ virtual void
apply_event(tmgr_trace_iterator_t event, double valu
e)=0;
/** @brief Check if the current Resource is used (if it currently serves an action) */
virtual bool isUsed()=0;
/** @brief Check if the current Resource is used (if it currently serves an action) */
virtual bool isUsed()=0;