X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/dff9e15c44ab6340d27215957c56fa72fad246a2..824b99a5272ff8ce814336ab8bc9817eecd6de60:/src/surf/network_gtnets.c?ds=sidebyside diff --git a/src/surf/network_gtnets.c b/src/surf/network_gtnets.c index 6fc36a3deb..75df16ab85 100644 --- a/src/surf/network_gtnets.c +++ b/src/surf/network_gtnets.c @@ -31,9 +31,8 @@ static int dst_id = -1; /* Free memory for a network link */ static void link_free(void *nw_link) { - free(((network_link_GTNETS_t) nw_link)->name); xbt_dict_free(&(((network_link_GTNETS_t) nw_link)->properties)); - free(nw_link); + surf_resource_free(nw_link); } /* Instantiate a new network link */ @@ -54,7 +53,7 @@ static void link_new(char *name, double bw, double lat, xbt_dict_t props) link_count++; /* - nw_link->model = (surf_model_t) surf_network_model; + nw_link->model = surf_network_model; nw_link->name = name; nw_link->bw_current = bw_initial; if (bw_trace) @@ -77,7 +76,7 @@ static void link_new(char *name, double bw, double lat, xbt_dict_t props) /* KF: Insert entry in the dictionary */ gtnets_link = xbt_new0(s_network_link_GTNETS_t, 1); - gtnets_link->name = name; + gtnets_link->generic_resource.name = name; gtnets_link->bw_current = bw; gtnets_link->lat_current = lat; gtnets_link->id = link_count; @@ -89,13 +88,6 @@ static void link_new(char *name, double bw, double lat, xbt_dict_t props) return; } -/* free the network card */ -static void network_card_free(void *nw_card) -{ - free(((network_card_GTNETS_t) nw_card)->name); - free(nw_card); -} - /* Instantiate a new network card: MODIFYED BY KF */ static int network_card_new(const char *name) { @@ -103,7 +95,8 @@ static int network_card_new(const char *name) XBT_IN1("(%s)", name); /* KF: Check that we haven't seen the network card before */ - network_card_GTNETS_t card = xbt_dict_get_or_null(network_card_set, name); + network_card_GTNETS_t card = + surf_model_resource_by_name(surf_network_model, name); if (!card) { /* KF: Increment the card counter for GTNetS */ @@ -111,9 +104,10 @@ static int network_card_new(const char *name) /* KF: just use the dictionary to map link names to link indices */ card = xbt_new0(s_network_card_GTNETS_t, 1); - card->name = xbt_strdup(name); + card->generic_resource.name = xbt_strdup(name); card->id = card_count; - xbt_dict_set(network_card_set, name, card, network_card_free); + xbt_dict_set(surf_model_resource_set(surf_network_model), name, card, + surf_resource_free); } LOG1(xbt_log_priority_trace, " return %d", card->id); @@ -307,16 +301,6 @@ static void define_callbacks(const char *file) surfxml_add_callback(ETag_surfxml_platform_cb_list, &add_route); } -static void *name_service(const char *name) -{ - return xbt_dict_get_or_null(network_card_set, name); -} - -static const char *get_resource_name(void *resource_id) -{ - return ((network_card_GTNETS_t) resource_id)->name; -} - static xbt_dict_t get_properties(void *link) { return ((network_card_GTNETS_t) link)->properties; @@ -367,7 +351,7 @@ static void action_change_state(surf_action_t action, /* ((surf_action_network_GTNETS_t)action)->variable = NULL; */ /* } */ - surf_action_change_state(action, state); + surf_action_state_set(action, state); return; } @@ -376,7 +360,7 @@ static void action_change_state(surf_action_t action, static double share_resources(double now) { xbt_swag_t running_actions = - surf_network_model->common_public->states.running_action_set; + surf_network_model->common_public.states.running_action_set; //get the first relevant value from the running_actions list if (!xbt_swag_size(running_actions)) @@ -392,7 +376,7 @@ static double share_resources(double now) /* 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) +/* 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 */ @@ -402,7 +386,7 @@ static void update_actions_state(double now, double delta) surf_action_network_GTNETS_t action = NULL; // surf_action_network_GTNETS_t next_action = NULL; xbt_swag_t running_actions = - surf_network_model->common_public->states.running_action_set; + surf_network_model->common_public.states.running_action_set; /* If there are no renning flows, just return */ if (time_to_next_flow_completion < 0.0) { @@ -492,18 +476,18 @@ static surf_action_t communicate(void *src, void *dst, double 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->generic_action.model_type = surf_network_model; action->generic_action.state_set = - surf_network_model->common_public->states.running_action_set; + surf_network_model->common_public.states.running_action_set; xbt_swag_insert(action, action->generic_action.state_set); /* KF: Add a flow to the GTNets Simulation, associated to this action */ if (gtnets_create_flow(card_src->id, card_dst->id, size, (void *) action) < 0) { - xbt_assert2(0, "Not route between host %s and host %s", card_src->name, - card_dst->name); + xbt_assert2(0, "Not route between host %s and host %s", card_src->generic_resource.name, + card_dst->generic_resource.name); } return (surf_action_t) action; @@ -512,15 +496,13 @@ static surf_action_t communicate(void *src, void *dst, double size, /* Suspend a flow() */ static void action_suspend(surf_action_t action) { - xbt_assert0(0, - "action_suspend() not supported for the GTNets network model"); + THROW_UNIMPLEMENTED; } /* Resume a flow() */ static void action_resume(surf_action_t action) { - xbt_assert0(0, - "action_resume() not supported for the GTNets network model"); + THROW_UNIMPLEMENTED; } /* Test whether a flow is suspended */ @@ -531,18 +513,9 @@ static int action_is_suspended(surf_action_t action) static void finalize(void) { -#if 0 - int i, j; -#endif - 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); + + surf_model_exit(surf_network_model); free(surf_network_model); surf_network_model = NULL; @@ -554,53 +527,33 @@ 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_use = action_use; - surf_network_model->common_public->action_free = action_free; - 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 GTNetS"; + surf_network_model->action_use = action_use; + surf_network_model->action_free = action_free; + surf_network_model->action_cancel = action_cancel; + surf_network_model->action_recycle = action_recycle; + surf_network_model->action_change_state = action_change_state; + + 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->model_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_network_model->suspend = action_suspend; + surf_network_model->resume = action_resume; + surf_network_model->is_suspended = action_is_suspended; - surf_network_model->extension_public->communicate = communicate; + surf_network_model->extension.network.communicate = communicate; /*for the props of the link */ - 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(); /* KF: Added the initialization for GTNetS interface */ if (gtnets_initialize()) { @@ -618,6 +571,6 @@ void surf_network_model_init_GTNETS(const char *filename) xbt_dynar_push(model_list, &surf_network_model); update_model_description(surf_network_model_description, - "GTNets", (surf_model_t) surf_network_model); + "GTNets", surf_network_model); } #endif