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
Remove XBT_INFO call
[simgrid.git]
/
src
/
surf
/
network_interface.hpp
diff --git
a/src/surf/network_interface.hpp
b/src/surf/network_interface.hpp
index
9a68045
..
8988357
100644
(file)
--- a/
src/surf/network_interface.hpp
+++ b/
src/surf/network_interface.hpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2004-201
3
. The SimGrid Team.
+/* Copyright (c) 2004-201
4
. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
@@
-28,25
+28,25
@@
typedef NetworkAction *NetworkActionPtr;
/** @ingroup SURF_callbacks
* @brief Callbacks handler which emit the callbacks after NetworkLink creation *
/** @ingroup SURF_callbacks
* @brief Callbacks handler which emit the callbacks after NetworkLink creation *
- * @detail Callback functions have the following signature: `void(NetworkLinkPtr)`
+ * @detail
s
Callback functions have the following signature: `void(NetworkLinkPtr)`
*/
extern surf_callback(void, NetworkLinkPtr) networkLinkCreatedCallbacks;
/** @ingroup SURF_callbacks
* @brief Callbacks handler which emit the callbacks after NetworkLink destruction *
*/
extern surf_callback(void, NetworkLinkPtr) networkLinkCreatedCallbacks;
/** @ingroup SURF_callbacks
* @brief Callbacks handler which emit the callbacks after NetworkLink destruction *
- * @detail Callback functions have the following signature: `void(NetworkLinkPtr)`
+ * @detail
s
Callback functions have the following signature: `void(NetworkLinkPtr)`
*/
extern surf_callback(void, NetworkLinkPtr) networkLinkDestructedCallbacks;
/** @ingroup SURF_callbacks
* @brief Callbacks handler which emit the callbacks after NetworkLink State changed *
*/
extern surf_callback(void, NetworkLinkPtr) networkLinkDestructedCallbacks;
/** @ingroup SURF_callbacks
* @brief Callbacks handler which emit the callbacks after NetworkLink State changed *
- * @detail Callback functions have the following signature: `void(NetworkLinkActionPtr)`
+ * @detail
s
Callback functions have the following signature: `void(NetworkLinkActionPtr)`
*/
extern surf_callback(void, NetworkLinkPtr) networkLinkStateChangedCallbacks;
/** @ingroup SURF_callbacks
* @brief Callbacks handler which emit the callbacks after NetworkAction State changed *
*/
extern surf_callback(void, NetworkLinkPtr) networkLinkStateChangedCallbacks;
/** @ingroup SURF_callbacks
* @brief Callbacks handler which emit the callbacks after NetworkAction State changed *
- * @detail Callback functions have the following signature: `void(NetworkActionPtr)`
+ * @detail
s
Callback functions have the following signature: `void(NetworkActionPtr)`
*/
extern surf_callback(void, NetworkActionPtr) networkActionStateChangedCallbacks;
*/
extern surf_callback(void, NetworkActionPtr) networkActionStateChangedCallbacks;
@@
-133,17
+133,6
@@
public:
virtual ActionPtr communicate(RoutingEdgePtr src, RoutingEdgePtr dst,
double size, double rate)=0;
virtual ActionPtr communicate(RoutingEdgePtr src, RoutingEdgePtr dst,
double size, double rate)=0;
- /**
- * @brief Get the route between two RoutingEdge
- * @details [TODO]
- *
- * @param src [TODO]
- * @param dst [TODO]
- *
- * @return A xbt_dynar_t of [TODO]
- */
- virtual xbt_dynar_t getRoute(RoutingEdgePtr src, RoutingEdgePtr dst); //FIXME: kill field? That is done by the routing nowadays
-
/**
* @brief Function pointer to the function to use to solve the lmm_system_t
*
/**
* @brief Function pointer to the function to use to solve the lmm_system_t
*
@@
-293,6
+282,15
@@
public:
void setState(e_surf_action_state_t state);
void setState(e_surf_action_state_t state);
+#ifdef HAVE_LATENCY_BOUND_TRACKING
+ /**
+ * @brief Check if the action is limited by latency.
+ *
+ * @return 1 if action is limited by latency, 0 otherwise
+ */
+ virtual int getLatencyLimited() {return m_latencyLimited;}
+#endif
+
double m_latency;
double m_latCurrent;
double m_weight;
double m_latency;
double m_latCurrent;
double m_weight;