* under the terms of the license (GNU LGPL) which comes with this package. */
#include "network_private.h"
-
-#define SG_TCP_CTE_GAMMA 20000.0
+#include "xbt/log.h"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(network, surf,
"Logging specific to the SURF network module");
int card_number = 0;
network_link_CM02_t **routing_table = NULL;
int *routing_table_size = NULL;
+static network_link_CM02_t loopback = NULL;
static void create_routing_table(void)
{
static int network_card_new(const char *card_name)
{
- network_card_CM02_t card = NULL;
-
- xbt_dict_get(network_card_set, card_name, (void *) &card);
+ 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);
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++) {
- xbt_dict_get(network_link_set, links[i], (void *) &(link_list[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);
e_surf_network_link_sharing_policy_t policy_initial = SURF_NETWORK_LINK_SHARED;
tmgr_trace_t state_trace;
- name = xbt_strdup(A_network_link_name);
- surf_parse_get_double(&bw_initial,A_network_link_bandwidth);
- surf_parse_get_trace(&bw_trace, A_network_link_bandwidth_file);
- surf_parse_get_double(&lat_initial,A_network_link_latency);
- surf_parse_get_trace(&lat_trace, A_network_link_latency_file);
+ name = xbt_strdup(A_surfxml_network_link_name);
+ surf_parse_get_double(&bw_initial,A_surfxml_network_link_bandwidth);
+ surf_parse_get_trace(&bw_trace, A_surfxml_network_link_bandwidth_file);
+ surf_parse_get_double(&lat_initial,A_surfxml_network_link_latency);
+ surf_parse_get_trace(&lat_trace, A_surfxml_network_link_latency_file);
- xbt_assert0((A_network_link_state==A_network_link_state_ON)||
- (A_network_link_state==A_network_link_state_OFF),
- "Invalid state")
- if (A_network_link_state==A_network_link_state_ON)
+ xbt_assert0((A_surfxml_network_link_state==A_surfxml_network_link_state_ON)||
+ (A_surfxml_network_link_state==A_surfxml_network_link_state_OFF),
+ "Invalid state");
+ if (A_surfxml_network_link_state==A_surfxml_network_link_state_ON)
state_initial = SURF_NETWORK_LINK_ON;
- else if (A_network_link_state==A_network_link_state_OFF)
+ else if (A_surfxml_network_link_state==A_surfxml_network_link_state_OFF)
state_initial = SURF_NETWORK_LINK_OFF;
- if (A_network_link_sharing_policy==A_network_link_sharing_policy_SHARED)
+ if (A_surfxml_network_link_sharing_policy==A_surfxml_network_link_sharing_policy_SHARED)
policy_initial = SURF_NETWORK_LINK_SHARED;
- else if (A_network_link_sharing_policy==A_network_link_sharing_policy_FATPIPE)
+ else if (A_surfxml_network_link_sharing_policy==A_surfxml_network_link_sharing_policy_FATPIPE)
policy_initial = SURF_NETWORK_LINK_FATPIPE;
- surf_parse_get_trace(&state_trace,A_network_link_state_file);
+ surf_parse_get_trace(&state_trace,A_surfxml_network_link_state_file);
network_link_new(name, bw_initial, bw_trace,
lat_initial, lat_trace, state_initial, state_trace,
static void parse_route_set_endpoints(void)
{
- src_id = network_card_new(A_route_src);
- dst_id = network_card_new(A_route_dst);
+ src_id = network_card_new(A_surfxml_route_src);
+ dst_id = network_card_new(A_surfxml_route_dst);
nb_link = 0;
link_name = NULL;
}
{
nb_link++;
link_name = xbt_realloc(link_name, (nb_link) * sizeof(char *));
- link_name[(nb_link) - 1] = xbt_strdup(A_route_element_name);
+ link_name[(nb_link) - 1] = xbt_strdup(A_surfxml_route_element_name);
}
static void parse_route_set_route(void)
static void parse_file(const char *file)
{
+ int i;
+
/* Figuring out the network links */
surf_parse_reset_parser();
- ETag_network_link_fun=parse_network_link;
+ ETag_surfxml_network_link_fun=parse_network_link;
surf_parse_open(file);
xbt_assert1((!surf_parse()),"Parse error in %s",file);
surf_parse_close();
/* Figuring out the network cards used */
surf_parse_reset_parser();
- STag_route_fun=parse_route_set_endpoints;
+ STag_surfxml_route_fun=parse_route_set_endpoints;
surf_parse_open(file);
xbt_assert1((!surf_parse()),"Parse error in %s",file);
surf_parse_close();
/* Building the routes */
surf_parse_reset_parser();
- STag_route_fun=parse_route_set_endpoints;
- ETag_route_element_fun=parse_route_elem;
- ETag_route_fun=parse_route_set_route;
+ STag_surfxml_route_fun=parse_route_set_endpoints;
+ ETag_surfxml_route_element_fun=parse_route_elem;
+ ETag_surfxml_route_fun=parse_route_set_route;
surf_parse_open(file);
xbt_assert1((!surf_parse()),"Parse error in %s",file);
surf_parse_close();
+
+ /* Adding loopback if needed */
+
+ for (i = 0; i < card_number; i++)
+ if(!ROUTE_SIZE(i,i)) {
+ if(!loopback)
+ loopback = network_link_new(xbt_strdup("__MSG_loopback__"),
+ 498.00, NULL, 0.000015, NULL,
+ SURF_NETWORK_LINK_ON, NULL,
+ SURF_NETWORK_LINK_FATPIPE);
+ ROUTE_SIZE(i,i)=1;
+ ROUTE(i,i) = xbt_new0(network_link_CM02_t, 1);
+ ROUTE(i,i)[0] = loopback;
+ }
}
static void *name_service(const char *name)
{
- network_card_CM02_t card = NULL;
-
- xbt_dict_get(network_card_set, name, (void *) &card);
-
+ network_card_CM02_t card = xbt_dict_get_or_null(network_card_set, name);
return card;
}
surf_action_network_CM02_t next_action = NULL;
xbt_swag_t running_actions =
surf_network_resource->common_public->states.running_action_set;
+ /*
xbt_swag_t failed_actions =
surf_network_resource->common_public->states.failed_action_set;
+ */
xbt_swag_foreach_safe(action, next_action, running_actions) {
deltap = delta;
/* if(action->generic_action.remains<.00001) action->generic_action.remains=0; */
- if (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_change_state((surf_action_t) action, SURF_ACTION_DONE);
} else if ((action->generic_action.max_duration != NO_MAX_DURATION) &&
action->lat_current += delta;
if(action->rate<0)
lmm_update_variable_bound(maxmin_system, action->variable,
- SG_TCP_CTE_GAMMA / action->lat_current);
+ SG_TCP_CTE_GAMMA / (2.0 * action->lat_current));
else
lmm_update_variable_bound(maxmin_system, action->variable,
- min(action->rate,SG_TCP_CTE_GAMMA / action->lat_current));
+ min(action->rate,SG_TCP_CTE_GAMMA / (2.0 * action->lat_current)));
+ if(!(action->suspended))
+ lmm_update_variable_weight(maxmin_system, action->variable,
+ action->lat_current);
}
} else if (event_type == nw_link->state_event) {
if (value > 0)
network_link_CM02_t *route = ROUTE(card_src->id, card_dst->id);
int i;
+ XBT_IN4("(%s,%s,%g,%g)",card_src->name,card_dst->name,size,rate);
+ 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;
if(action->rate<0) {
if(action->lat_current>0)
lmm_update_variable_bound(maxmin_system, action->variable,
- SG_TCP_CTE_GAMMA / action->lat_current);
+ SG_TCP_CTE_GAMMA / (2.0 * action->lat_current));
else
lmm_update_variable_bound(maxmin_system, action->variable, -1.0);
} else {
if(action->lat_current>0)
lmm_update_variable_bound(maxmin_system, action->variable,
- min(action->rate,SG_TCP_CTE_GAMMA / action->lat_current));
+ min(action->rate,SG_TCP_CTE_GAMMA / (2.0 * action->lat_current)));
else
lmm_update_variable_bound(maxmin_system, action->variable, action->rate);
}
for (i = 0; i < route_size; i++)
lmm_expand(maxmin_system, route[i]->constraint, action->variable, 1.0);
-
- if(route_size == 0) {
- action_change_state((surf_action_t) action, SURF_ACTION_DONE);
- }
+ XBT_OUT;
return (surf_action_t) action;
}
static void action_resume(surf_action_t action)
{
lmm_update_variable_weight(maxmin_system,
- ((surf_action_network_CM02_t) action)->variable, 1.0);
+ ((surf_action_network_CM02_t) action)->variable,
+ action->lat_current);
((surf_action_network_CM02_t) action)->suspended = 0;
}
free(surf_network_resource);
surf_network_resource = NULL;
+ loopback = NULL;
for (i = 0; i < card_number; i++)
for (j = 0; j < card_number; j++)
free(ROUTE(i,j));
