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
Add prototype of function get_route in Surf
[simgrid.git]
/
src
/
surf
/
network.c
diff --git
a/src/surf/network.c
b/src/surf/network.c
index
bd29038
..
eb432eb
100644
(file)
--- a/
src/surf/network.c
+++ b/
src/surf/network.c
@@
-8,12
+8,12
@@
#include "network_private.h"
#include "xbt/log.h"
#include "network_private.h"
#include "xbt/log.h"
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(network, surf,
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(
surf_
network, surf,
"Logging specific to the SURF network module");
surf_network_resource_t surf_network_resource = NULL;
"Logging specific to the SURF network module");
surf_network_resource_t surf_network_resource = NULL;
-
static
xbt_dict_t network_link_set = NULL;
+xbt_dict_t network_link_set = NULL;
xbt_dict_t network_card_set = NULL;
int card_number = 0;
xbt_dict_t network_card_set = NULL;
int card_number = 0;
@@
-311,7
+311,8
@@
static void update_actions_state(double now, double delta)
action->latency = 0.0;
}
if ((action->latency == 0.0) && !(action->suspended))
action->latency = 0.0;
}
if ((action->latency == 0.0) && !(action->suspended))
- lmm_update_variable_weight(maxmin_system, action->variable, 1.0);
+ lmm_update_variable_weight(maxmin_system, action->variable,
+ action->lat_current);
}
surf_double_update(&(action->generic_action.remains),
lmm_variable_getvalue(action->variable) * deltap);
}
surf_double_update(&(action->generic_action.remains),
lmm_variable_getvalue(action->variable) * deltap);
@@
-457,6
+458,12
@@
static surf_action_t communicate(void *src, void *dst, double size, double rate)
return (surf_action_t) action;
}
return (surf_action_t) action;
}
+static void** get_route(void *src, void *dst) {
+ /* TODO */
+
+ return NULL;
+}
+
static void action_suspend(surf_action_t action)
{
((surf_action_network_CM02_t) action)->suspended = 1;
static void action_suspend(surf_action_t action)
{
((surf_action_network_CM02_t) action)->suspended = 1;
@@
-564,6
+571,7
@@
static void surf_network_resource_init_internal(void)
surf_cpu_resource->common_public->set_max_duration = action_set_max_duration;
surf_network_resource->extension_public->communicate = communicate;
surf_cpu_resource->common_public->set_max_duration = action_set_max_duration;
surf_network_resource->extension_public->communicate = communicate;
+ surf_network_resource->extension_public->get_route = get_route;
network_link_set = xbt_dict_new();
network_card_set = xbt_dict_new();
network_link_set = xbt_dict_new();
network_card_set = xbt_dict_new();