"Logging specific to the SURF network module");
surf_network_resource_t surf_network_resource = NULL;
+static lmm_system_t network_maxmin_system = NULL;
+static void (*network_solve)(lmm_system_t) = NULL;
xbt_dict_t network_link_set = NULL;
xbt_dict_t network_card_set = NULL;
tmgr_history_add_trace(history, state_trace, 0.0, 0, nw_link);
nw_link->constraint =
- lmm_constraint_new(maxmin_system, nw_link, nw_link->bw_current);
+ lmm_constraint_new(network_maxmin_system, nw_link, nw_link->bw_current);
if(policy == SURF_NETWORK_LINK_FATPIPE)
lmm_constraint_shared(nw_link->constraint);
return card->id;
}
-static void route_new(int src_id, int dst_id, char **links, int nb_link)
+static void route_new(int src_id, int dst_id, network_link_CM02_t *link_list, int nb_link)
{
- network_link_CM02_t *link_list = NULL;
- int i;
-
ROUTE_SIZE(src_id, dst_id) = nb_link;
- link_list = (ROUTE(src_id, dst_id) = xbt_new0(network_link_CM02_t, nb_link));
- for (i = 0; i < nb_link; i++) {
- link_list[i] = xbt_dict_get_or_null(network_link_set, links[i]);
- xbt_assert1(link_list[i],"Invalid link name \"%s\"",links[i]);
- free(links[i]);
- }
- free(links);
+ ROUTE(src_id, dst_id) = link_list = xbt_realloc(link_list, sizeof(network_link_CM02_t) * nb_link);
}
static void parse_network_link(void)
policy_initial);
}
-static int nb_link = 0;
-static char **link_name = NULL;
+static int nb_link;
+static int link_list_capacity;
+static network_link_CM02_t *link_list = NULL;
static int src_id = -1;
static int dst_id = -1;
src_id = network_card_new(A_surfxml_route_src);
dst_id = network_card_new(A_surfxml_route_dst);
nb_link = 0;
- link_name = NULL;
+ link_list_capacity = 20;
+ link_list = xbt_new(network_link_CM02_t, link_list_capacity);
}
static void parse_route_elem(void)
{
- nb_link++;
- link_name = xbt_realloc(link_name, (nb_link) * sizeof(char *));
- link_name[(nb_link) - 1] = xbt_strdup(A_surfxml_route_element_name);
+ if (nb_link == link_list_capacity) {
+ link_list_capacity *= 2;
+ link_list = xbt_realloc(link_list, (link_list_capacity) * sizeof(network_link_CM02_t));
+ }
+ link_list[nb_link++] = xbt_dict_get_or_null(network_link_set, A_surfxml_route_element_name);
}
static void parse_route_set_route(void)
{
- route_new(src_id, dst_id, link_name, nb_link);
+ route_new(src_id, dst_id, link_list, nb_link);
}
static void parse_file(const char *file)
if(!ROUTE_SIZE(i,i)) {
if(!loopback)
loopback = network_link_new(xbt_strdup("__MSG_loopback__"),
- 498.00, NULL, 0.000015, NULL,
+ 498000000, NULL, 0.000015, NULL,
SURF_NETWORK_LINK_ON, NULL,
SURF_NETWORK_LINK_FATPIPE);
ROUTE_SIZE(i,i)=1;
static int resource_used(void *resource_id)
{
- return lmm_constraint_used(maxmin_system,
+ return lmm_constraint_used(network_maxmin_system,
((network_link_CM02_t) resource_id)->constraint);
}
if(!action->using) {
xbt_swag_remove(action, action->state_set);
if(((surf_action_network_CM02_t)action)->variable)
- lmm_variable_free(maxmin_system, ((surf_action_network_CM02_t)action)->variable);
+ lmm_variable_free(network_maxmin_system, ((surf_action_network_CM02_t)action)->variable);
free(action);
return 1;
}
{
/* if((state==SURF_ACTION_DONE) || (state==SURF_ACTION_FAILED)) */
/* if(((surf_action_network_CM02_t)action)->variable) { */
-/* lmm_variable_disable(maxmin_system, ((surf_action_network_CM02_t)action)->variable); */
+/* lmm_variable_disable(network_maxmin_system, ((surf_action_network_CM02_t)action)->variable); */
/* ((surf_action_network_CM02_t)action)->variable = NULL; */
/* } */
s_surf_action_network_CM02_t s_action;
surf_action_network_CM02_t action = NULL;
xbt_swag_t running_actions = surf_network_resource->common_public->states.running_action_set;
- double min = generic_maxmin_share_resources(running_actions,
- xbt_swag_offset(s_action, variable));
+ double min;
+
+ min = generic_maxmin_share_resources2(running_actions,
+ xbt_swag_offset(s_action, variable),
+ network_maxmin_system, network_solve);
xbt_swag_foreach(action, running_actions) {
if(action->latency>0) {
deltap = delta;
if (action->latency > 0) {
if (action->latency > deltap) {
- surf_double_update(&(action->latency),deltap);
+ double_update(&(action->latency),deltap);
deltap = 0.0;
} else {
- surf_double_update(&(deltap), action->latency);
+ double_update(&(deltap), action->latency);
action->latency = 0.0;
}
if ((action->latency == 0.0) && !(action->suspended))
- lmm_update_variable_weight(maxmin_system, action->variable,
+ lmm_update_variable_weight(network_maxmin_system, action->variable,
action->lat_current);
}
- surf_double_update(&(action->generic_action.remains),
+ double_update(&(action->generic_action.remains),
lmm_variable_getvalue(action->variable) * deltap);
if (action->generic_action.max_duration != NO_MAX_DURATION)
- surf_double_update(&(action->generic_action.max_duration), delta);
+ double_update(&(action->generic_action.max_duration), delta);
/* if(action->generic_action.remains<.00001) action->generic_action.remains=0; */
network_link_CM02_t nw_link = NULL;
while ((cnst =
- lmm_get_cnst_from_var(maxmin_system, action->variable,
+ lmm_get_cnst_from_var(network_maxmin_system, action->variable,
i++))) {
nw_link = lmm_constraint_id(cnst);
if (nw_link->state_current == SURF_NETWORK_LINK_OFF) {
if (event_type == nw_link->bw_event) {
nw_link->bw_current = value;
- lmm_update_constraint_bound(maxmin_system, nw_link->constraint,
+ lmm_update_constraint_bound(network_maxmin_system, nw_link->constraint,
nw_link->bw_current);
} else if (event_type == nw_link->lat_event) {
double delta = value - nw_link->lat_current;
surf_action_network_CM02_t action = NULL;
nw_link->lat_current = value;
- while (lmm_get_var_from_cnst(maxmin_system, nw_link->constraint, &var)) {
+ while (lmm_get_var_from_cnst(network_maxmin_system, nw_link->constraint, &var)) {
action = lmm_variable_id(var);
action->lat_current += delta;
if(action->rate<0)
- lmm_update_variable_bound(maxmin_system, action->variable,
+ lmm_update_variable_bound(network_maxmin_system, action->variable,
SG_TCP_CTE_GAMMA / (2.0 * action->lat_current));
else
- lmm_update_variable_bound(maxmin_system, action->variable,
+ lmm_update_variable_bound(network_maxmin_system, action->variable,
min(action->rate,SG_TCP_CTE_GAMMA / (2.0 * action->lat_current)));
if(!(action->suspended))
- lmm_update_variable_weight(maxmin_system, action->variable,
+ lmm_update_variable_weight(network_maxmin_system, action->variable,
action->lat_current);
+ lmm_update_variable_latency(network_maxmin_system, action->variable, delta);
}
} else if (event_type == nw_link->state_event) {
if (value > 0)
action->generic_action.cost = size;
action->generic_action.remains = size;
action->generic_action.max_duration = NO_MAX_DURATION;
- action->generic_action.start = -1.0;
+ action->generic_action.start = surf_get_clock();
action->generic_action.finish = -1.0;
action->generic_action.resource_type =
(surf_resource_t) surf_network_resource;
action->lat_current = action->latency;
if(action->latency>0)
- action->variable = lmm_variable_new(maxmin_system, action, 0.0, -1.0,
+ action->variable = lmm_variable_new(network_maxmin_system, action, 0.0, -1.0,
route_size);
else
- action->variable = lmm_variable_new(maxmin_system, action, 1.0, -1.0,
+ action->variable = lmm_variable_new(network_maxmin_system, action, 1.0, -1.0,
route_size);
if(action->rate<0) {
if(action->lat_current>0)
- lmm_update_variable_bound(maxmin_system, action->variable,
+ lmm_update_variable_bound(network_maxmin_system, action->variable,
SG_TCP_CTE_GAMMA / (2.0 * action->lat_current));
else
- lmm_update_variable_bound(maxmin_system, action->variable, -1.0);
+ lmm_update_variable_bound(network_maxmin_system, action->variable, -1.0);
} else {
if(action->lat_current>0)
- lmm_update_variable_bound(maxmin_system, action->variable,
+ lmm_update_variable_bound(network_maxmin_system, action->variable,
min(action->rate,SG_TCP_CTE_GAMMA / (2.0 * action->lat_current)));
else
- lmm_update_variable_bound(maxmin_system, action->variable, action->rate);
+ lmm_update_variable_bound(network_maxmin_system, action->variable, action->rate);
}
+ lmm_update_variable_latency(maxmin_system, action->variable, action->latency);
for (i = 0; i < route_size; i++)
- lmm_expand(maxmin_system, route[i]->constraint, action->variable, 1.0);
+ lmm_expand(network_maxmin_system, route[i]->constraint, action->variable, 1.0);
XBT_OUT;
return (surf_action_t) action;
}
-static void** get_route(void *src, void *dst) {
- /* TODO */
+/* returns an array of network_link_CM02_t */
+static const void** get_route(void *src, void *dst) {
+ network_card_CM02_t card_src = src;
+ network_card_CM02_t card_dst = dst;
+ return (const void**) ROUTE(card_src->id, card_dst->id);
+}
+
+static int get_route_size(void *src, void *dst) {
+ network_card_CM02_t card_src = src;
+ network_card_CM02_t card_dst = dst;
+ return ROUTE_SIZE(card_src->id, card_dst->id);
+}
+
+static const char *get_link_name(const void *link) {
+ return ((network_link_CM02_t) link)->name;
+}
+
+static double get_link_bandwidth(const void *link) {
+ return ((network_link_CM02_t) link)->bw_current;
+}
- return NULL;
+static double get_link_latency(const void *link) {
+ return ((network_link_CM02_t) link)->lat_current;
}
static void action_suspend(surf_action_t action)
{
((surf_action_network_CM02_t) action)->suspended = 1;
- lmm_update_variable_weight(maxmin_system,
+ lmm_update_variable_weight(network_maxmin_system,
((surf_action_network_CM02_t) action)->variable, 0.0);
}
static void action_resume(surf_action_t action)
{
- lmm_update_variable_weight(maxmin_system,
- ((surf_action_network_CM02_t) action)->variable,
- ((surf_action_network_CM02_t) action)->lat_current);
- ((surf_action_network_CM02_t) action)->suspended = 0;
+ if(((surf_action_network_CM02_t) action)->suspended) {
+ lmm_update_variable_weight(network_maxmin_system,
+ ((surf_action_network_CM02_t) action)->variable,
+ ((surf_action_network_CM02_t) action)->lat_current);
+ ((surf_action_network_CM02_t) action)->suspended = 0;
+ }
}
static int action_is_suspended(surf_action_t action)
get_resource_name;
surf_network_resource->common_public->action_get_state =
surf_action_get_state;
+ surf_network_resource->common_public->action_get_start_time =
+ surf_action_get_start_time;
+ surf_network_resource->common_public->action_get_finish_time =
+ surf_action_get_finish_time;
surf_network_resource->common_public->action_free = action_free;
surf_network_resource->common_public->action_use = action_use;
surf_network_resource->common_public->action_cancel = action_cancel;
surf_network_resource->extension_public->communicate = communicate;
surf_network_resource->extension_public->get_route = get_route;
+ surf_network_resource->extension_public->get_route_size = get_route_size;
+ surf_network_resource->extension_public->get_link_name = get_link_name;
+ surf_network_resource->extension_public->get_link_bandwidth = get_link_bandwidth;
+ surf_network_resource->extension_public->get_link_latency = get_link_latency;
network_link_set = xbt_dict_new();
network_card_set = xbt_dict_new();
- xbt_assert0(maxmin_system, "surf_init has to be called first!");
+ if(!network_maxmin_system)
+ network_maxmin_system = lmm_system_new();
}
/***************************************************************************/
/* year = {2002} */
/* } */
void surf_network_resource_init_CM02(const char *filename)
+{
+
+ if (surf_network_resource)
+ return;
+ surf_network_resource_init_internal();
+ parse_file(filename);
+ xbt_dynar_push(resource_list, &surf_network_resource);
+ network_solve = lmm_solve;
+
+ update_resource_description(surf_network_resource_description,
+ surf_network_resource_description_size,
+ "CM02",
+ (surf_resource_t) surf_network_resource);
+}
+
+void surf_network_resource_init_Reno(const char *filename)
+{
+ if (surf_network_resource)
+ return;
+ surf_network_resource_init_internal();
+ parse_file(filename);
+
+ xbt_dynar_push(resource_list, &surf_network_resource);
+ lmm_set_default_protocol_function(func_reno_f, func_reno_fp, func_reno_fpi);
+ network_solve = lagrange_solve;
+
+ update_resource_description(surf_network_resource_description,
+ surf_network_resource_description_size,
+ "Reno",
+ (surf_resource_t) surf_network_resource);
+}
+
+void surf_network_resource_init_Vegas(const char *filename)
{
if (surf_network_resource)
return;
surf_network_resource_init_internal();
parse_file(filename);
+
+ xbt_dynar_push(resource_list, &surf_network_resource);
+ lmm_set_default_protocol_function(func_vegas_f, func_vegas_fp, func_vegas_fpi);
+ network_solve = lagrange_solve;
+
+ update_resource_description(surf_network_resource_description,
+ surf_network_resource_description_size,
+ "Vegas",
+ (surf_resource_t) surf_network_resource);
+}
+
+#ifdef HAVE_SDP
+void surf_network_resource_init_SDP(const char *filename)
+{
+ if (surf_network_resource)
+ return;
+ surf_network_resource_init_internal();
+ parse_file(filename);
+
xbt_dynar_push(resource_list, &surf_network_resource);
+ network_solve = sdp_solve;
+
+ update_resource_description(surf_network_resource_description,
+ surf_network_resource_description_size,
+ "SDP",
+ (surf_resource_t) surf_network_resource);
}
+#endif
