* 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");
+ "Logging specific to the SURF network module");
-surf_network_model_t surf_network_model = NULL;
+surf_model_t surf_network_model = NULL;
static lmm_system_t network_maxmin_system = NULL;
static void (*network_solve) (lmm_system_t) = NULL;
-xbt_dict_t link_set = NULL;
-xbt_dict_t network_card_set = NULL;
+double latency_factor = 1.0; /* default value */
+double bandwidth_factor = 1.0; /* default value */
+double weight_S_parameter = 0.0; /* default value */
-int card_number = 0;
-int host_number = 0;
-link_CM02_t **routing_table = NULL;
-int *routing_table_size = NULL;
-static link_CM02_t loopback = NULL;
+double sg_tcp_gamma = 0.0;
-static void create_routing_table(void)
-{
- routing_table =
- xbt_new0(link_CM02_t *, /*card_number * card_number */ host_number * host_number);
- routing_table_size = xbt_new0(int, /*card_number * card_number*/ host_number * host_number);
-}
-static void link_free(void *nw_link)
+static link_CM02_t net_link_new(char *name,
+ double bw_initial,
+ tmgr_trace_t bw_trace,
+ double lat_initial,
+ tmgr_trace_t lat_trace,
+ e_surf_resource_state_t
+ state_initial,
+ tmgr_trace_t state_trace,
+ e_surf_link_sharing_policy_t
+ policy, xbt_dict_t properties)
{
- free(((link_CM02_t) nw_link)->name);
- free(nw_link);
-}
+ link_CM02_t nw_link = (link_CM02_t)
+ surf_resource_lmm_new(sizeof(s_link_CM02_t),
+ surf_network_model, name, properties,
+ network_maxmin_system,
+ bandwidth_factor * bw_initial,
+ history,
+ state_initial, state_trace,
+ bw_initial, bw_trace);
+
+ xbt_assert1(!xbt_dict_get_or_null(surf_network_model->resource_set, name),
+ "Link '%s' declared several times in the platform file.", name);
-static link_CM02_t link_new(char *name,
- double bw_initial,
- tmgr_trace_t bw_trace,
- double lat_initial,
- tmgr_trace_t lat_trace,
- e_surf_link_state_t
- state_initial,
- tmgr_trace_t state_trace,
- e_surf_link_sharing_policy_t
- policy, xbt_dict_t properties)
-{
- link_CM02_t nw_link = xbt_new0(s_link_CM02_t, 1);
- xbt_assert1(!xbt_dict_get_or_null(link_set, name),
- "Link '%s' declared several times in the platform file.", name);
-
- nw_link->model = (surf_model_t) surf_network_model;
- nw_link->name = name;
- nw_link->bw_current = bw_initial;
- if (bw_trace)
- nw_link->bw_event =
- tmgr_history_add_trace(history, bw_trace, 0.0, 0, nw_link);
nw_link->lat_current = lat_initial;
if (lat_trace)
nw_link->lat_event =
- tmgr_history_add_trace(history, lat_trace, 0.0, 0, nw_link);
- nw_link->state_current = state_initial;
- if (state_trace)
- nw_link->state_event =
- tmgr_history_add_trace(history, state_trace, 0.0, 0, nw_link);
-
- nw_link->constraint =
- lmm_constraint_new(network_maxmin_system, nw_link,
- nw_link->bw_current);
+ tmgr_history_add_trace(history, lat_trace, 0.0, 0, nw_link);
if (policy == SURF_LINK_FATPIPE)
- lmm_constraint_shared(nw_link->constraint);
+ lmm_constraint_shared(nw_link->lmm_resource.constraint);
- nw_link->properties = properties;
-
- current_property_set = properties;
-
- xbt_dict_set(link_set, name, nw_link, link_free);
+ xbt_dict_set(surf_network_model->resource_set, name, nw_link,
+ surf_resource_free);
return nw_link;
}
-static void network_card_free(void *nw_card)
-{
- free(((network_card_CM02_t) nw_card)->name);
- free(nw_card);
-}
-
-static int network_card_new(const char *card_name)
-{
- network_card_CM02_t card =
- xbt_dict_get_or_null(network_card_set, card_name);
-
- if (!card) {
- card = xbt_new0(s_network_card_CM02_t, 1);
- card->name = xbt_strdup(card_name);
- card->id = card_number++;
- xbt_dict_set(network_card_set, card_name, card, network_card_free);
- }
- return card->id;
-}
-
-static void route_new(int src_id, int dst_id,
- link_CM02_t * link_list, int nb_link)
-{
- ROUTE_SIZE(src_id, dst_id) = nb_link;
- ROUTE(src_id, dst_id) = link_list =
- xbt_realloc(link_list, sizeof(link_CM02_t) * nb_link);
-}
-
-static void parse_link_init(void)
+static void net_parse_link_init(void)
{
char *name_link;
double bw_initial;
tmgr_trace_t bw_trace;
double lat_initial;
tmgr_trace_t lat_trace;
- e_surf_link_state_t state_initial_link = SURF_LINK_ON;
+ e_surf_resource_state_t state_initial_link = SURF_RESOURCE_ON;
e_surf_link_sharing_policy_t policy_initial_link = SURF_LINK_SHARED;
tmgr_trace_t state_trace;
name_link = xbt_strdup(A_surfxml_link_id);
surf_parse_get_double(&bw_initial, A_surfxml_link_bandwidth);
- surf_parse_get_trace(&bw_trace, A_surfxml_link_bandwidth_file);
+ bw_trace = tmgr_trace_new(A_surfxml_link_bandwidth_file);
surf_parse_get_double(&lat_initial, A_surfxml_link_latency);
- surf_parse_get_trace(&lat_trace, A_surfxml_link_latency_file);
+ lat_trace = tmgr_trace_new(A_surfxml_link_latency_file);
- xbt_assert0((A_surfxml_link_state ==
- A_surfxml_link_state_ON)
- || (A_surfxml_link_state ==
- A_surfxml_link_state_OFF), "Invalid state");
+ xbt_assert0((A_surfxml_link_state == A_surfxml_link_state_ON)
+ || (A_surfxml_link_state ==
+ A_surfxml_link_state_OFF), "Invalid state");
if (A_surfxml_link_state == A_surfxml_link_state_ON)
- state_initial_link = SURF_LINK_ON;
- else if (A_surfxml_link_state ==
- A_surfxml_link_state_OFF)
- state_initial_link = SURF_LINK_OFF;
+ state_initial_link = SURF_RESOURCE_ON;
+ else if (A_surfxml_link_state == A_surfxml_link_state_OFF)
+ state_initial_link = SURF_RESOURCE_OFF;
- if (A_surfxml_link_sharing_policy ==
- A_surfxml_link_sharing_policy_SHARED)
+ if (A_surfxml_link_sharing_policy == A_surfxml_link_sharing_policy_SHARED)
policy_initial_link = SURF_LINK_SHARED;
else if (A_surfxml_link_sharing_policy ==
- A_surfxml_link_sharing_policy_FATPIPE)
+ A_surfxml_link_sharing_policy_FATPIPE)
policy_initial_link = SURF_LINK_FATPIPE;
- surf_parse_get_trace(&state_trace, A_surfxml_link_state_file);
+ state_trace = tmgr_trace_new(A_surfxml_link_state_file);
- link_new(name_link, bw_initial, bw_trace,
- lat_initial, lat_trace, state_initial_link, state_trace,
- policy_initial_link, xbt_dict_new());
+ net_link_new(name_link, bw_initial, bw_trace,
+ lat_initial, lat_trace, state_initial_link, state_trace,
+ policy_initial_link, xbt_dict_new());
}
-static int src_id = -1;
-static int dst_id = -1;
-
-static void parse_route_set_endpoints(void)
+static void net_add_traces(void)
{
- 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);
-}
+ xbt_dict_cursor_t cursor = NULL;
+ char *trace_name, *elm;
-static void parse_route_set_route(void)
-{
- char *name;
- if (src_id != -1 && dst_id != -1) {
- name = bprintf("%x#%x",src_id, dst_id);
- manage_route(route_table, name, route_action, 0);
- free(name);
- }
-}
+ static int called = 0;
+ if (called)
+ return;
+ called = 1;
-static void add_loopback(void)
-{
- int i;
- /* Adding loopback if needed */
- for (i = 0; i < host_number; i++)
- if (!ROUTE_SIZE(i, i)) {
- if (!loopback)
- loopback = link_new(xbt_strdup("__MSG_loopback__"),
- 498000000, NULL, 0.000015, NULL,
- SURF_LINK_ON, NULL,
- SURF_LINK_FATPIPE,NULL);
- ROUTE_SIZE(i, i) = 1;
- ROUTE(i, i) = xbt_new0(link_CM02_t, 1);
- ROUTE(i, i)[0] = loopback;
- }
-}
+ /* 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(surf_network_model->resource_set, elm);
-static void add_route(void)
-{
- xbt_ex_t e;
- int nb_link = 0;
- unsigned int cpt = 0;
- int link_list_capacity = 0;
- link_CM02_t *link_list = NULL;
- xbt_dict_cursor_t cursor = NULL;
- char *key,*data, *end;
- const char *sep = "#";
- xbt_dynar_t links, keys;
-
- if (routing_table == NULL) create_routing_table();
-
- xbt_dict_foreach(route_table, cursor, key, data) {
- char* link = NULL;
- nb_link = 0;
- links = (xbt_dynar_t)data;
- keys = xbt_str_split_str(key, sep);
-
- link_list_capacity = xbt_dynar_length(links);
- link_list = xbt_new(link_CM02_t, link_list_capacity);
-
- 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_foreach (links, cpt, link) {
- TRY {
- link_list[nb_link++] = xbt_dict_get(link_set, link);
- }
- CATCH(e) {
- RETHROW1("Link %s not found (dict raised this exception: %s)", link);
- }
- }
- route_new(src_id, dst_id, link_list, nb_link);
- }
+ xbt_assert2(link, "Cannot connect trace %s to link %s: link undefined",
+ trace_name, elm);
+ xbt_assert2(trace, "Cannot connect trace %s to link %s: trace undefined",
+ trace_name, elm);
- xbt_dict_free(&route_table);
+ link->lmm_resource.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(surf_network_model->resource_set, elm);
-static void count_hosts(void)
-{
- host_number++;
-}
+ xbt_assert2(link, "Cannot connect trace %s to link %s: link undefined",
+ trace_name, elm);
+ xbt_assert2(trace, "Cannot connect trace %s to link %s: trace undefined",
+ trace_name, elm);
+ link->lmm_resource.power.event =
+ tmgr_history_add_trace(history, trace, 0.0, 0, link);
+ }
-static void add_traces(void) {
- xbt_dict_cursor_t cursor=NULL;
- char *trace_name,*elm;
-
- static int called = 0;
- if (called) return;
- called = 1;
-
- /* 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_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);
-}
+ 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(surf_network_model->resource_set, elm);
-static void define_callbacks(const char *file)
-{
- /* Figuring out the network links */
- surfxml_add_callback(STag_surfxml_host_cb_list, &count_hosts);
- surfxml_add_callback(STag_surfxml_link_cb_list, &parse_link_init);
- surfxml_add_callback(STag_surfxml_prop_cb_list, &parse_properties);
- surfxml_add_callback(STag_surfxml_route_cb_list, &parse_route_set_endpoints);
- surfxml_add_callback(ETag_surfxml_link_c_ctn_cb_list, &parse_route_elem);
- surfxml_add_callback(ETag_surfxml_route_cb_list, &parse_route_set_route);
- surfxml_add_callback(STag_surfxml_platform_cb_list, &init_data);
- surfxml_add_callback(ETag_surfxml_platform_cb_list, &add_traces);
- surfxml_add_callback(ETag_surfxml_platform_cb_list, &add_route);
- surfxml_add_callback(ETag_surfxml_platform_cb_list, &add_loopback);
- surfxml_add_callback(STag_surfxml_set_cb_list, &parse_sets);
- surfxml_add_callback(STag_surfxml_route_c_multi_cb_list, &parse_route_multi_set_endpoints);
- surfxml_add_callback(ETag_surfxml_route_c_multi_cb_list, &parse_route_multi_set_route);
- surfxml_add_callback(STag_surfxml_foreach_cb_list, &parse_foreach);
- surfxml_add_callback(STag_surfxml_cluster_cb_list, &parse_cluster);
- surfxml_add_callback(STag_surfxml_trace_cb_list, &parse_trace_init);
- surfxml_add_callback(ETag_surfxml_trace_cb_list, &parse_trace_finalize);
- surfxml_add_callback(STag_surfxml_trace_c_connect_cb_list, &parse_trace_c_connect);
-}
+ xbt_assert2(link, "Cannot connect trace %s to link %s: link undefined",
+ trace_name, elm);
+ xbt_assert2(trace, "Cannot connect trace %s to link %s: trace undefined",
+ trace_name, elm);
-static void *name_service(const char *name)
-{
- network_card_CM02_t card = xbt_dict_get_or_null(network_card_set, name);
- return card;
+ link->lat_event = tmgr_history_add_trace(history, trace, 0.0, 0, link);
+ }
}
-static const char *get_resource_name(void *resource_id)
+static void net_define_callbacks(const char *file)
{
- return ((network_card_CM02_t) resource_id)->name;
+ /* Figuring out the network links */
+ surfxml_add_callback(STag_surfxml_link_cb_list, &net_parse_link_init);
+ surfxml_add_callback(ETag_surfxml_platform_cb_list, &net_add_traces);
}
-static int resource_used(void *resource_id)
+static int net_resource_used(void *resource_id)
{
return lmm_constraint_used(network_maxmin_system,
- ((link_CM02_t) resource_id)->
- constraint);
+ ((surf_resource_lmm_t) resource_id)->constraint);
}
-static int action_free(surf_action_t action)
+static int net_action_unref(surf_action_t action)
{
- action->using--;
- if (!action->using) {
+ action->refcount--;
+ if (!action->refcount) {
xbt_swag_remove(action, action->state_set);
if (((surf_action_network_CM02_t) action)->variable)
lmm_variable_free(network_maxmin_system,
- ((surf_action_network_CM02_t) action)->variable);
+ ((surf_action_network_CM02_t) action)->variable);
free(action);
return 1;
}
return 0;
}
-static void action_use(surf_action_t action)
-{
- action->using++;
-}
-
-static void action_cancel(surf_action_t action)
+static void net_action_cancel(surf_action_t action)
{
+ surf_network_model->action_state_set((surf_action_t) action,
+ SURF_ACTION_FAILED);
return;
}
-static void action_recycle(surf_action_t action)
+static void net_action_recycle(surf_action_t action)
{
return;
}
-static void action_change_state(surf_action_t action,
- e_surf_action_state_t state)
+static double net_action_get_remains(surf_action_t action)
{
-/* if((state==SURF_ACTION_DONE) || (state==SURF_ACTION_FAILED)) */
-/* if(((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; */
-/* } */
-
- surf_action_change_state(action, state);
- return;
+ return action->remains;
}
-static double share_resources(double now)
+static double net_share_resources(double now)
{
s_surf_action_network_CM02_t s_action;
surf_action_network_CM02_t action = NULL;
- xbt_swag_t running_actions =
- surf_network_model->common_public->states.running_action_set;
+ xbt_swag_t running_actions = surf_network_model->states.running_action_set;
double min;
min = generic_maxmin_share_resources(running_actions,
- xbt_swag_offset(s_action,
- variable),
- network_maxmin_system,
- network_solve);
+ xbt_swag_offset(s_action,
+ variable),
+ network_maxmin_system, network_solve);
+
+#define VARIABLE(action) (*((lmm_variable_t*)(((char *) (action)) + xbt_swag_offset(s_action, variable) )))
xbt_swag_foreach(action, running_actions) {
if (action->latency > 0) {
if (min < 0)
- min = action->latency;
+ min = action->latency;
else if (action->latency < min)
- min = action->latency;
+ min = action->latency;
}
}
return min;
}
-static void update_actions_state(double now, double delta)
+static void net_update_actions_state(double now, double delta)
{
double deltap = 0.0;
surf_action_network_CM02_t action = NULL;
surf_action_network_CM02_t next_action = NULL;
- xbt_swag_t running_actions =
- surf_network_model->common_public->states.running_action_set;
+ xbt_swag_t running_actions = surf_network_model->states.running_action_set;
/*
xbt_swag_t failed_actions =
- surf_network_model->common_public->states.failed_action_set;
+ surf_network_model->states.failed_action_set;
*/
xbt_swag_foreach_safe(action, next_action, running_actions) {
deltap = delta;
if (action->latency > 0) {
if (action->latency > deltap) {
- double_update(&(action->latency), deltap);
- deltap = 0.0;
+ double_update(&(action->latency), deltap);
+ deltap = 0.0;
} else {
- double_update(&(deltap), action->latency);
- action->latency = 0.0;
+ double_update(&(deltap), action->latency);
+ action->latency = 0.0;
}
if ((action->latency == 0.0) && !(action->suspended))
- lmm_update_variable_weight(network_maxmin_system, action->variable,
- action->lat_current);
+ lmm_update_variable_weight(network_maxmin_system, action->variable,
+ action->weight);
}
double_update(&(action->generic_action.remains),
- lmm_variable_getvalue(action->variable) * deltap);
+ lmm_variable_getvalue(action->variable) * deltap);
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)) {
+ (lmm_get_variable_weight(action->variable) > 0)) {
action->generic_action.finish = surf_get_clock();
- action_change_state((surf_action_t) action, SURF_ACTION_DONE);
- } else if ((action->generic_action.max_duration != NO_MAX_DURATION) &&
- (action->generic_action.max_duration <= 0)) {
+ surf_network_model->action_state_set((surf_action_t) action,
+ SURF_ACTION_DONE);
+ } else if ((action->generic_action.max_duration != NO_MAX_DURATION)
+ && (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;
- }
- }
+ surf_network_model->action_state_set((surf_action_t) action,
+ SURF_ACTION_DONE);
}
}
return;
}
-static void update_resource_state(void *id,
- tmgr_trace_event_t event_type,
- double value)
+static void net_update_resource_state(void *id,
+ tmgr_trace_event_t event_type,
+ double value, double date)
{
link_CM02_t nw_link = id;
/* printf("[" "%lg" "] Asking to update network card \"%s\" with value " */
/* "%lg" " for event %p\n", surf_get_clock(), nw_link->name, */
/* value, event_type); */
- if (event_type == nw_link->bw_event) {
- nw_link->bw_current = value;
- lmm_update_constraint_bound(network_maxmin_system, nw_link->constraint,
- nw_link->bw_current);
+ if (event_type == nw_link->lmm_resource.power.event) {
+ double delta =
+ weight_S_parameter / value - weight_S_parameter /
+ (nw_link->lmm_resource.power.peak * nw_link->lmm_resource.power.scale);
+ lmm_variable_t var = NULL;
+ lmm_element_t elem = NULL;
+ surf_action_network_CM02_t action = NULL;
+
+ nw_link->lmm_resource.power.peak = value;
+ lmm_update_constraint_bound(network_maxmin_system,
+ nw_link->lmm_resource.constraint,
+ bandwidth_factor *
+ (nw_link->lmm_resource.power.peak *
+ nw_link->lmm_resource.power.scale));
+ if (weight_S_parameter > 0) {
+ while ((var = lmm_get_var_from_cnst
+ (network_maxmin_system, nw_link->lmm_resource.constraint,
+ &elem))) {
+ action = lmm_variable_id(var);
+ action->weight += delta;
+ if (!(action->suspended))
+ lmm_update_variable_weight(network_maxmin_system, action->variable,
+ action->weight);
+ }
+ }
+ if (tmgr_trace_event_free(event_type))
+ nw_link->lmm_resource.power.event = NULL;
} 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->lmm_resource.constraint,
+ &elem))) {
action = lmm_variable_id(var);
action->lat_current += delta;
+ action->weight += delta;
if (action->rate < 0)
- lmm_update_variable_bound(network_maxmin_system, action->variable,
- SG_TCP_CTE_GAMMA / (2.0 *
- action->
- lat_current));
+ lmm_update_variable_bound(network_maxmin_system, action->variable,
+ sg_tcp_gamma / (2.0 * action->lat_current));
else
- lmm_update_variable_bound(network_maxmin_system, action->variable,
- min(action->rate,
- SG_TCP_CTE_GAMMA / (2.0 *
- action->
- lat_current)));
+ lmm_update_variable_bound(network_maxmin_system, action->variable,
+ min(action->rate,
+ sg_tcp_gamma / (2.0 *
+ action->lat_current)));
if (!(action->suspended))
- lmm_update_variable_weight(network_maxmin_system, action->variable,
- action->lat_current);
- lmm_update_variable_latency(network_maxmin_system, action->variable,
- delta);
+ lmm_update_variable_weight(network_maxmin_system, action->variable,
+ action->weight);
+
}
- } else if (event_type == nw_link->state_event) {
+ if (tmgr_trace_event_free(event_type))
+ nw_link->lat_event = NULL;
+ } else if (event_type == nw_link->lmm_resource.state_event) {
if (value > 0)
- nw_link->state_current = SURF_LINK_ON;
- else
- nw_link->state_current = SURF_LINK_OFF;
+ nw_link->lmm_resource.state_current = SURF_RESOURCE_ON;
+ else {
+ lmm_constraint_t cnst = nw_link->lmm_resource.constraint;
+ lmm_variable_t var = NULL;
+ lmm_element_t elem = NULL;
+
+ nw_link->lmm_resource.state_current = SURF_RESOURCE_OFF;
+ while ((var = lmm_get_var_from_cnst
+ (network_maxmin_system, cnst, &elem))) {
+ surf_action_t action = lmm_variable_id(var);
+
+ if (surf_action_state_get(action) == SURF_ACTION_RUNNING ||
+ surf_action_state_get(action) == SURF_ACTION_READY) {
+ action->finish = date;
+ surf_network_model->action_state_set(action, SURF_ACTION_FAILED);
+ }
+ }
+ }
+ if (tmgr_trace_event_free(event_type))
+ nw_link->lmm_resource.state_event = NULL;
} else {
CRITICAL0("Unknown event ! \n");
xbt_abort();
return;
}
-static surf_action_t communicate(void *src, void *dst, double size,
- double rate)
+static surf_action_t net_communicate(const char *src_name, const char *dst_name,
+ int src, int dst, double size, 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);
+ xbt_dynar_t route = used_routing->get_route(src, dst);
/* LARGE PLATFORMS HACK:
total_route_size = route_size + src->link_nb + dst->nb */
- int i;
+ unsigned int i;
- XBT_IN4("(%s,%s,%g,%g)", card_src->name, card_dst->name, size, rate);
+ XBT_IN4("(%s,%s,%g,%g)", src_name, 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);
-
- action = xbt_new0(s_surf_action_network_CM02_t, 1);
-
- action->generic_action.using = 1;
- action->generic_action.cost = size;
- action->generic_action.remains = size;
- action->generic_action.max_duration = NO_MAX_DURATION;
- action->generic_action.start = surf_get_clock();
- action->generic_action.finish = -1.0;
- action->generic_action.model_type =
- (surf_model_t) surf_network_model;
- action->suspended = 0; /* Should be useless because of the
- calloc but it seems to help valgrind... */
- action->generic_action.state_set =
- surf_network_model->common_public->states.running_action_set;
+ xbt_assert2(xbt_dynar_length(route),
+ "You're trying to send data from %s to %s but there is no connection between these two hosts.",
+ src_name, dst_name);
+
+ link_CM02_t link;
+ int failed = 0;
+ xbt_dynar_foreach(route, i, link) {
+ if (link->lmm_resource.state_current == SURF_RESOURCE_OFF) {
+ failed = 1;
+ break;
+ }
+ }
+ action =
+ surf_action_new(sizeof(s_surf_action_network_CM02_t), size,
+ surf_network_model, failed);
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;
+ action->weight = 0.0;
+ xbt_dynar_foreach(route, i, link) {
+ action->latency += link->lat_current;
+ action->weight +=
+ link->lat_current +
+ weight_S_parameter /
+ (link->lmm_resource.power.peak * link->lmm_resource.power.scale);
+ }
/* LARGE PLATFORMS HACK:
Add src->link and dst->link latencies */
action->lat_current = action->latency;
+ action->latency *= latency_factor;
/* LARGE PLATFORMS HACK:
- lmm_variable_new(..., total_route_size)*/
+ lmm_variable_new(..., total_route_size) */
if (action->latency > 0)
action->variable =
- lmm_variable_new(network_maxmin_system, action, 0.0, -1.0,
- route_size);
+ lmm_variable_new(network_maxmin_system, action, 0.0, -1.0,
+ xbt_dynar_length(route));
else
action->variable =
- lmm_variable_new(network_maxmin_system, action, 1.0, -1.0,
- route_size);
+ lmm_variable_new(network_maxmin_system, action, 1.0, -1.0,
+ xbt_dynar_length(route));
if (action->rate < 0) {
if (action->lat_current > 0)
lmm_update_variable_bound(network_maxmin_system, action->variable,
- SG_TCP_CTE_GAMMA / (2.0 *
- action->lat_current));
+ sg_tcp_gamma / (2.0 * action->lat_current));
else
lmm_update_variable_bound(network_maxmin_system, action->variable,
- -1.0);
+ -1.0);
} else {
if (action->lat_current > 0)
lmm_update_variable_bound(network_maxmin_system, action->variable,
- min(action->rate,
- SG_TCP_CTE_GAMMA / (2.0 *
- action->
- lat_current)));
+ min(action->rate,
+ sg_tcp_gamma / (2.0 *
+ action->lat_current)));
else
lmm_update_variable_bound(network_maxmin_system, action->variable,
- action->rate);
+ action->rate);
}
- lmm_update_variable_latency(network_maxmin_system, action->variable,
- action->latency);
- for (i = 0; i < route_size; i++)
- lmm_expand(network_maxmin_system, route[i]->constraint,
- action->variable, 1.0);
+ xbt_dynar_foreach(route, i, link) {
+ lmm_expand(network_maxmin_system, link->lmm_resource.constraint,
+ action->variable, 1.0);
+ }
/* LARGE PLATFORMS HACK:
expand also with src->link and dst->link */
return (surf_action_t) action;
}
-/* returns an array of 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 ((link_CM02_t) link)->name;
-}
-
-static double get_link_bandwidth(const void *link)
+static double net_get_link_bandwidth(const void *link)
{
- return ((link_CM02_t) link)->bw_current;
+ surf_resource_lmm_t lmm = (surf_resource_lmm_t) link;
+ return lmm->power.peak * lmm->power.scale;
}
-static double get_link_latency(const void *link)
+static double net_get_link_latency(const void *link)
{
return ((link_CM02_t) link)->lat_current;
}
-static xbt_dict_t get_properties(void *link)
+static int net_link_shared(const void *link)
{
- return ((link_CM02_t) link)->properties;
+ return lmm_constraint_is_shared(((surf_resource_lmm_t) link)->constraint);
}
-static void action_suspend(surf_action_t action)
+static void net_action_suspend(surf_action_t action)
{
((surf_action_network_CM02_t) action)->suspended = 1;
lmm_update_variable_weight(network_maxmin_system,
- ((surf_action_network_CM02_t) action)->
- variable, 0.0);
+ ((surf_action_network_CM02_t) action)->variable,
+ 0.0);
}
-static void action_resume(surf_action_t action)
+static void net_action_resume(surf_action_t action)
{
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)->variable,
+ ((surf_action_network_CM02_t) action)->weight);
((surf_action_network_CM02_t) action)->suspended = 0;
}
}
-static int action_is_suspended(surf_action_t action)
+static int net_action_is_suspended(surf_action_t action)
{
return ((surf_action_network_CM02_t) action)->suspended;
}
-static void action_set_max_duration(surf_action_t action, double duration)
+static void net_action_set_max_duration(surf_action_t action, double duration)
{
action->max_duration = duration;
}
-static void finalize(void)
+static void net_finalize(void)
{
- int i, j;
-
- xbt_dict_free(&network_card_set);
- xbt_dict_free(&link_set);
- xbt_swag_free(surf_network_model->common_public->states.
- ready_action_set);
- xbt_swag_free(surf_network_model->common_public->states.
- running_action_set);
- xbt_swag_free(surf_network_model->common_public->states.
- failed_action_set);
- xbt_swag_free(surf_network_model->common_public->states.
- done_action_set);
- free(surf_network_model->common_public);
- free(surf_network_model->common_private);
- free(surf_network_model->extension_public);
-
- free(surf_network_model);
+ surf_model_exit(surf_network_model);
surf_network_model = NULL;
- loopback = NULL;
- for (i = 0; i < card_number; i++)
- for (j = 0; j < card_number; j++)
- free(ROUTE(i, j));
- free(routing_table);
- routing_table = NULL;
- free(routing_table_size);
- routing_table_size = NULL;
- card_number = 0;
+ used_routing->finalize();
+ lmm_system_free(network_maxmin_system);
+ network_maxmin_system = NULL;
}
static void surf_network_model_init_internal(void)
{
- s_surf_action_t action;
-
- surf_network_model = xbt_new0(s_surf_network_model_t, 1);
-
- surf_network_model->common_private =
- xbt_new0(s_surf_model_private_t, 1);
- surf_network_model->common_public =
- xbt_new0(s_surf_model_public_t, 1);
- surf_network_model->extension_public =
- xbt_new0(s_surf_network_model_extension_public_t, 1);
-
- surf_network_model->common_public->states.ready_action_set =
- xbt_swag_new(xbt_swag_offset(action, state_hookup));
- surf_network_model->common_public->states.running_action_set =
- xbt_swag_new(xbt_swag_offset(action, state_hookup));
- surf_network_model->common_public->states.failed_action_set =
- xbt_swag_new(xbt_swag_offset(action, state_hookup));
- surf_network_model->common_public->states.done_action_set =
- xbt_swag_new(xbt_swag_offset(action, state_hookup));
-
- surf_network_model->common_public->name_service = name_service;
- surf_network_model->common_public->get_resource_name =
- get_resource_name;
- surf_network_model->common_public->action_get_state =
- surf_action_get_state;
- surf_network_model->common_public->action_get_start_time =
- surf_action_get_start_time;
- surf_network_model->common_public->action_get_finish_time =
- surf_action_get_finish_time;
- surf_network_model->common_public->action_free = action_free;
- surf_network_model->common_public->action_use = action_use;
- surf_network_model->common_public->action_cancel = action_cancel;
- surf_network_model->common_public->action_recycle = action_recycle;
- surf_network_model->common_public->action_change_state =
- action_change_state;
- surf_network_model->common_public->action_set_data =
- surf_action_set_data;
- surf_network_model->common_public->name = "network";
-
- surf_network_model->common_private->resource_used = resource_used;
- surf_network_model->common_private->share_resources = share_resources;
- surf_network_model->common_private->update_actions_state =
- update_actions_state;
- surf_network_model->common_private->update_resource_state =
- update_resource_state;
- surf_network_model->common_private->finalize = finalize;
-
- surf_network_model->common_public->suspend = action_suspend;
- surf_network_model->common_public->resume = action_resume;
- surf_network_model->common_public->is_suspended = action_is_suspended;
- surf_cpu_model->common_public->set_max_duration =
- action_set_max_duration;
-
- surf_network_model->extension_public->communicate = communicate;
- surf_network_model->extension_public->get_route = get_route;
- surf_network_model->extension_public->get_route_size = get_route_size;
- surf_network_model->extension_public->get_link_name = get_link_name;
- surf_network_model->extension_public->get_link_bandwidth =
- get_link_bandwidth;
- surf_network_model->extension_public->get_link_latency =
- get_link_latency;
-
- surf_network_model->common_public->get_properties = get_properties;
-
- link_set = xbt_dict_new();
- network_card_set = xbt_dict_new();
+ surf_network_model = surf_model_init();
+
+ surf_network_model->name = "network";
+ surf_network_model->action_unref = net_action_unref;
+ surf_network_model->action_cancel = net_action_cancel;
+ surf_network_model->action_recycle = net_action_recycle;
+ surf_network_model->get_remains = net_action_get_remains;
+
+ surf_network_model->model_private->resource_used = net_resource_used;
+ surf_network_model->model_private->share_resources = net_share_resources;
+ surf_network_model->model_private->update_actions_state =
+ net_update_actions_state;
+ surf_network_model->model_private->update_resource_state =
+ net_update_resource_state;
+ surf_network_model->model_private->finalize = net_finalize;
+
+ surf_network_model->suspend = net_action_suspend;
+ surf_network_model->resume = net_action_resume;
+ surf_network_model->is_suspended = net_action_is_suspended;
+ surf_cpu_model->set_max_duration = net_action_set_max_duration;
+
+ surf_network_model->extension.network.communicate = net_communicate;
+ surf_network_model->extension.network.get_link_bandwidth =
+ net_get_link_bandwidth;
+ surf_network_model->extension.network.get_link_latency = net_get_link_latency;
+ surf_network_model->extension.network.link_shared = net_link_shared;
if (!network_maxmin_system)
network_maxmin_system = lmm_system_new();
+
+ routing_model_create(sizeof(link_CM02_t),
+ net_link_new(xbt_strdup("__loopback__"),
+ 498000000, NULL, 0.000015, NULL,
+ SURF_RESOURCE_ON, NULL, SURF_LINK_FATPIPE,
+ NULL));
+}
+
+/************************************************************************/
+/* New model based on optimizations discussed during this thesis */
+/************************************************************************/
+void surf_network_model_init_LegrandVelho(const char *filename)
+{
+
+ if (surf_network_model)
+ return;
+ surf_network_model_init_internal();
+ net_define_callbacks(filename);
+ xbt_dynar_push(model_list, &surf_network_model);
+ network_solve = lmm_solve;
+
+ latency_factor = 10.4;
+ bandwidth_factor = 0.92;
+ weight_S_parameter = 8775;
+
+ update_model_description(surf_network_model_description,
+ "LV08", surf_network_model);
}
/***************************************************************************/
if (surf_network_model)
return;
surf_network_model_init_internal();
- define_callbacks(filename);
+ net_define_callbacks(filename);
xbt_dynar_push(model_list, &surf_network_model);
network_solve = lmm_solve;
update_model_description(surf_network_model_description,
- surf_network_model_description_size,
- "CM02",
- (surf_model_t) surf_network_model);
+ "CM02", surf_network_model);
}
void surf_network_model_init_Reno(const char *filename)
if (surf_network_model)
return;
surf_network_model_init_internal();
- define_callbacks(filename);
+ net_define_callbacks(filename);
xbt_dynar_push(model_list, &surf_network_model);
- lmm_set_default_protocol_function(func_reno_f, func_reno_fp,
- func_reno_fpi);
+ lmm_set_default_protocol_function(func_reno_f, func_reno_fp, func_reno_fpi);
network_solve = lagrange_solve;
+ latency_factor = 10.4;
+ bandwidth_factor = 0.92;
+ weight_S_parameter = 8775;
+
update_model_description(surf_network_model_description,
- surf_network_model_description_size,
- "Reno",
- (surf_model_t) surf_network_model);
+ "Reno", surf_network_model);
}
-void surf_network_model_init_Vegas(const char *filename)
+
+void surf_network_model_init_Reno2(const char *filename)
{
if (surf_network_model)
return;
surf_network_model_init_internal();
- define_callbacks(filename);
+ net_define_callbacks(filename);
xbt_dynar_push(model_list, &surf_network_model);
- lmm_set_default_protocol_function(func_vegas_f, func_vegas_fp,
- func_vegas_fpi);
+ lmm_set_default_protocol_function(func_reno2_f, func_reno2_fp,
+ func_reno2_fpi);
network_solve = lagrange_solve;
+ latency_factor = 10.4;
+ bandwidth_factor = 0.92;
+ weight_S_parameter = 8775;
+
update_model_description(surf_network_model_description,
- surf_network_model_description_size,
- "Vegas",
- (surf_model_t) surf_network_model);
+ "Reno2", surf_network_model);
}
-#ifdef HAVE_SDP
-void surf_network_model_init_SDP(const char *filename)
+void surf_network_model_init_Vegas(const char *filename)
{
if (surf_network_model)
return;
surf_network_model_init_internal();
- define_callbacks(filename);
+ net_define_callbacks(filename);
xbt_dynar_push(model_list, &surf_network_model);
- network_solve = sdp_solve;
+ lmm_set_default_protocol_function(func_vegas_f, func_vegas_fp,
+ func_vegas_fpi);
+ network_solve = lagrange_solve;
+
+ latency_factor = 10.4;
+ bandwidth_factor = 0.92;
+ weight_S_parameter = 8775;
update_model_description(surf_network_model_description,
- surf_network_model_description_size,
- "SDP",
- (surf_model_t) surf_network_model);
+ "Vegas", surf_network_model);
}
-#endif