#include "network_dassf_private.h"
-#define SG_TCP_CTE_GAMMA 20000.0
-
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(network_dassf, surf,
- "Logging specific to the SURF network module");
+XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_network);
/* surf_network_resource_t surf_network_resource = NULL; */
static xbt_dict_t network_link_set = NULL;
static void network_link_free(void *nw_link)
{
- xbt_free(((network_link_DASSF_t)nw_link)->name);
- xbt_free(nw_link);
+ free(((network_link_DASSF_t)nw_link)->name);
+ free(nw_link);
}
static network_link_DASSF_t network_link_new(char *name,
static void network_card_free(void *nw_card)
{
- xbt_free(((network_card_DASSF_t)nw_card)->name);
- xbt_free(nw_card);
+ free(((network_card_DASSF_t)nw_card)->name);
+ free(nw_card);
}
static int network_card_new(const char *card_name)
{
- network_card_DASSF_t card = NULL;
-
- xbt_dict_get(network_card_set, card_name, (void *) &card);
+ network_card_DASSF_t card = xbt_dict_get_or_null(network_card_set, card_name);
if (!card) {
card = xbt_new0(s_network_card_DASSF_t, 1);
ROUTE_SIZE(src_id, dst_id) = nb_link;
link_list = (ROUTE(src_id, dst_id) = xbt_new0(network_link_DASSF_t, nb_link));
for (i = 0; i < nb_link; i++) {
- xbt_dict_get(network_link_set, links[i], (void *) &(link_list[i]));
- xbt_free(links[i]);
+ link_list[i] = xbt_dict_get_or_null(network_link_set, links[i]);
+ free(links[i]);
}
- xbt_free(links);
+ free(links);
}
static void parse_network_link(void)
e_surf_network_link_state_t state_initial = SURF_NETWORK_LINK_ON;
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;
- if (A_network_link_state==A_network_link_state_OFF)
+ if (A_surfxml_network_link_state==A_surfxml_network_link_state_OFF)
state_initial = SURF_NETWORK_LINK_OFF;
- 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)
{
/* 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();
static void *name_service(const char *name)
{
- network_card_DASSF_t card = NULL;
-
- xbt_dict_get(network_card_set, name, (void *) &card);
-
- return card;
+ return xbt_dict_get_or_null(network_card_set, name);
}
static const char *get_resource_name(void *resource_id)
((network_link_DASSF_t) resource_id)->constraint);
}
-static void action_free(surf_action_t action)
+static int action_free(surf_action_t action)
{
- xbt_swag_remove(action, action->state_set);
- if(((surf_action_network_DASSF_t)action)->variable)
- lmm_variable_free(maxmin_system, ((surf_action_network_DASSF_t)action)->variable);
- xbt_free(action);
-
- return;
+ action->using--;
+ if(!action->using) {
+ xbt_swag_remove(action, action->state_set);
+ if(((surf_action_network_DASSF_t)action)->variable)
+ lmm_variable_free(maxmin_system, ((surf_action_network_DASSF_t)action)->variable);
+ free(action);
+ }
+ return 1;
}
static void action_cancel(surf_action_t action)
static void action_change_state(surf_action_t action,
e_surf_action_state_t state)
{
- if((state==SURF_ACTION_DONE) || (state==SURF_ACTION_FAILED))
- if(((surf_action_network_DASSF_t)action)->variable) {
- lmm_variable_disable(maxmin_system, ((surf_action_network_DASSF_t)action)->variable);
- ((surf_action_network_DASSF_t)action)->variable = NULL;
- }
+/* if((state==SURF_ACTION_DONE) || (state==SURF_ACTION_FAILED)) */
+/* if(((surf_action_network_DASSF_t)action)->variable) { */
+/* lmm_variable_disable(maxmin_system, ((surf_action_network_DASSF_t)action)->variable); */
+/* ((surf_action_network_DASSF_t)action)->variable = NULL; */
+/* } */
surf_action_change_state(action, state);
return;
surf_action_network_DASSF_t next_action = NULL;
xbt_swag_t running_actions =
surf_network_resource->common_public->states.running_action_set;
+ /* KILLME: unused
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;
network_link_DASSF_t *route = ROUTE(card_src->id, card_dst->id);
int i;
+ 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_DASSF_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;
failed_action_set);
xbt_swag_free(surf_network_resource->common_public->states.
done_action_set);
- xbt_free(surf_network_resource->common_public);
- xbt_free(surf_network_resource->common_private);
- xbt_free(surf_network_resource->extension_public);
+ free(surf_network_resource->common_public);
+ free(surf_network_resource->common_private);
+ free(surf_network_resource->extension_public);
- xbt_free(surf_network_resource);
+ free(surf_network_resource);
surf_network_resource = NULL;
for (i = 0; i < card_number; i++)
for (j = 0; j < card_number; j++)
- xbt_free(ROUTE(i,j));
- xbt_free(routing_table);
+ free(ROUTE(i,j));
+ free(routing_table);
routing_table = NULL;
- xbt_free(routing_table_size);
+ free(routing_table_size);
routing_table_size = NULL;
card_number = 0;
}
