* under the terms of the license (GNU LGPL) which comes with this package. */
#include "network_private.h"
-#include "cpu_private.h"
#include "xbt/log.h"
+#include "xbt/str.h"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_network, surf,
"Logging specific to the SURF network module");
if (!card) {
card = xbt_new0(s_network_card_CM02_t, 1);
card->name = xbt_strdup(card_name);
- card->id = card_number++;
+ card->id = host_number++;
xbt_dict_set(network_card_set, card_name, card, network_card_free);
}
return card->id;
src_id = network_card_new(A_surfxml_route_src);
dst_id = network_card_new(A_surfxml_route_dst);
route_action = A_surfxml_route_action;
- route_link_list = xbt_dynar_new(sizeof(char *), &free_string);
+ route_link_list = xbt_dynar_new(sizeof(char *), &xbt_free_ref);
}
static void parse_route_set_route(void)
src_id = strtol(xbt_dynar_get_as(keys, 0, char*), &end, 16);
dst_id = strtol(xbt_dynar_get_as(keys, 1, char*), &end, 16);
+ xbt_dynar_free(&keys);
-
xbt_dynar_foreach (links, cpt, link) {
TRY {
link_list[nb_link++] = xbt_dict_get(link_set, link);
host_number++;
}
-static int called = 0;
-static void add_traces(void)
-{
- xbt_dynar_t trace_connect = NULL;
- unsigned int cpt;
- int connect_element, connect_kind;
- char *value, *trace_id, *connector_id;
- link_CM02_t link;
- cpu_Cas01_t host = NULL;
- tmgr_trace_t trace;
+static void add_traces(void) {
+ xbt_dict_cursor_t cursor=NULL;
+ char *trace_name,*elm;
+ static int called = 0;
if (called) return;
called = 1;
- /*for all trace connects parse them and update traces for hosts or links */
- xbt_dynar_foreach (traces_connect_list, cpt, value) {
- trace_connect = xbt_str_split_str(value, "#");
- trace_id = xbt_dynar_get_as(trace_connect, 0, char*);
- connect_element = atoi(xbt_dynar_get_as(trace_connect, 1, char*));
- connect_kind = atoi(xbt_dynar_get_as(trace_connect, 2, char*));
- connector_id = xbt_dynar_get_as(trace_connect, 3, char*);
-
- xbt_assert1((trace = xbt_dict_get_or_null(traces_set_list, trace_id)), "Trace %s undefined", trace_id);
-
- if (connect_element == A_surfxml_trace_c_connect_element_HOST) {
- xbt_assert1((host = xbt_dict_get_or_null(cpu_set, connector_id)), "Host %s undefined", connector_id);
- switch (connect_kind) {
- case A_surfxml_trace_c_connect_kind_AVAILABILITY: host->state_event = tmgr_history_add_trace(history, trace, 0.0, 0, host); break;
- case A_surfxml_trace_c_connect_kind_POWER: host->power_event = tmgr_history_add_trace(history, trace, 0.0, 0, host); break;
- }
- }
-
- if (connect_element == A_surfxml_trace_c_connect_element_LINK) {
- xbt_assert1((link = xbt_dict_get_or_null(link_set, connector_id)), "Link %s undefined", connector_id);
- switch (connect_kind) {
- case A_surfxml_trace_c_connect_kind_AVAILABILITY: link->state_event = tmgr_history_add_trace(history, trace, 0.0, 0, link); break;
- case A_surfxml_trace_c_connect_kind_BANDWIDTH: link->bw_event = tmgr_history_add_trace(history, trace, 0.0, 0, link); break;
- case A_surfxml_trace_c_connect_kind_LATENCY: link->lat_event = tmgr_history_add_trace(history, trace, 0.0, 0, link); break;
- }
- }
+ /* connect all traces relative to network */
+ xbt_dict_foreach(trace_connect_list_link_avail, cursor, trace_name, elm) {
+ tmgr_trace_t trace = xbt_dict_get_or_null(traces_set_list, trace_name);
+ link_CM02_t link = xbt_dict_get_or_null(link_set, elm);
+
+ xbt_assert1(link, "Link %s undefined", elm);
+ xbt_assert1(trace, "Trace %s undefined", trace_name);
+
+ link->state_event = tmgr_history_add_trace(history, trace, 0.0, 0, link);
+ }
+
+ xbt_dict_foreach(trace_connect_list_bandwidth, cursor, trace_name, elm) {
+ tmgr_trace_t trace = xbt_dict_get_or_null(traces_set_list, trace_name);
+ link_CM02_t link = xbt_dict_get_or_null(link_set, elm);
+
+ xbt_assert1(link, "Link %s undefined", elm);
+ xbt_assert1(trace, "Trace %s undefined", trace_name);
+
+ link->bw_event = tmgr_history_add_trace(history, trace, 0.0, 0, link);
+ }
+
+ xbt_dict_foreach(trace_connect_list_latency, cursor, trace_name, elm) {
+ tmgr_trace_t trace = xbt_dict_get_or_null(traces_set_list, trace_name);
+ link_CM02_t link = xbt_dict_get_or_null(link_set, elm);
+
+ xbt_assert1(link, "Link %s undefined", elm);
+ xbt_assert1(trace, "Trace %s undefined", trace_name);
+
+ link->lat_event = tmgr_history_add_trace(history, trace, 0.0, 0, link);
}
- xbt_dynar_free(&trace_connect);
- xbt_dynar_free(&traces_connect_list);
+ xbt_dict_free(&trace_connect_list_host_avail);
+ xbt_dict_free(&trace_connect_list_power);
+ xbt_dict_free(&trace_connect_list_link_avail);
+ xbt_dict_free(&trace_connect_list_bandwidth);
+ xbt_dict_free(&trace_connect_list_latency);
+
xbt_dict_free(&traces_set_list);
}
if (action->generic_action.max_duration != NO_MAX_DURATION)
double_update(&(action->generic_action.max_duration), delta);
- /* if(action->generic_action.remains<.00001) action->generic_action.remains=0; */
-
if ((action->generic_action.remains <= 0) &&
(lmm_get_variable_weight(action->variable) > 0)) {
action->generic_action.finish = surf_get_clock();
(action->generic_action.max_duration <= 0)) {
action->generic_action.finish = surf_get_clock();
action_change_state((surf_action_t) action, SURF_ACTION_DONE);
- } else { /* Need to check that none of the model has failed */
- lmm_constraint_t cnst = NULL;
- int i = 0;
- link_CM02_t nw_link = NULL;
-
- while ((cnst =
- lmm_get_cnst_from_var(network_maxmin_system,
- action->variable, i++))) {
- nw_link = lmm_constraint_id(cnst);
- if (nw_link->state_current == SURF_LINK_OFF) {
- action->generic_action.finish = surf_get_clock();
- action_change_state((surf_action_t) action, SURF_ACTION_FAILED);
- break;
- }
- }
}
}
static void update_resource_state(void *id,
tmgr_trace_event_t event_type,
- double value)
+ double value, double date)
{
link_CM02_t nw_link = id;
/* printf("[" "%lg" "] Asking to update network card \"%s\" with value " */
} else if (event_type == nw_link->lat_event) {
double delta = value - nw_link->lat_current;
lmm_variable_t var = NULL;
+ lmm_element_t elem = NULL;
surf_action_network_CM02_t action = NULL;
nw_link->lat_current = value;
- while (lmm_get_var_from_cnst
- (network_maxmin_system, nw_link->constraint, &var)) {
+ while ((var= lmm_get_var_from_cnst
+ (network_maxmin_system, nw_link->constraint, &elem))) {
action = lmm_variable_id(var);
action->lat_current += delta;
if (action->rate < 0)
} else if (event_type == nw_link->state_event) {
if (value > 0)
nw_link->state_current = SURF_LINK_ON;
- else
+ else {
+ lmm_constraint_t cnst = nw_link->constraint;
+ lmm_variable_t var = NULL;
+ lmm_element_t elem = NULL;
+
nw_link->state_current = SURF_LINK_OFF;
+ while ((var= lmm_get_var_from_cnst
+ (network_maxmin_system, cnst, &elem))) {
+ surf_action_t action = lmm_variable_id(var) ;
+
+ if(surf_action_get_state(action)==SURF_ACTION_RUNNING ||
+ surf_action_get_state(action)==SURF_ACTION_READY) {
+ action->finish = date;
+ action_change_state( action, SURF_ACTION_FAILED);
+ }
+ }
+ }
} else {
CRITICAL0("Unknown event ! \n");
xbt_abort();
double rate)
{
surf_action_network_CM02_t action = NULL;
+ /* LARGE PLATFORMS HACK:
+ Add a link_CM02_t *link and a int link_nb to network_card_CM02_t. It will represent local links for this node
+ Use the cluster_id for ->id */
network_card_CM02_t card_src = src;
network_card_CM02_t card_dst = dst;
int route_size = ROUTE_SIZE(card_src->id, card_dst->id);
link_CM02_t *route = ROUTE(card_src->id, card_dst->id);
+ /* LARGE PLATFORMS HACK:
+ total_route_size = route_size + src->link_nb + dst->nb */
int i;
XBT_IN4("(%s,%s,%g,%g)", card_src->name, card_dst->name, size, rate);
+ /* LARGE PLATFORMS HACK:
+ assert on total_route_size */
xbt_assert2(route_size,
"You're trying to send data from %s to %s but there is no connexion between these two cards.",
card_src->name, card_dst->name);
calloc but it seems to help valgrind... */
action->generic_action.state_set =
surf_network_model->common_public->states.running_action_set;
-
+ for (i = 0; i < route_size; i++)
+ if(route[i]->state_current == SURF_LINK_OFF) {
+ action->generic_action.state_set =
+ surf_network_model->common_public->states.failed_action_set;
+ break;
+ }
+
xbt_swag_insert(action, action->generic_action.state_set);
action->rate = rate;
action->latency = 0.0;
for (i = 0; i < route_size; i++)
action->latency += route[i]->lat_current;
+ /* LARGE PLATFORMS HACK:
+ Add src->link and dst->link latencies */
action->lat_current = action->latency;
+ /* LARGE PLATFORMS HACK:
+ lmm_variable_new(..., total_route_size)*/
if (action->latency > 0)
action->variable =
lmm_variable_new(network_maxmin_system, action, 0.0, -1.0,
for (i = 0; i < route_size; i++)
lmm_expand(network_maxmin_system, route[i]->constraint,
action->variable, 1.0);
+ /* LARGE PLATFORMS HACK:
+ expand also with src->link and dst->link */
+
XBT_OUT;
return (surf_action_t) action;
surf_network_model = NULL;
loopback = NULL;
- for (i = 0; i < card_number; i++)
- for (j = 0; j < card_number; j++)
+ for (i = 0; i < host_number; i++)
+ for (j = 0; j < host_number; j++)
free(ROUTE(i, j));
free(routing_table);
routing_table = NULL;
free(routing_table_size);
routing_table_size = NULL;
- card_number = 0;
+ host_number = 0;
}
static void surf_network_model_init_internal(void)
