* Helping functions
*/
void surf_parse_error(const char *fmt, ...) {
- va_list va;
- va_start(va,fmt);
- char *msg = bvprintf(fmt,va);
- va_end(va);
- xbt_die("Parse error at %s:%d: %s", surf_parsed_filename, surf_parse_lineno, msg);
+ va_list va;
+ va_start(va,fmt);
+ char *msg = bvprintf(fmt,va);
+ va_end(va);
+ xbt_die("Parse error at %s:%d: %s", surf_parsed_filename, surf_parse_lineno, msg);
}
void surf_parse_warn(const char *fmt, ...) {
- va_list va;
- va_start(va,fmt);
- char *msg = bvprintf(fmt,va);
- va_end(va);
+ va_list va;
+ va_start(va,fmt);
+ char *msg = bvprintf(fmt,va);
+ va_end(va);
XBT_WARN("%s:%d: %s", surf_parsed_filename, surf_parse_lineno, msg);
free(msg);
}
storage.id = A_surfxml_storage_id;
storage.type_id = A_surfxml_storage_typeId;
+ storage.content = A_surfxml_storage_content;
sg_platf_new_storage(&storage);
}
void STag_surfxml_storage_type(void)
storage_type.id = A_surfxml_storage_type_id;
storage_type.model = A_surfxml_storage_type_model;
storage_type.properties = current_property_set;
+ storage_type.size = surf_parse_get_int(A_surfxml_storage_type_size);
sg_platf_new_storage_type(&storage_type);
current_property_set = NULL;
}
XBT_DEBUG("ETag_surfxml_include_state '%s'",A_surfxml_include_file);
if(xbt_dynar_is_empty(surf_input_buffer_stack)) // nope, that's a true premature EOF. Let the parser die verbosely.
- return 0;
+ return 0;
// Yeah, we were in an <include> Restore state and proceed.
fclose(surf_file_to_parse);
void surf_parse_init_callbacks(void)
{
- sg_platf_init(); // FIXME: move to a proper place?
-
- STag_surfxml_route_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL);
- ETag_surfxml_route_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL);
- STag_surfxml_link_ctn_cb_list =
- xbt_dynar_new(sizeof(void_f_void_t), NULL);
- ETag_surfxml_link_ctn_cb_list =
- xbt_dynar_new(sizeof(void_f_void_t), NULL);
- STag_surfxml_process_cb_list =
- xbt_dynar_new(sizeof(void_f_void_t), NULL);
- ETag_surfxml_process_cb_list =
- xbt_dynar_new(sizeof(void_f_void_t), NULL);
- STag_surfxml_argument_cb_list =
- xbt_dynar_new(sizeof(void_f_void_t), NULL);
- ETag_surfxml_argument_cb_list =
- xbt_dynar_new(sizeof(void_f_void_t), NULL);
- STag_surfxml_prop_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL);
- ETag_surfxml_prop_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL);
- STag_surfxml_trace_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL);
- ETag_surfxml_trace_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL);
- STag_surfxml_trace_connect_cb_list =
- xbt_dynar_new(sizeof(void_f_void_t), NULL);
- ETag_surfxml_trace_connect_cb_list =
- xbt_dynar_new(sizeof(void_f_void_t), NULL);
- STag_surfxml_random_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL);
- ETag_surfxml_random_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL);
- STag_surfxml_ASroute_cb_list =
- xbt_dynar_new(sizeof(void_f_void_t), NULL);
- ETag_surfxml_ASroute_cb_list =
- xbt_dynar_new(sizeof(void_f_void_t), NULL);
- STag_surfxml_bypassRoute_cb_list =
- xbt_dynar_new(sizeof(void_f_void_t), NULL);
- ETag_surfxml_bypassRoute_cb_list =
- xbt_dynar_new(sizeof(void_f_void_t), NULL);
+ sg_platf_init(); // FIXME: move to a proper place?
+
+ STag_surfxml_route_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL);
+ ETag_surfxml_route_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL);
+ STag_surfxml_link_ctn_cb_list =
+ xbt_dynar_new(sizeof(void_f_void_t), NULL);
+ ETag_surfxml_link_ctn_cb_list =
+ xbt_dynar_new(sizeof(void_f_void_t), NULL);
+ STag_surfxml_process_cb_list =
+ xbt_dynar_new(sizeof(void_f_void_t), NULL);
+ ETag_surfxml_process_cb_list =
+ xbt_dynar_new(sizeof(void_f_void_t), NULL);
+ STag_surfxml_argument_cb_list =
+ xbt_dynar_new(sizeof(void_f_void_t), NULL);
+ ETag_surfxml_argument_cb_list =
+ xbt_dynar_new(sizeof(void_f_void_t), NULL);
+ STag_surfxml_prop_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL);
+ ETag_surfxml_prop_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL);
+ STag_surfxml_trace_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL);
+ ETag_surfxml_trace_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL);
+ STag_surfxml_trace_connect_cb_list =
+ xbt_dynar_new(sizeof(void_f_void_t), NULL);
+ ETag_surfxml_trace_connect_cb_list =
+ xbt_dynar_new(sizeof(void_f_void_t), NULL);
+ STag_surfxml_random_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL);
+ ETag_surfxml_random_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL);
+ STag_surfxml_ASroute_cb_list =
+ xbt_dynar_new(sizeof(void_f_void_t), NULL);
+ ETag_surfxml_ASroute_cb_list =
+ xbt_dynar_new(sizeof(void_f_void_t), NULL);
+ STag_surfxml_bypassRoute_cb_list =
+ xbt_dynar_new(sizeof(void_f_void_t), NULL);
+ ETag_surfxml_bypassRoute_cb_list =
+ xbt_dynar_new(sizeof(void_f_void_t), NULL);
STag_surfxml_bypassASroute_cb_list =
xbt_dynar_new(sizeof(void_f_void_t), NULL);
ETag_surfxml_bypassASroute_cb_list =
xbt_dynar_new(sizeof(void_f_void_t), NULL);
- STag_surfxml_peer_cb_list =
- xbt_dynar_new(sizeof(void_f_void_t), NULL);
- ETag_surfxml_peer_cb_list =
- xbt_dynar_new(sizeof(void_f_void_t), NULL);
- STag_surfxml_include_cb_list =
- xbt_dynar_new(sizeof(void_f_void_t), NULL);
- ETag_surfxml_include_cb_list =
- xbt_dynar_new(sizeof(void_f_void_t), NULL);
-
- STag_surfxml_storage_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL);
- ETag_surfxml_storage_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL);
+ STag_surfxml_peer_cb_list =
+ xbt_dynar_new(sizeof(void_f_void_t), NULL);
+ ETag_surfxml_peer_cb_list =
+ xbt_dynar_new(sizeof(void_f_void_t), NULL);
+ STag_surfxml_include_cb_list =
+ xbt_dynar_new(sizeof(void_f_void_t), NULL);
+ ETag_surfxml_include_cb_list =
+ xbt_dynar_new(sizeof(void_f_void_t), NULL);
+
+ STag_surfxml_storage_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL);
+ ETag_surfxml_storage_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL);
STag_surfxml_storage_type_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL);
ETag_surfxml_storage_type_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL);
STag_surfxml_mount_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL);
void surf_parse_reset_callbacks(void)
{
- surf_parse_free_callbacks();
- surf_parse_init_callbacks();
+ surf_parse_free_callbacks();
+ surf_parse_init_callbacks();
}
void surf_parse_free_callbacks(void)
current_property_set = NULL;
}
+void STag_surfxml_host_link(void){
+ XBT_DEBUG("Create a Host_link for %s",A_surfxml_host_link_id);
+ s_sg_platf_host_link_cbarg_t host_link;
+ memset(&host_link,0,sizeof(host_link));
+
+ host_link.id = A_surfxml_host_link_id;
+ host_link.link_up = A_surfxml_host_link_up;
+ host_link.link_down = A_surfxml_host_link_down;
+ sg_platf_new_host_link(&host_link);
+}
+
+void ETag_surfxml_host_link(void){
+ XBT_DEBUG("End create a Host_link for %s",A_surfxml_host_link_id);
+}
+
void STag_surfxml_router(void){
s_sg_platf_router_cbarg_t router;
memset(&router, 0, sizeof(router));
- router.id = A_surfxml_router_id;
- router.coord = A_surfxml_router_coordinates;
+ router.id = A_surfxml_router_id;
+ router.coord = A_surfxml_router_coordinates;
- sg_platf_new_router(&router);
+ sg_platf_new_router(&router);
}
void STag_surfxml_cluster(void){
s_sg_platf_cluster_cbarg_t cluster;
memset(&cluster,0,sizeof(cluster));
- cluster.id = A_surfxml_cluster_id;
- cluster.prefix = A_surfxml_cluster_prefix;
- cluster.suffix = A_surfxml_cluster_suffix;
- cluster.radical = A_surfxml_cluster_radical;
- cluster.power= surf_parse_get_double(A_surfxml_cluster_power);
- cluster.core_amount = surf_parse_get_int(A_surfxml_cluster_core);
- cluster.bw = surf_parse_get_double(A_surfxml_cluster_bw);
- cluster.lat = surf_parse_get_double(A_surfxml_cluster_lat);
- if(strcmp(A_surfxml_cluster_bb_bw,""))
- cluster.bb_bw = surf_parse_get_double(A_surfxml_cluster_bb_bw);
- if(strcmp(A_surfxml_cluster_bb_lat,""))
- cluster.bb_lat = surf_parse_get_double(A_surfxml_cluster_bb_lat);
- cluster.router_id = A_surfxml_cluster_router_id;
+ cluster.id = A_surfxml_cluster_id;
+ cluster.prefix = A_surfxml_cluster_prefix;
+ cluster.suffix = A_surfxml_cluster_suffix;
+ cluster.radical = A_surfxml_cluster_radical;
+ cluster.power= surf_parse_get_double(A_surfxml_cluster_power);
+ cluster.core_amount = surf_parse_get_int(A_surfxml_cluster_core);
+ cluster.bw = surf_parse_get_double(A_surfxml_cluster_bw);
+ cluster.lat = surf_parse_get_double(A_surfxml_cluster_lat);
+ if(strcmp(A_surfxml_cluster_bb_bw,""))
+ cluster.bb_bw = surf_parse_get_double(A_surfxml_cluster_bb_bw);
+ if(strcmp(A_surfxml_cluster_bb_lat,""))
+ cluster.bb_lat = surf_parse_get_double(A_surfxml_cluster_bb_lat);
+ cluster.router_id = A_surfxml_cluster_router_id;
switch (AX_surfxml_cluster_sharing_policy) {
case A_surfxml_cluster_sharing_policy_SHARED:
break;
}
- cluster.availability_trace = A_surfxml_cluster_availability_file;
- cluster.state_trace = A_surfxml_cluster_state_file;
- sg_platf_new_cluster(&cluster);
+ cluster.availability_trace = A_surfxml_cluster_availability_file;
+ cluster.state_trace = A_surfxml_cluster_state_file;
+ sg_platf_new_cluster(&cluster);
}
void ETag_surfxml_cluster(void){
/* nothing I can think of */
}
+void STag_surfxml_cabinet(void){
+ s_sg_platf_cabinet_cbarg_t cabinet;
+ memset(&cabinet,0,sizeof(cabinet));
+ cabinet.id = A_surfxml_cabinet_id;
+ cabinet.prefix = A_surfxml_cabinet_prefix;
+ cabinet.suffix = A_surfxml_cabinet_suffix;
+ cabinet.power = surf_parse_get_double(A_surfxml_cabinet_power);
+ cabinet.bw = surf_parse_get_double(A_surfxml_cabinet_bw);
+ cabinet.lat = surf_parse_get_double(A_surfxml_cabinet_lat);
+ cabinet.radical = A_surfxml_cabinet_radical;
+
+ sg_platf_new_cabinet(&cabinet);
+}
+void ETag_surfxml_cabinet(void){
+ /* nothing I can think of */
+}
+
void STag_surfxml_peer(void){
s_sg_platf_peer_cbarg_t peer;
memset(&peer,0,sizeof(peer));
- peer.id = A_surfxml_peer_id;
- peer.power = surf_parse_get_double(A_surfxml_peer_power);
- peer.bw_in = surf_parse_get_double(A_surfxml_peer_bw_in);
- peer.bw_out = surf_parse_get_double(A_surfxml_peer_bw_out);
- peer.lat = surf_parse_get_double(A_surfxml_peer_lat);
- peer.coord = A_surfxml_peer_coordinates;
- peer.availability_trace = tmgr_trace_new_from_file(A_surfxml_peer_availability_file);
- peer.state_trace = tmgr_trace_new_from_file(A_surfxml_peer_state_file);
-
- surfxml_call_cb_functions(STag_surfxml_peer_cb_list);
- sg_platf_new_peer(&peer);
+ peer.id = A_surfxml_peer_id;
+ peer.power = surf_parse_get_double(A_surfxml_peer_power);
+ peer.bw_in = surf_parse_get_double(A_surfxml_peer_bw_in);
+ peer.bw_out = surf_parse_get_double(A_surfxml_peer_bw_out);
+ peer.lat = surf_parse_get_double(A_surfxml_peer_lat);
+ peer.coord = A_surfxml_peer_coordinates;
+ peer.availability_trace = tmgr_trace_new_from_file(A_surfxml_peer_availability_file);
+ peer.state_trace = tmgr_trace_new_from_file(A_surfxml_peer_state_file);
+
+ sg_platf_new_peer(&peer);
}
void ETag_surfxml_peer(void){
/* nothing to do here */
void STag_surfxml_link(void){
xbt_assert(current_property_set == NULL, "Someone forgot to reset the property set to NULL in its closing tag (or XML malformed)");
}
+
+void STag_surfxml_backbone(void){
+ /* nothing to do here */
+}
+
void ETag_surfxml_link(void){
s_sg_platf_link_cbarg_t link;
memset(&link,0,sizeof(link));
current_property_set = NULL;
}
+void ETag_surfxml_backbone(void){
+ s_sg_platf_link_cbarg_t link;
+ memset(&link,0,sizeof(link));
+
+ link.properties = NULL;
+
+ link.id = A_surfxml_backbone_id;
+ link.bandwidth = surf_parse_get_double(A_surfxml_backbone_bandwidth);
+ link.latency = surf_parse_get_double(A_surfxml_backbone_latency);
+ link.state = SURF_RESOURCE_ON;
+ link.policy = SURF_LINK_SHARED;
+
+ sg_platf_new_link(&link);
+ routing_cluster_add_backbone(xbt_lib_get_or_null(link_lib, A_surfxml_backbone_id, SURF_LINK_LEVEL));
+ current_property_set = NULL;
+}
+
void STag_surfxml_route(void){
- surfxml_call_cb_functions(STag_surfxml_route_cb_list);
+ surfxml_call_cb_functions(STag_surfxml_route_cb_list);
}
void STag_surfxml_link_ctn(void){
- surfxml_call_cb_functions(STag_surfxml_link_ctn_cb_list);
+ surfxml_call_cb_functions(STag_surfxml_link_ctn_cb_list);
}
void STag_surfxml_process(void){
- surfxml_call_cb_functions(STag_surfxml_process_cb_list);
+ surfxml_call_cb_functions(STag_surfxml_process_cb_list);
}
void STag_surfxml_argument(void){
- surfxml_call_cb_functions(STag_surfxml_argument_cb_list);
+ surfxml_call_cb_functions(STag_surfxml_argument_cb_list);
}
void STag_surfxml_prop(void){
- surfxml_call_cb_functions(STag_surfxml_prop_cb_list);
+ surfxml_call_cb_functions(STag_surfxml_prop_cb_list);
}
void STag_surfxml_trace(void){
- surfxml_call_cb_functions(STag_surfxml_trace_cb_list);
+ surfxml_call_cb_functions(STag_surfxml_trace_cb_list);
}
void STag_surfxml_trace_connect(void){
- surfxml_call_cb_functions(STag_surfxml_trace_connect_cb_list);
+ surfxml_call_cb_functions(STag_surfxml_trace_connect_cb_list);
}
void STag_surfxml_AS(void){
- sg_platf_new_AS_begin(A_surfxml_AS_id,A_surfxml_AS_routing);
+ sg_platf_new_AS_begin(A_surfxml_AS_id, (int)A_surfxml_AS_routing);
}
void ETag_surfxml_AS(void){
sg_platf_new_AS_end();
}
void STag_surfxml_ASroute(void){
- surfxml_call_cb_functions(STag_surfxml_ASroute_cb_list);
+ surfxml_call_cb_functions(STag_surfxml_ASroute_cb_list);
}
void STag_surfxml_bypassRoute(void){
- surfxml_call_cb_functions(STag_surfxml_bypassRoute_cb_list);
+ surfxml_call_cb_functions(STag_surfxml_bypassRoute_cb_list);
}
void STag_surfxml_bypassASroute(void){
surfxml_call_cb_functions(STag_surfxml_bypassASroute_cb_list);
xbt_dict_free(¤t_property_set);
}
void STag_surfxml_random(void){
- surfxml_call_cb_functions(STag_surfxml_random_cb_list);
-}
-
-#define parse_method(type,name) \
-void type##Tag_surfxml_##name(void) \
-{ surfxml_call_cb_functions(type##Tag_surfxml_##name##_cb_list); }
-parse_method(E, route)
-parse_method(E, link_ctn)
-parse_method(E, process)
-parse_method(E, argument)
-parse_method(E, prop)
-parse_method(E, trace)
-parse_method(E, trace_connect)
-parse_method(E, random)
-parse_method(E, ASroute)
-parse_method(E, bypassRoute)
-parse_method(E, bypassASroute)
+ surfxml_call_cb_functions(STag_surfxml_random_cb_list);
+}
+
+#define parse_method(type,name) \
+ void type##Tag_surfxml_##name(void) \
+ { surfxml_call_cb_functions(type##Tag_surfxml_##name##_cb_list); } \
+ void type##Tag_surfxml_##name(void)
+
+parse_method(E, route);
+parse_method(E, link_ctn);
+parse_method(E, process);
+parse_method(E, argument);
+parse_method(E, prop);
+parse_method(E, trace);
+parse_method(E, trace_connect);
+parse_method(E, random);
+parse_method(E, ASroute);
+parse_method(E, bypassRoute);
+parse_method(E, bypassASroute);
/* Open and Close parse file */
