}
void ETag_surfxml_storage(void)
{
- s_sg_platf_storage_cbarg_t storage = SG_PLATF_STORAGE_INITIALIZER;
+ s_sg_platf_storage_cbarg_t storage;
memset(&storage,0,sizeof(storage));
storage.id = A_surfxml_storage_id;
}
void ETag_surfxml_storage___type(void)
{
- s_sg_platf_storage_type_cbarg_t storage_type = SG_PLATF_STORAGE_TYPE_INITIALIZER;
+ s_sg_platf_storage_type_cbarg_t storage_type;
memset(&storage_type,0,sizeof(storage_type));
storage_type.content = A_surfxml_storage___type_content;
current_property_set = nullptr;
current_model_property_set = nullptr;
}
-void STag_surfxml_mstorage(void)
-{
- XBT_DEBUG("STag_surfxml_mstorage");
-}
-void ETag_surfxml_mstorage(void)
-{
- s_sg_platf_mstorage_cbarg_t mstorage = SG_PLATF_MSTORAGE_INITIALIZER;
- memset(&mstorage,0,sizeof(mstorage));
-
- mstorage.name = A_surfxml_mstorage_name;
- mstorage.type_id = A_surfxml_mstorage_typeId;
- sg_platf_new_mstorage(&mstorage);
-}
void STag_surfxml_mount(void)
{
XBT_DEBUG("STag_surfxml_mount");
}
void ETag_surfxml_mount(void)
{
- s_sg_platf_mount_cbarg_t mount = SG_PLATF_MOUNT_INITIALIZER;
+ s_sg_platf_mount_cbarg_t mount;
memset(&mount,0,sizeof(mount));
mount.name = A_surfxml_mount_name;
void STag_surfxml_prop(void)
{
- if(AS_TAG){
+ if(AS_TAG){ // We need a stack here to retrieve the most recently opened AS
if (!as_current_property_set){
xbt_assert(as_prop_nb < 1024, "Number of AS property reach the limit!!!");
as_current_property_set = xbt_dict_new_homogeneous(xbt_free_f); // Maybe, it should raise an error
}
void ETag_surfxml_host(void) {
- s_sg_platf_host_cbarg_t host = SG_PLATF_HOST_INITIALIZER;
- char* buf;
+ s_sg_platf_host_cbarg_t host;
memset(&host,0,sizeof(host));
+ char* buf;
host.properties = current_property_set;
buf = A_surfxml_host_speed;
XBT_DEBUG("Buffer: %s", buf);
- host.speed_peak = xbt_dynar_new(sizeof(double), nullptr);
+ host.speed_per_pstate = xbt_dynar_new(sizeof(double), nullptr);
if (strchr(buf, ',') == nullptr){
double speed = surf_parse_get_speed(A_surfxml_host_speed,"speed of host", host.id);
- xbt_dynar_push_as(host.speed_peak,double, speed);
+ xbt_dynar_push_as(host.speed_per_pstate,double, speed);
}
else {
xbt_dynar_t pstate_list = xbt_str_split(buf, ",");
unsigned int i;
- for (i = 0; i < xbt_dynar_length(pstate_list); i++) {
- double speed;
- char* speed_str;
-
- xbt_dynar_get_cpy(pstate_list, i, &speed_str);
+ char* speed_str;
+ xbt_dynar_foreach(pstate_list, i, speed_str) {
xbt_str_trim(speed_str, nullptr);
- speed = surf_parse_get_speed(speed_str,"speed of host", host.id);
- xbt_dynar_push_as(host.speed_peak, double, speed);
+ double speed = surf_parse_get_speed(speed_str,"speed of host", host.id);
+ xbt_dynar_push_as(host.speed_per_pstate, double, speed);
XBT_DEBUG("Speed value: %f", speed);
}
xbt_dynar_free(&pstate_list);
XBT_DEBUG("pstate: %s", A_surfxml_host_pstate);
host.core_amount = surf_parse_get_int(A_surfxml_host_core);
- host.speed_trace = A_surfxml_host_availability___file[0] ? tmgr_trace_new_from_file(A_surfxml_host_availability___file) : NULL;
- host.state_trace = A_surfxml_host_state___file[0] ? tmgr_trace_new_from_file(A_surfxml_host_state___file) : NULL;
+ host.speed_trace = A_surfxml_host_availability___file[0] ? tmgr_trace_new_from_file(A_surfxml_host_availability___file) : nullptr;
+ host.state_trace = A_surfxml_host_state___file[0] ? tmgr_trace_new_from_file(A_surfxml_host_state___file) : nullptr;
host.pstate = surf_parse_get_int(A_surfxml_host_pstate);
host.coord = A_surfxml_host_coordinates;
sg_platf_new_host(&host);
- xbt_dynar_free(&host.speed_peak);
+ xbt_dynar_free(&host.speed_per_pstate);
current_property_set = nullptr;
}
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 = SG_PLATF_HOST_LINK_INITIALIZER;
+ s_sg_platf_host_link_cbarg_t host_link;
memset(&host_link,0,sizeof(host_link));
host_link.id = A_surfxml_host___link_id;
}
void STag_surfxml_router(void){
- s_sg_platf_router_cbarg_t router = SG_PLATF_ROUTER_INITIALIZER;
+ s_sg_platf_router_cbarg_t router;
memset(&router, 0, sizeof(router));
router.id = A_surfxml_router_id;
}
void ETag_surfxml_cluster(void){
- s_sg_platf_cluster_cbarg_t cluster = SG_PLATF_CLUSTER_INITIALIZER;
+ s_sg_platf_cluster_cbarg_t cluster;
memset(&cluster,0,sizeof(cluster));
cluster.properties = as_current_property_set;
break;
}
- cluster.availability_trace = A_surfxml_cluster_availability___file;
- cluster.state_trace = A_surfxml_cluster_state___file;
sg_platf_new_cluster(&cluster);
current_property_set = nullptr;
void STag_surfxml_cabinet(void){
parse_after_config();
- s_sg_platf_cabinet_cbarg_t cabinet = SG_PLATF_CABINET_INITIALIZER;
+ s_sg_platf_cabinet_cbarg_t cabinet;
memset(&cabinet,0,sizeof(cabinet));
cabinet.id = A_surfxml_cabinet_id;
cabinet.prefix = A_surfxml_cabinet_prefix;
void STag_surfxml_peer(void){
parse_after_config();
- s_sg_platf_peer_cbarg_t peer = SG_PLATF_PEER_INITIALIZER;
+ s_sg_platf_peer_cbarg_t peer;
memset(&peer,0,sizeof(peer));
peer.id = A_surfxml_peer_id;
peer.speed = surf_parse_get_speed(A_surfxml_peer_speed, "speed of peer", peer.id);
peer.bw_out = surf_parse_get_bandwidth(A_surfxml_peer_bw___out, "bw_out of peer", peer.id);
peer.lat = surf_parse_get_time(A_surfxml_peer_lat, "lat of peer", peer.id);
peer.coord = A_surfxml_peer_coordinates;
- peer.availability_trace = A_surfxml_peer_availability___file[0] ? tmgr_trace_new_from_file(A_surfxml_peer_availability___file) : NULL;
- peer.state_trace = A_surfxml_peer_state___file[0] ? tmgr_trace_new_from_file(A_surfxml_peer_state___file) : NULL;
+ peer.availability_trace = A_surfxml_peer_availability___file[0] ? tmgr_trace_new_from_file(A_surfxml_peer_availability___file) : nullptr;
+ peer.state_trace = A_surfxml_peer_state___file[0] ? tmgr_trace_new_from_file(A_surfxml_peer_state___file) : nullptr;
sg_platf_new_peer(&peer);
}
}
void ETag_surfxml_link(void){
- s_sg_platf_link_cbarg_t link = SG_PLATF_LINK_INITIALIZER;
+ s_sg_platf_link_cbarg_t link;
memset(&link,0,sizeof(link));
link.properties = current_property_set;
link.id = A_surfxml_link_id;
link.bandwidth = surf_parse_get_bandwidth(A_surfxml_link_bandwidth, "bandwidth of link", link.id);
- link.bandwidth_trace = A_surfxml_link_bandwidth___file[0] ? tmgr_trace_new_from_file(A_surfxml_link_bandwidth___file) : NULL;
+ link.bandwidth_trace = A_surfxml_link_bandwidth___file[0] ? tmgr_trace_new_from_file(A_surfxml_link_bandwidth___file) : nullptr;
link.latency = surf_parse_get_time(A_surfxml_link_latency, "latency of link", link.id);
- link.latency_trace = A_surfxml_link_latency___file[0] ? tmgr_trace_new_from_file(A_surfxml_link_latency___file) : NULL;
- link.state_trace = A_surfxml_link_state___file[0] ? tmgr_trace_new_from_file(A_surfxml_link_state___file):NULL;
+ link.latency_trace = A_surfxml_link_latency___file[0] ? tmgr_trace_new_from_file(A_surfxml_link_latency___file) : nullptr;
+ link.state_trace = A_surfxml_link_state___file[0] ? tmgr_trace_new_from_file(A_surfxml_link_state___file):nullptr;
switch (A_surfxml_link_sharing___policy) {
case A_surfxml_link_sharing___policy_SHARED:
}
void ETag_surfxml_backbone(void){
- s_sg_platf_link_cbarg_t link = SG_PLATF_LINK_INITIALIZER;
+ s_sg_platf_link_cbarg_t link;
memset(&link,0,sizeof(link));
link.properties = nullptr;
-
link.id = A_surfxml_backbone_id;
link.bandwidth = surf_parse_get_bandwidth(A_surfxml_backbone_bandwidth, "bandwidth of backbone", link.id);
link.latency = surf_parse_get_time(A_surfxml_backbone_latency, "latency of backbone", link.id);
s_sg_platf_route_cbarg_t route;
memset(&route,0,sizeof(route));
- route.src = A_surfxml_route_src;
- route.dst = A_surfxml_route_dst;
+
+ route.src = sg_netcard_by_name_or_null(A_surfxml_route_src); // tested to not be NULL in start tag
+ route.dst = sg_netcard_by_name_or_null(A_surfxml_route_dst); // tested to not be NULL in start tag
route.gw_src = nullptr;
route.gw_dst = nullptr;
route.link_list = new std::vector<Link*>();
route.link_list->push_back(link);
}
-
-
sg_platf_new_route(&route);
- parsed_link_list = nullptr;
+ delete route.link_list;
+ xbt_dynar_free(&parsed_link_list);
}
void ETag_surfxml_ASroute(void){
s_sg_platf_route_cbarg_t ASroute;
memset(&ASroute,0,sizeof(ASroute));
- ASroute.src = A_surfxml_ASroute_src;
- ASroute.dst = A_surfxml_ASroute_dst;
+ ASroute.src = sg_netcard_by_name_or_null(A_surfxml_ASroute_src); // tested to not be NULL in start tag
+ ASroute.dst = sg_netcard_by_name_or_null(A_surfxml_ASroute_dst); // tested to not be NULL in start tag
- ASroute.gw_src = sg_netcard_by_name_or_null(A_surfxml_ASroute_gw___src);
- ASroute.gw_dst = sg_netcard_by_name_or_null(A_surfxml_ASroute_gw___dst);
-
- if (A_surfxml_ASroute_gw___src && !ASroute.gw_src)
- surf_parse_error("gw_src=\"%s\" not found for ASroute from \"%s\" to \"%s\"",
- A_surfxml_ASroute_gw___src, ASroute.src, ASroute.dst);
- if (A_surfxml_ASroute_gw___dst && !ASroute.gw_dst)
- surf_parse_error("gw_dst=\"%s\" not found for ASroute from \"%s\" to \"%s\"",
- A_surfxml_ASroute_gw___dst, ASroute.src, ASroute.dst);
+ ASroute.gw_src = sg_netcard_by_name_or_null(A_surfxml_ASroute_gw___src); // tested to not be NULL in start tag
+ ASroute.gw_dst = sg_netcard_by_name_or_null(A_surfxml_ASroute_gw___dst); // tested to not be NULL in start tag
ASroute.link_list = new std::vector<Link*>();
simgrid::surf::Link *link = Link::byName(link_name);
ASroute.link_list->push_back(link);
}
+ xbt_dynar_free(&parsed_link_list);
switch (A_surfxml_ASroute_symmetrical) {
case AU_surfxml_ASroute_symmetrical:
}
sg_platf_new_route(&ASroute);
- parsed_link_list = nullptr;
+ delete ASroute.link_list;
}
void ETag_surfxml_bypassRoute(void){
s_sg_platf_route_cbarg_t route;
memset(&route,0,sizeof(route));
- route.src = A_surfxml_bypassRoute_src;
- route.dst = A_surfxml_bypassRoute_dst;
+ route.src = sg_netcard_by_name_or_null(A_surfxml_bypassRoute_src); // tested to not be NULL in start tag
+ route.dst = sg_netcard_by_name_or_null(A_surfxml_bypassRoute_dst); // tested to not be NULL in start tag
route.gw_src = nullptr;
route.gw_dst = nullptr;
route.symmetrical = false;
s_sg_platf_route_cbarg_t ASroute;
memset(&ASroute,0,sizeof(ASroute));
- ASroute.src = A_surfxml_bypassASroute_src;
- ASroute.dst = A_surfxml_bypassASroute_dst;
- ASroute.link_list = new std::vector<Link*>();
+ ASroute.src = sg_netcard_by_name_or_null(A_surfxml_bypassASroute_src);
+ ASroute.dst = sg_netcard_by_name_or_null(A_surfxml_bypassASroute_dst);
+ ASroute.link_list = new std::vector<Link*>();
unsigned int cpt;
char *link_name;
xbt_dynar_foreach(parsed_link_list, cpt, link_name) {
}
void ETag_surfxml_trace(void){
- s_sg_platf_trace_cbarg_t trace = SG_PLATF_TRACE_INITIALIZER;
+ s_sg_platf_trace_cbarg_t trace;
memset(&trace,0,sizeof(trace));
trace.id = A_surfxml_trace_id;
void STag_surfxml_trace___connect(void){
parse_after_config();
- s_sg_platf_trace_connect_cbarg_t trace_connect = SG_PLATF_TRACE_CONNECT_INITIALIZER;
+ s_sg_platf_trace_connect_cbarg_t trace_connect;
memset(&trace_connect,0,sizeof(trace_connect));
trace_connect.element = A_surfxml_trace___connect_element;
void STag_surfxml_AS(void){
parse_after_config();
AS_TAG = 1;
- s_sg_platf_AS_cbarg_t AS = SG_PLATF_AS_INITIALIZER;
- AS.id = A_surfxml_AS_id;
- AS.routing = (int)A_surfxml_AS_routing;
+ s_sg_platf_AS_cbarg_t AS = { A_surfxml_AS_id, (int)A_surfxml_AS_routing};
as_current_property_set = nullptr;
xbt_dict_t dict = (xbt_dict_t) as_dict_tab[as_prop_nb-1];
as_prop_nb--;
XBT_DEBUG("POP prop %p for AS '%s'",dict,name);
- xbt_lib_set(as_router_lib,
- name,
- ROUTING_PROP_ASR_LEVEL,
- dict);
+ xbt_lib_set(as_router_lib, name, ROUTING_PROP_ASR_LEVEL, dict);
xbt_free(name);
}
- sg_platf_new_AS_end();
+ sg_platf_new_AS_seal();
}
void STag_surfxml_config(void){
char *cfg;
xbt_dict_foreach(current_property_set, cursor, key, elem) {
cfg = bprintf("%s:%s",key,elem);
- if(xbt_cfg_is_default_value(_sg_cfg_set, key))
- xbt_cfg_set_parse(_sg_cfg_set, cfg);
+ if(xbt_cfg_is_default_value(key))
+ xbt_cfg_set_parse(cfg);
else
XBT_INFO("The custom configuration '%s' is already defined by user!",key);
free(cfg);
}
void ETag_surfxml_process(void){
- s_sg_platf_process_cbarg_t process = SG_PLATF_PROCESS_INITIALIZER;
+ s_sg_platf_process_cbarg_t process;
memset(&process,0,sizeof(process));
process.argc = argc;
}
sg_platf_new_process(&process);
+
+ for (int i = 0; i != argc; ++i)
+ xbt_free(argv[i]);
+ xbt_free(argv);
+ argv = nullptr;
+
current_property_set = nullptr;
}
void surf_parse_open(const char *file)
{
- xbt_assert(file, "Cannot parse the NULL file. Bypassing the parser is strongly deprecated nowadays.");
+ xbt_assert(file, "Cannot parse the nullptr file. Bypassing the parser is strongly deprecated nowadays.");
if (!surf_input_buffer_stack)
surf_input_buffer_stack = xbt_dynar_new(sizeof(YY_BUFFER_STATE), nullptr);