#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;
+/*xbt_dict_t network_link_set = NULL;*/
/* xbt_dict_t network_card_set = NULL; */
static int card_number = 0;
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);
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_DASSF_t *link_list, int nb_link)
{
- network_link_DASSF_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_DASSF_t, nb_link));
- for (i = 0; i < nb_link; i++) {
- xbt_dict_get(network_link_set, links[i], (void *) &(link_list[i]));
- free(links[i]);
- }
- free(links);
+ ROUTE(src_id, dst_id) = link_list = xbt_realloc(link_list, sizeof(network_link_DASSF_t) * nb_link);
}
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 int nb_link = 0;
-static char **link_name = NULL;
+static int nb_link;
+static int link_list_capacity;
+static network_link_DASSF_t *link_list = NULL;
static int src_id = -1;
static int dst_id = -1;
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;
+ link_list_capacity = 20;
+ link_list = xbt_new(network_link_DASSF_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_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_DASSF_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)
{
/* 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);
- 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;
}
+/* I nothing more happens, return the date at which the first action that will terminate does terminate */
+/* This returns the time for the first NETWORK action to complete */
+/* It would be nice to store this minimum somewhere so that the next function can
+ figure out whether the min comes from the network or from something else */
static double share_resources(double now)
{
s_surf_action_network_DASSF_t s_action;
return min;
}
+/* delta: by how many time units the simulation must advance */
+/* In this function: change the state of actions that terminate */
+/* The delta may not come from the network, and thus may be different (smaller)
+ than the one returned by the function above */
+/* If the delta is a network-caused min, then do not emulate any timer in the
+ network simulation, otherwise fake a timer somehow to advance the simulation of min seconds */
+
static void update_actions_state(double now, double delta)
{
double deltap = 0.0;
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;
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, 1.0);
}
- 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; */
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 resource has failed */
+ /* to ignore for now */
lmm_constraint_t cnst = NULL;
int i = 0;
network_link_DASSF_t nw_link = NULL;
return;
}
+/* Called only when there is a change in trace: Useless in packet-level simulation */
static void update_resource_state(void *id,
tmgr_trace_event_t event_type,
double value)
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;
return (surf_action_t) action;
}
+/* returns a NULL-terminated array of network_link_DASSF_t */
+static const void** get_route(void *src, void *dst) {
+ network_card_DASSF_t card_src = src;
+ network_card_DASSF_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_DASSF_t card_src = src;
+ network_card_DASSF_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_DASSF_t) link)->name;
+}
+
+static double get_link_bandwidth(const void *link) {
+ return ((network_link_DASSF_t) link)->bw_current;
+}
+
+static double get_link_latency(const void *link) {
+ return ((network_link_DASSF_t) link)->lat_current;
+}
+
static void action_suspend(surf_action_t action)
{
((surf_action_network_DASSF_t) action)->suspended = 1;
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_cancel = action_cancel;
surf_network_resource->common_public->action_recycle = action_recycle;
surf_network_resource->common_public->is_suspended = action_is_suspended;
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();