src_id = network_card_new(A_surfxml_route_src);
dst_id = network_card_new(A_surfxml_route_dst);
route_action = A_surfxml_route_action;
- route_link_list = xbt_dynar_new(sizeof(char *), &free_string);
}
static void parse_route_set_route(void)
{
/* Figuring out the network links */
surfxml_add_callback(STag_surfxml_host_cb_list, &count_hosts);
- surfxml_add_callback(STag_surfxml_prop_cb_list, &parse_properties);
surfxml_add_callback(STag_surfxml_route_cb_list, &parse_route_set_endpoints);
- surfxml_add_callback(ETag_surfxml_link_c_ctn_cb_list, &parse_route_elem);
surfxml_add_callback(ETag_surfxml_route_cb_list, &parse_route_set_route);
- surfxml_add_callback(STag_surfxml_platform_cb_list, &init_data);
- surfxml_add_callback(STag_surfxml_set_cb_list, &parse_sets);
- surfxml_add_callback(STag_surfxml_route_c_multi_cb_list, &parse_route_multi_set_endpoints);
- surfxml_add_callback(ETag_surfxml_route_c_multi_cb_list, &parse_route_multi_set_route);
- surfxml_add_callback(STag_surfxml_foreach_cb_list, &parse_foreach);
- surfxml_add_callback(STag_surfxml_cluster_cb_list, &parse_cluster);
- surfxml_add_callback(STag_surfxml_trace_cb_list, &parse_trace_init);
- surfxml_add_callback(ETag_surfxml_trace_cb_list, &parse_trace_finalize);
- surfxml_add_callback(STag_surfxml_trace_c_connect_cb_list, &parse_trace_c_connect);
}
static void *name_service(const char *name)
static void update_resource_state(void *id,
tmgr_trace_event_t event_type,
- double value)
+ double value, double time)
{
DIE_IMPOSSIBLE;
}
action->generic_action.model_type =
(surf_model_t) surf_network_model;
action->suspended = 0;
- action->generic_action.state_set =
+
+ action->latency = random_generate(random_latency);
+ action->lat_init = action->latency;
+
+ if(action->latency<=0.0)
+ action->generic_action.state_set =
+ surf_network_model->common_public->states.done_action_set;
+ else
+ action->generic_action.state_set =
surf_network_model->common_public->states.running_action_set;
xbt_swag_insert(action, action->generic_action.state_set);
- action->latency = random_generate(random_latency);
- action->lat_init = action->latency;
XBT_OUT;
DIE_IMPOSSIBLE;
}
+static int link_shared(const void *link)
+{
+ DIE_IMPOSSIBLE;
+}
+
static xbt_dict_t get_properties(void *link)
{
DIE_IMPOSSIBLE;
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->common_public->get_properties = get_properties;
network_card_set = xbt_dict_new();
if(!random_latency)
- random_latency = random_new(RAND, 0.0, 1.0, .125, .034);
+ random_latency = random_new(RAND, 100, 0.0, 1.0, .125, .034);
}
void surf_network_model_init_Constant(const char *filename)
xbt_dynar_push(model_list, &surf_network_model);
update_model_description(surf_network_model_description,
- surf_network_model_description_size,
- "Constant",
- (surf_model_t) surf_network_model);
+ "Constant",
+ (surf_model_t) surf_network_model);
}