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
Merge branch 'mc++'
[simgrid.git]
/
src
/
surf
/
surf_interface.hpp
diff --git
a/src/surf/surf_interface.hpp
b/src/surf/surf_interface.hpp
index
2b75d00
..
a56495f
100644
(file)
--- a/
src/surf/surf_interface.hpp
+++ b/
src/surf/surf_interface.hpp
@@
-10,7
+10,6
@@
#include <xbt.h>
#include <string>
#include <vector>
#include <xbt.h>
#include <string>
#include <vector>
-#include <iostream>
#include <memory>
#include <boost/function.hpp>
#include <boost/intrusive/list.hpp>
#include <memory>
#include <boost/function.hpp>
#include <boost/intrusive/list.hpp>
@@
-366,7
+365,6
@@
private:
const char *p_name;
xbt_dict_t p_properties;
ModelPtr p_model;
const char *p_name;
xbt_dict_t p_properties;
ModelPtr p_model;
- void *p_resource;
bool m_running;
e_surf_resource_state_t m_stateCurrent;
bool m_running;
e_surf_resource_state_t m_stateCurrent;
@@
-616,15
+614,6
@@
public:
*/
double getRemainsNoUpdate();
*/
double getRemainsNoUpdate();
-#ifdef HAVE_LATENCY_BOUND_TRACKING
- /**
- * @brief Check if the action is limited by latency.
- *
- * @return 1 if action is limited by latency, 0 otherwise
- */
- int getLatencyLimited();
-#endif
-
/**
* @brief Get the priority of the current Action
*
/**
* @brief Get the priority of the current Action
*
@@
-642,6
+631,8
@@
public:
s_xbt_swag_hookup_t p_stateHookup;
s_xbt_swag_hookup_t p_stateHookup;
+ ModelPtr getModel() {return p_model;}
+
protected:
ActionListPtr p_stateSet;
double m_priority; /**< priority (1.0 by default) */
protected:
ActionListPtr p_stateSet;
double m_priority; /**< priority (1.0 by default) */
@@
-650,8
+641,6
@@
protected:
double m_maxDuration; /*< max_duration (may fluctuate until the task is completed) */
double m_finish; /**< finish time : this is modified during the run and fluctuates until the task is completed */
double m_maxDuration; /*< max_duration (may fluctuate until the task is completed) */
double m_finish; /**< finish time : this is modified during the run and fluctuates until the task is completed */
- ModelPtr getModel() {return p_model;}
-
private:
int resourceUsed(void *resource_id);
private:
int resourceUsed(void *resource_id);
@@
-695,7
+684,7
@@
private:
#ifdef HAVE_LATENCY_BOUND_TRACKING
int m_latencyLimited; /**< Set to 1 if is limited by latency, 0 otherwise */
#endif
#ifdef HAVE_LATENCY_BOUND_TRACKING
int m_latencyLimited; /**< Set to 1 if is limited by latency, 0 otherwise */
#endif
-
int
m_cost;
+
double
m_cost;
ModelPtr p_model;
void *p_data; /**< for your convenience */
ModelPtr p_model;
void *p_data; /**< for your convenience */