XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_network, surf,
"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 */
static void link_free(void *nw_link)
{
- free(((link_CM02_t) nw_link)->name);
xbt_dict_free(&(((link_CM02_t) nw_link)->properties));
- free(nw_link);
+ surf_resource_free(nw_link);
}
static link_CM02_t link_new(char *name,
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->generic_resource.model = surf_network_model;
+ nw_link->generic_resource.name = name;
nw_link->bw_current = bw_initial;
if (bw_trace)
nw_link->bw_event =
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);
+ surf_model_resource_by_name(surf_network_model, card_name);
if (!card) {
card = xbt_new0(s_network_card_CM02_t, 1);
- card->name = xbt_strdup(card_name);
+ card->generic_resource.name = xbt_strdup(card_name);
card->id = host_number++;
- xbt_dict_set(network_card_set, card_name, card, network_card_free);
+ xbt_dict_set(surf_model_resource_set(surf_network_model), card_name, card,
+ surf_resource_free);
}
return card->id;
}
surfxml_add_callback(ETag_surfxml_platform_cb_list, &add_loopback);
}
-static void *name_service(const char *name)
-{
- network_card_CM02_t card = xbt_dict_get_or_null(network_card_set, name);
- return card;
-}
-
-static const char *get_resource_name(void *resource_id)
-{
- return ((network_card_CM02_t) resource_id)->name;
-}
-
static int resource_used(void *resource_id)
{
return lmm_constraint_used(network_maxmin_system,
((link_CM02_t) resource_id)->constraint);
}
-static int action_free(surf_action_t action)
+static int action_unref(surf_action_t action)
{
action->refcount--;
if (!action->refcount) {
return 0;
}
-static void action_use(surf_action_t action)
+static void action_ref(surf_action_t action)
{
action->refcount++;
}
return;
}
-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_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;
-}
-
static double 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,
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) {
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);
+ 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);
+ surf_network_model->action_state_set((surf_action_t) action, SURF_ACTION_DONE);
}
}
else
lmm_update_variable_bound(network_maxmin_system, action->variable,
min(action->rate,
- sg_tcp_gamma / (2.0 * action->lat_current)));
+ sg_tcp_gamma / (2.0 *
+ action->lat_current)));
if (!(action->suspended))
lmm_update_variable_weight(network_maxmin_system, action->variable,
action->weight);
(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) {
+ if (surf_action_state_get(action) == SURF_ACTION_RUNNING ||
+ surf_action_state_get(action) == SURF_ACTION_READY) {
action->finish = date;
- action_change_state(action, SURF_ACTION_FAILED);
+ surf_network_model->action_state_set(action, SURF_ACTION_FAILED);
}
}
}
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);
+ XBT_IN4("(%s,%s,%g,%g)", card_src->generic_resource.name, card_dst->generic_resource.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);
+ card_src->generic_resource.name, card_dst->generic_resource.name);
action = xbt_new0(s_surf_action_network_CM02_t, 1);
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->generic_action.model_type = 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;
+ surf_network_model->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;
+ surf_network_model->states.failed_action_set;
break;
}
if (action->lat_current > 0)
lmm_update_variable_bound(network_maxmin_system, action->variable,
min(action->rate,
- sg_tcp_gamma / (2.0 * action->lat_current)));
+ sg_tcp_gamma / (2.0 *
+ action->lat_current)));
else
lmm_update_variable_bound(network_maxmin_system, action->variable,
action->rate);
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)
{
return ((link_CM02_t) link)->bw_current;
{
int i, j;
- xbt_dict_free(&network_card_set);
xbt_dict_free(&link_set);
- surf_model_exit((surf_model_t)surf_network_model);
-
- free(surf_network_model->extension_public);
- free(surf_network_model);
+ surf_model_exit(surf_network_model);
surf_network_model = NULL;
loopback = NULL;
static void surf_network_model_init_internal(void)
{
- surf_network_model = xbt_new0(s_surf_network_model_t, 1);
-
- surf_model_init((surf_model_t)surf_network_model);
-
- surf_network_model->extension_public =
- xbt_new0(s_surf_network_model_extension_public_t, 1);
-
- 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 =
+ surf_network_model = surf_model_init();
+
+ surf_network_model->name = "network";
+ surf_network_model->action_unref = action_unref;
+ surf_network_model->action_ref = action_ref;
+ surf_network_model->action_cancel = action_cancel;
+ surf_network_model->action_recycle = action_recycle;
+
+ surf_network_model->model_private->resource_used = resource_used;
+ surf_network_model->model_private->share_resources = share_resources;
+ surf_network_model->model_private->update_actions_state =
update_actions_state;
- surf_network_model->common_private->update_resource_state =
+ surf_network_model->model_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 =
+ surf_network_model->model_private->finalize = finalize;
+
+ surf_network_model->suspend = action_suspend;
+ surf_network_model->resume = action_resume;
+ surf_network_model->is_suspended = action_is_suspended;
+ surf_cpu_model->set_max_duration = action_set_max_duration;
+
+ surf_network_model->extension.network.communicate = communicate;
+ surf_network_model->extension.network.get_route = get_route;
+ surf_network_model->extension.network.get_route_size = get_route_size;
+ surf_network_model->extension.network.get_link_bandwidth =
get_link_bandwidth;
- surf_network_model->extension_public->get_link_latency = get_link_latency;
- surf_network_model->extension_public->link_shared = link_shared;
+ surf_network_model->extension.network.get_link_latency = get_link_latency;
+ surf_network_model->extension.network.link_shared = link_shared;
- surf_network_model->common_public.get_properties = get_properties;
+ surf_network_model->get_properties = get_properties;
link_set = xbt_dict_new();
- network_card_set = xbt_dict_new();
if (!network_maxmin_system)
network_maxmin_system = lmm_system_new();
weight_S_parameter = 8775;
update_model_description(surf_network_model_description,
- "LegrandVelho", (surf_model_t) surf_network_model);
+ "LegrandVelho", surf_network_model);
}
/***************************************************************************/
network_solve = lmm_solve;
update_model_description(surf_network_model_description,
- "CM02", (surf_model_t) surf_network_model);
+ "CM02", surf_network_model);
}
void surf_network_model_init_Reno(const char *filename)
weight_S_parameter = 8775;
update_model_description(surf_network_model_description,
- "Reno", (surf_model_t) surf_network_model);
+ "Reno", surf_network_model);
}
weight_S_parameter = 8775;
update_model_description(surf_network_model_description,
- "Reno2", (surf_model_t) surf_network_model);
+ "Reno2", surf_network_model);
}
void surf_network_model_init_Vegas(const char *filename)
weight_S_parameter = 8775;
update_model_description(surf_network_model_description,
- "Vegas", (surf_model_t) surf_network_model);
+ "Vegas", surf_network_model);
}
#ifdef HAVE_SDP
network_solve = sdp_solve;
update_model_description(surf_network_model_description,
- "SDP", (surf_model_t) surf_network_model);
+ "SDP", surf_network_model);
}
#endif
