From 693ba4212f01cdcc236bc94bfb2a0fbcbb6a3379 Mon Sep 17 00:00:00 2001 From: alegrand Date: Tue, 21 Mar 2006 10:27:11 +0000 Subject: [PATCH] Keep up with last API modifications induced by flexml's modifications. git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@1966 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- examples/msg/msg_test_surfxml_bypassed.c | 172 +++++++++++------------ src/msg/deployment.c | 22 +-- src/surf/cpu.c | 19 +-- src/surf/network.c | 42 +++--- src/surf/network_dassf.c | 38 ++--- src/surf/workstation_KCCFLN05.c | 66 ++++----- src/xbt/graph.c | 13 +- tools/gras/stub_generator.c | 16 +-- 8 files changed, 195 insertions(+), 193 deletions(-) diff --git a/examples/msg/msg_test_surfxml_bypassed.c b/examples/msg/msg_test_surfxml_bypassed.c index 55f74f626f..9a742d9c26 100644 --- a/examples/msg/msg_test_surfxml_bypassed.c +++ b/examples/msg/msg_test_surfxml_bypassed.c @@ -6,8 +6,8 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include "msg/msg.h" /* Yeah! If you want to use msg, you need to include msg/msg.h */ -#include "surf/surf_parse.h" /* to override surf_parse */ -#include "surf/surfxml.h" /* to hijack surf_parse_lex */ +#include "surf/surfxml_parse.h" /* to override surf_parse */ +#include "surf/surfxml.h" /* to hijack surf_parse_lex */ /* Create a log channel to have nice outputs. */ #include "xbt/log.h" @@ -17,123 +17,123 @@ XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test,"Messages specific for this msg example"); static int surf_parse_bypass(void) { /* */ - STag_platform_description(); + STag_surfxml_platform_description(); /* */ - A_cpu_name = "Cpu A"; - A_cpu_power= "100.00"; - A_cpu_availability = "1.0"; - A_cpu_availability_file = ""; - A_cpu_state = A_cpu_state_ON; - A_cpu_state_file = NULL; - A_cpu_interference_send = "1.0"; - A_cpu_interference_recv = "1.0"; - A_cpu_interference_send_recv = "1.0"; - A_cpu_max_outgoing_rate = "-1.0"; - - STag_cpu(); - ETag_cpu(); + A_surfxml_cpu_name = "Cpu A"; + A_surfxml_cpu_power= "100.00"; + A_surfxml_cpu_availability = "1.0"; + A_surfxml_cpu_availability_file = ""; + A_surfxml_cpu_state = A_surfxml_cpu_state_ON; + A_surfxml_cpu_state_file = NULL; + A_surfxml_cpu_interference_send = "1.0"; + A_surfxml_cpu_interference_recv = "1.0"; + A_surfxml_cpu_interference_send_recv = "1.0"; + A_surfxml_cpu_max_outgoing_rate = "-1.0"; + + STag_surfxml_cpu(); + ETag_surfxml_cpu(); /* */ - A_cpu_name = "Cpu B"; - A_cpu_power= "100.00"; - A_cpu_availability = "1.0"; - A_cpu_availability_file = ""; - A_cpu_state = A_cpu_state_ON; - A_cpu_state_file = NULL; - A_cpu_interference_send = "1.0"; - A_cpu_interference_recv = "1.0"; - A_cpu_interference_send_recv = "1.0"; - A_cpu_max_outgoing_rate = "-1.0"; - - STag_cpu(); - ETag_cpu(); + A_surfxml_cpu_name = "Cpu B"; + A_surfxml_cpu_power= "100.00"; + A_surfxml_cpu_availability = "1.0"; + A_surfxml_cpu_availability_file = ""; + A_surfxml_cpu_state = A_surfxml_cpu_state_ON; + A_surfxml_cpu_state_file = NULL; + A_surfxml_cpu_interference_send = "1.0"; + A_surfxml_cpu_interference_recv = "1.0"; + A_surfxml_cpu_interference_send_recv = "1.0"; + A_surfxml_cpu_max_outgoing_rate = "-1.0"; + + STag_surfxml_cpu(); + ETag_surfxml_cpu(); /* */ - A_network_link_name = "LinkA"; - A_network_link_bandwidth = "10.0"; - A_network_link_bandwidth_file = NULL; - A_network_link_latency = "0.2"; - A_network_link_latency_file = NULL; - A_network_link_state = A_network_link_state_ON; - A_network_link_state_file = NULL; - A_network_link_sharing_policy = A_network_link_sharing_policy_SHARED; - STag_network_link(); - ETag_network_link(); + A_surfxml_network_link_name = "LinkA"; + A_surfxml_network_link_bandwidth = "10.0"; + A_surfxml_network_link_bandwidth_file = NULL; + A_surfxml_network_link_latency = "0.2"; + A_surfxml_network_link_latency_file = NULL; + A_surfxml_network_link_state = A_surfxml_network_link_state_ON; + A_surfxml_network_link_state_file = NULL; + A_surfxml_network_link_sharing_policy = A_surfxml_network_link_sharing_policy_SHARED; + STag_surfxml_network_link(); + ETag_surfxml_network_link(); /* */ - A_route_src = "Cpu A"; - A_route_dst = "Cpu B"; - A_route_impact_on_src = "0.0"; - A_route_impact_on_dst = "0.0"; - A_route_impact_on_src_with_other_recv = "0.0"; - A_route_impact_on_dst_with_other_send = "0.0"; + A_surfxml_route_src = "Cpu A"; + A_surfxml_route_dst = "Cpu B"; + A_surfxml_route_impact_on_src = "0.0"; + A_surfxml_route_impact_on_dst = "0.0"; + A_surfxml_route_impact_on_src_with_other_recv = "0.0"; + A_surfxml_route_impact_on_dst_with_other_send = "0.0"; - STag_route(); + STag_surfxml_route(); - A_route_element_name = "LinkA"; - STag_route_element(); - ETag_route_element(); + A_surfxml_route_element_name = "LinkA"; + STag_surfxml_route_element(); + ETag_surfxml_route_element(); - ETag_route(); + ETag_surfxml_route(); /* */ - A_route_src = "Cpu B"; - A_route_dst = "Cpu A"; - A_route_impact_on_src = "0.0"; - A_route_impact_on_dst = "0.0"; - A_route_impact_on_src_with_other_recv = "0.0"; - A_route_impact_on_dst_with_other_send = "0.0"; + A_surfxml_route_src = "Cpu B"; + A_surfxml_route_dst = "Cpu A"; + A_surfxml_route_impact_on_src = "0.0"; + A_surfxml_route_impact_on_dst = "0.0"; + A_surfxml_route_impact_on_src_with_other_recv = "0.0"; + A_surfxml_route_impact_on_dst_with_other_send = "0.0"; - STag_route(); + STag_surfxml_route(); - A_route_element_name = "LinkA"; - STag_route_element(); - ETag_route_element(); + A_surfxml_route_element_name = "LinkA"; + STag_surfxml_route_element(); + ETag_surfxml_route_element(); - ETag_route(); + ETag_surfxml_route(); /* */ - A_process_host = "Cpu A"; - A_process_function = "master"; - A_process_start_time = "-1.0"; - A_process_kill_time = "-1.0"; - STag_process(); + A_surfxml_process_host = "Cpu A"; + A_surfxml_process_function = "master"; + A_surfxml_process_start_time = "-1.0"; + A_surfxml_process_kill_time = "-1.0"; + STag_surfxml_process(); /* */ - A_argument_value = "20"; - STag_argument(); - ETag_argument(); + A_surfxml_argument_value = "20"; + STag_surfxml_argument(); + ETag_surfxml_argument(); /* */ - A_argument_value = "50000"; - STag_argument(); - ETag_argument(); + A_surfxml_argument_value = "50000"; + STag_surfxml_argument(); + ETag_surfxml_argument(); /* */ - A_argument_value = "10"; - STag_argument(); - ETag_argument(); + A_surfxml_argument_value = "10"; + STag_surfxml_argument(); + ETag_surfxml_argument(); /* */ - A_argument_value = "Cpu B"; - STag_argument(); - ETag_argument(); + A_surfxml_argument_value = "Cpu B"; + STag_surfxml_argument(); + ETag_surfxml_argument(); /* */ - ETag_process(); + ETag_surfxml_process(); /* */ - A_process_host = "Cpu B"; - A_process_function = "slave"; - A_process_start_time = "-1.0"; - A_process_kill_time = "-1.0"; - STag_process(); - ETag_process(); + A_surfxml_process_host = "Cpu B"; + A_surfxml_process_function = "slave"; + A_surfxml_process_start_time = "-1.0"; + A_surfxml_process_kill_time = "-1.0"; + STag_surfxml_process(); + ETag_surfxml_process(); /* */ - ETag_platform_description(); + ETag_surfxml_platform_description(); return 0; } diff --git a/src/msg/deployment.c b/src/msg/deployment.c index 21a1f743a8..2b6a7a0787 100644 --- a/src/msg/deployment.c +++ b/src/msg/deployment.c @@ -19,24 +19,24 @@ static double kill_time = -1.0; static void parse_process_init(void) { - parse_host = MSG_get_host_by_name(A_process_host); - xbt_assert1(parse_host, "Unknown host %s",A_process_host); - parse_code = MSG_get_registered_function(A_process_function); - xbt_assert1(parse_code, "Unknown function %s",A_process_function); + parse_host = MSG_get_host_by_name(A_surfxml_process_host); + xbt_assert1(parse_host, "Unknown host %s",A_surfxml_process_host); + parse_code = MSG_get_registered_function(A_surfxml_process_function); + xbt_assert1(parse_code, "Unknown function %s",A_surfxml_process_function); parse_argc = 0 ; parse_argv = NULL; parse_argc++; parse_argv = xbt_realloc(parse_argv, (parse_argc) * sizeof(char *)); - parse_argv[(parse_argc) - 1] = xbt_strdup(A_process_function); - surf_parse_get_double(&start_time,A_process_start_time); - surf_parse_get_double(&kill_time,A_process_kill_time); + parse_argv[(parse_argc) - 1] = xbt_strdup(A_surfxml_process_function); + surf_parse_get_double(&start_time,A_surfxml_process_start_time); + surf_parse_get_double(&kill_time,A_surfxml_process_kill_time); } static void parse_argument(void) { parse_argc++; parse_argv = xbt_realloc(parse_argv, (parse_argc) * sizeof(char *)); - parse_argv[(parse_argc) - 1] = xbt_strdup(A_argument_value); + parse_argv[(parse_argc) - 1] = xbt_strdup(A_surfxml_argument_value); } static void parse_process_finalize(void) @@ -86,9 +86,9 @@ static void parse_process_finalize(void) void MSG_launch_application(const char *file) { xbt_assert0(msg_global,"MSG_global_init_args has to be called before MSG_launch_application."); - STag_process_fun = parse_process_init; - ETag_argument_fun = parse_argument; - ETag_process_fun = parse_process_finalize; + STag_surfxml_process_fun = parse_process_init; + ETag_surfxml_argument_fun = parse_argument; + ETag_surfxml_process_fun = parse_process_finalize; surf_parse_open(file); xbt_assert1((!surf_parse()),"Parse error in %s",file); surf_parse_close(); diff --git a/src/surf/cpu.c b/src/surf/cpu.c index e3c0967e14..ecac805821 100644 --- a/src/surf/cpu.c +++ b/src/surf/cpu.c @@ -60,16 +60,17 @@ static void parse_cpu(void) e_surf_cpu_state_t state_initial = SURF_CPU_OFF; tmgr_trace_t state_trace = NULL; - name = xbt_strdup(A_cpu_name); - surf_parse_get_double(&power_scale,A_cpu_power); - surf_parse_get_double(&power_initial,A_cpu_availability); - surf_parse_get_trace(&power_trace,A_cpu_availability_file); + name = xbt_strdup(A_surfxml_cpu_name); + surf_parse_get_double(&power_scale,A_surfxml_cpu_power); + surf_parse_get_double(&power_initial,A_surfxml_cpu_availability); + surf_parse_get_trace(&power_trace,A_surfxml_cpu_availability_file); - xbt_assert0((A_cpu_state==A_cpu_state_ON)||(A_cpu_state==A_cpu_state_OFF), + xbt_assert0((A_surfxml_cpu_state==A_surfxml_cpu_state_ON)|| + (A_surfxml_cpu_state==A_surfxml_cpu_state_OFF), "Invalid state"); - if (A_cpu_state==A_cpu_state_ON) state_initial = SURF_CPU_ON; - if (A_cpu_state==A_cpu_state_OFF) state_initial = SURF_CPU_OFF; - surf_parse_get_trace(&state_trace,A_cpu_state_file); + if (A_surfxml_cpu_state==A_surfxml_cpu_state_ON) state_initial = SURF_CPU_ON; + if (A_surfxml_cpu_state==A_surfxml_cpu_state_OFF) state_initial = SURF_CPU_OFF; + surf_parse_get_trace(&state_trace,A_surfxml_cpu_state_file); cpu_new(name, power_scale, power_initial, power_trace, state_initial, state_trace); @@ -78,7 +79,7 @@ static void parse_cpu(void) static void parse_file(const char *file) { surf_parse_reset_parser(); - ETag_cpu_fun=parse_cpu; + ETag_surfxml_cpu_fun=parse_cpu; surf_parse_open(file); xbt_assert1((!surf_parse()),"Parse error in %s",file); surf_parse_close(); diff --git a/src/surf/network.c b/src/surf/network.c index 5e1be16467..8d6fc84a0a 100644 --- a/src/surf/network.c +++ b/src/surf/network.c @@ -119,26 +119,26 @@ static void parse_network_link(void) e_surf_network_link_sharing_policy_t policy_initial = SURF_NETWORK_LINK_SHARED; tmgr_trace_t state_trace; - name = xbt_strdup(A_network_link_name); - surf_parse_get_double(&bw_initial,A_network_link_bandwidth); - surf_parse_get_trace(&bw_trace, A_network_link_bandwidth_file); - surf_parse_get_double(&lat_initial,A_network_link_latency); - surf_parse_get_trace(&lat_trace, A_network_link_latency_file); - - xbt_assert0((A_network_link_state==A_network_link_state_ON)|| - (A_network_link_state==A_network_link_state_OFF), + name = xbt_strdup(A_surfxml_network_link_name); + surf_parse_get_double(&bw_initial,A_surfxml_network_link_bandwidth); + surf_parse_get_trace(&bw_trace, A_surfxml_network_link_bandwidth_file); + surf_parse_get_double(&lat_initial,A_surfxml_network_link_latency); + surf_parse_get_trace(&lat_trace, A_surfxml_network_link_latency_file); + + xbt_assert0((A_surfxml_network_link_state==A_surfxml_network_link_state_ON)|| + (A_surfxml_network_link_state==A_surfxml_network_link_state_OFF), "Invalid state"); - if (A_network_link_state==A_network_link_state_ON) + if (A_surfxml_network_link_state==A_surfxml_network_link_state_ON) state_initial = SURF_NETWORK_LINK_ON; - else if (A_network_link_state==A_network_link_state_OFF) + else if (A_surfxml_network_link_state==A_surfxml_network_link_state_OFF) state_initial = SURF_NETWORK_LINK_OFF; - if (A_network_link_sharing_policy==A_network_link_sharing_policy_SHARED) + if (A_surfxml_network_link_sharing_policy==A_surfxml_network_link_sharing_policy_SHARED) policy_initial = SURF_NETWORK_LINK_SHARED; - else if (A_network_link_sharing_policy==A_network_link_sharing_policy_FATPIPE) + else if (A_surfxml_network_link_sharing_policy==A_surfxml_network_link_sharing_policy_FATPIPE) policy_initial = SURF_NETWORK_LINK_FATPIPE; - surf_parse_get_trace(&state_trace,A_network_link_state_file); + surf_parse_get_trace(&state_trace,A_surfxml_network_link_state_file); network_link_new(name, bw_initial, bw_trace, lat_initial, lat_trace, state_initial, state_trace, @@ -152,8 +152,8 @@ static int dst_id = -1; static void parse_route_set_endpoints(void) { - src_id = network_card_new(A_route_src); - dst_id = network_card_new(A_route_dst); + src_id = network_card_new(A_surfxml_route_src); + dst_id = network_card_new(A_surfxml_route_dst); nb_link = 0; link_name = NULL; } @@ -162,7 +162,7 @@ static void parse_route_elem(void) { nb_link++; link_name = xbt_realloc(link_name, (nb_link) * sizeof(char *)); - link_name[(nb_link) - 1] = xbt_strdup(A_route_element_name); + link_name[(nb_link) - 1] = xbt_strdup(A_surfxml_route_element_name); } static void parse_route_set_route(void) @@ -176,14 +176,14 @@ static void parse_file(const char *file) /* Figuring out the network links */ surf_parse_reset_parser(); - ETag_network_link_fun=parse_network_link; + ETag_surfxml_network_link_fun=parse_network_link; surf_parse_open(file); xbt_assert1((!surf_parse()),"Parse error in %s",file); surf_parse_close(); /* Figuring out the network cards used */ surf_parse_reset_parser(); - STag_route_fun=parse_route_set_endpoints; + STag_surfxml_route_fun=parse_route_set_endpoints; surf_parse_open(file); xbt_assert1((!surf_parse()),"Parse error in %s",file); surf_parse_close(); @@ -192,9 +192,9 @@ static void parse_file(const char *file) /* Building the routes */ surf_parse_reset_parser(); - STag_route_fun=parse_route_set_endpoints; - ETag_route_element_fun=parse_route_elem; - ETag_route_fun=parse_route_set_route; + STag_surfxml_route_fun=parse_route_set_endpoints; + ETag_surfxml_route_element_fun=parse_route_elem; + ETag_surfxml_route_fun=parse_route_set_route; surf_parse_open(file); xbt_assert1((!surf_parse()),"Parse error in %s",file); surf_parse_close(); diff --git a/src/surf/network_dassf.c b/src/surf/network_dassf.c index b307415c1a..559abbe0a7 100644 --- a/src/surf/network_dassf.c +++ b/src/surf/network_dassf.c @@ -113,20 +113,20 @@ static void parse_network_link(void) e_surf_network_link_state_t state_initial = SURF_NETWORK_LINK_ON; tmgr_trace_t state_trace; - name = xbt_strdup(A_network_link_name); - surf_parse_get_double(&bw_initial,A_network_link_bandwidth); - surf_parse_get_trace(&bw_trace, A_network_link_bandwidth_file); - surf_parse_get_double(&lat_initial,A_network_link_latency); - surf_parse_get_trace(&lat_trace, A_network_link_latency_file); - - xbt_assert0((A_network_link_state==A_network_link_state_ON)|| - (A_network_link_state==A_network_link_state_OFF), + name = xbt_strdup(A_surfxml_network_link_name); + surf_parse_get_double(&bw_initial,A_surfxml_network_link_bandwidth); + surf_parse_get_trace(&bw_trace, A_surfxml_network_link_bandwidth_file); + surf_parse_get_double(&lat_initial,A_surfxml_network_link_latency); + surf_parse_get_trace(&lat_trace, A_surfxml_network_link_latency_file); + + xbt_assert0((A_surfxml_network_link_state==A_surfxml_network_link_state_ON)|| + (A_surfxml_network_link_state==A_surfxml_network_link_state_OFF), "Invalid state"); - if (A_network_link_state==A_network_link_state_ON) + if (A_surfxml_network_link_state==A_surfxml_network_link_state_ON) state_initial = SURF_NETWORK_LINK_ON; - if (A_network_link_state==A_network_link_state_OFF) + if (A_surfxml_network_link_state==A_surfxml_network_link_state_OFF) state_initial = SURF_NETWORK_LINK_OFF; - surf_parse_get_trace(&state_trace,A_network_link_state_file); + surf_parse_get_trace(&state_trace,A_surfxml_network_link_state_file); network_link_new(name, bw_initial, bw_trace, lat_initial, lat_trace, state_initial, state_trace); @@ -139,8 +139,8 @@ static int dst_id = -1; static void parse_route_set_endpoints(void) { - src_id = network_card_new(A_route_src); - dst_id = network_card_new(A_route_dst); + src_id = network_card_new(A_surfxml_route_src); + dst_id = network_card_new(A_surfxml_route_dst); nb_link = 0; link_name = NULL; } @@ -149,7 +149,7 @@ static void parse_route_elem(void) { nb_link++; link_name = xbt_realloc(link_name, (nb_link) * sizeof(char *)); - link_name[(nb_link) - 1] = xbt_strdup(A_route_element_name); + link_name[(nb_link) - 1] = xbt_strdup(A_surfxml_route_element_name); } static void parse_route_set_route(void) @@ -161,14 +161,14 @@ static void parse_file(const char *file) { /* Figuring out the network links */ surf_parse_reset_parser(); - ETag_network_link_fun=parse_network_link; + ETag_surfxml_network_link_fun=parse_network_link; surf_parse_open(file); xbt_assert1((!surf_parse()),"Parse error in %s",file); surf_parse_close(); /* Figuring out the network cards used */ surf_parse_reset_parser(); - STag_route_fun=parse_route_set_endpoints; + STag_surfxml_route_fun=parse_route_set_endpoints; surf_parse_open(file); xbt_assert1((!surf_parse()),"Parse error in %s",file); surf_parse_close(); @@ -177,9 +177,9 @@ static void parse_file(const char *file) /* Building the routes */ surf_parse_reset_parser(); - STag_route_fun=parse_route_set_endpoints; - ETag_route_element_fun=parse_route_elem; - ETag_route_fun=parse_route_set_route; + STag_surfxml_route_fun=parse_route_set_endpoints; + ETag_surfxml_route_element_fun=parse_route_elem; + ETag_surfxml_route_fun=parse_route_set_route; surf_parse_open(file); xbt_assert1((!surf_parse()),"Parse error in %s",file); surf_parse_close(); diff --git a/src/surf/workstation_KCCFLN05.c b/src/surf/workstation_KCCFLN05.c index fc2e0c757a..17ce526cc9 100644 --- a/src/surf/workstation_KCCFLN05.c +++ b/src/surf/workstation_KCCFLN05.c @@ -97,23 +97,23 @@ static void parse_workstation(void) double interference_send_recv = 0.0; double max_outgoing_rate = -1.0; - surf_parse_get_double(&power_scale,A_cpu_power); - surf_parse_get_double(&power_initial,A_cpu_availability); - surf_parse_get_trace(&power_trace,A_cpu_availability_file); + surf_parse_get_double(&power_scale,A_surfxml_cpu_power); + surf_parse_get_double(&power_initial,A_surfxml_cpu_availability); + surf_parse_get_trace(&power_trace,A_surfxml_cpu_availability_file); - xbt_assert0((A_cpu_state==A_cpu_state_ON)|| - (A_cpu_state==A_cpu_state_OFF), + xbt_assert0((A_surfxml_cpu_state==A_surfxml_cpu_state_ON)|| + (A_surfxml_cpu_state==A_surfxml_cpu_state_OFF), "Invalid state"); - if (A_cpu_state==A_cpu_state_ON) state_initial = SURF_CPU_ON; - if (A_cpu_state==A_cpu_state_OFF) state_initial = SURF_CPU_OFF; - surf_parse_get_trace(&state_trace,A_cpu_state_file); + if (A_surfxml_cpu_state==A_surfxml_cpu_state_ON) state_initial = SURF_CPU_ON; + if (A_surfxml_cpu_state==A_surfxml_cpu_state_OFF) state_initial = SURF_CPU_OFF; + surf_parse_get_trace(&state_trace,A_surfxml_cpu_state_file); - surf_parse_get_double(&interference_send,A_cpu_interference_send); - surf_parse_get_double(&interference_recv,A_cpu_interference_recv); - surf_parse_get_double(&interference_send_recv,A_cpu_interference_send_recv); - surf_parse_get_double(&max_outgoing_rate,A_cpu_max_outgoing_rate); + surf_parse_get_double(&interference_send,A_surfxml_cpu_interference_send); + surf_parse_get_double(&interference_recv,A_surfxml_cpu_interference_recv); + surf_parse_get_double(&interference_send_recv,A_surfxml_cpu_interference_send_recv); + surf_parse_get_double(&max_outgoing_rate,A_surfxml_cpu_max_outgoing_rate); - workstation_new(A_cpu_name, power_scale, power_initial, power_trace, state_initial, + workstation_new(A_surfxml_cpu_name, power_scale, power_initial, power_trace, state_initial, state_trace, interference_send, interference_recv, interference_send_recv, max_outgoing_rate); } @@ -223,18 +223,18 @@ static void parse_network_link(void) e_surf_network_link_state_t state_initial = SURF_NETWORK_LINK_ON; tmgr_trace_t state_trace; - name = xbt_strdup(A_network_link_name); - surf_parse_get_double(&bw_initial,A_network_link_bandwidth); - surf_parse_get_trace(&bw_trace, A_network_link_bandwidth_file); + name = xbt_strdup(A_surfxml_network_link_name); + surf_parse_get_double(&bw_initial,A_surfxml_network_link_bandwidth); + surf_parse_get_trace(&bw_trace, A_surfxml_network_link_bandwidth_file); - xbt_assert0((A_network_link_state==A_network_link_state_ON)|| - (A_network_link_state==A_network_link_state_OFF), + xbt_assert0((A_surfxml_network_link_state==A_surfxml_network_link_state_ON)|| + (A_surfxml_network_link_state==A_surfxml_network_link_state_OFF), "Invalid state"); - if (A_network_link_state==A_network_link_state_ON) + if (A_surfxml_network_link_state==A_surfxml_network_link_state_ON) state_initial = SURF_NETWORK_LINK_ON; - if (A_network_link_state==A_network_link_state_OFF) + if (A_surfxml_network_link_state==A_surfxml_network_link_state_OFF) state_initial = SURF_NETWORK_LINK_OFF; - surf_parse_get_trace(&state_trace,A_network_link_state_file); + surf_parse_get_trace(&state_trace,A_surfxml_network_link_state_file); network_link_new(name, bw_initial, bw_trace, state_initial, state_trace); } @@ -272,12 +272,12 @@ static double impact_on_dst_with_other_send; static void parse_route_set_endpoints(void) { - src_id = ((workstation_KCCFLN05_t) name_service(A_route_src))->id; - dst_id = ((workstation_KCCFLN05_t) name_service(A_route_dst))->id; - surf_parse_get_double(&impact_on_src,A_route_impact_on_src); - surf_parse_get_double(&impact_on_dst,A_route_impact_on_dst); - surf_parse_get_double(&impact_on_src_with_other_recv,A_route_impact_on_src_with_other_recv); - surf_parse_get_double(&impact_on_dst_with_other_send,A_route_impact_on_dst_with_other_send); + src_id = ((workstation_KCCFLN05_t) name_service(A_surfxml_route_src))->id; + dst_id = ((workstation_KCCFLN05_t) name_service(A_surfxml_route_dst))->id; + surf_parse_get_double(&impact_on_src,A_surfxml_route_impact_on_src); + surf_parse_get_double(&impact_on_dst,A_surfxml_route_impact_on_dst); + surf_parse_get_double(&impact_on_src_with_other_recv,A_surfxml_route_impact_on_src_with_other_recv); + surf_parse_get_double(&impact_on_dst_with_other_send,A_surfxml_route_impact_on_dst_with_other_send); nb_link = 0; link_name = NULL; @@ -287,7 +287,7 @@ static void parse_route_elem(void) { nb_link++; link_name = xbt_realloc(link_name, (nb_link) * sizeof(char *)); - link_name[(nb_link) - 1] = xbt_strdup(A_route_element_name); + link_name[(nb_link) - 1] = xbt_strdup(A_surfxml_route_element_name); } static void parse_route_set_route(void) @@ -300,7 +300,7 @@ static void parse_file(const char *file) { /* Figuring out the workstations */ surf_parse_reset_parser(); - ETag_cpu_fun=parse_workstation; + ETag_surfxml_cpu_fun=parse_workstation; surf_parse_open(file); xbt_assert1((!surf_parse()),"Parse error in %s",file); surf_parse_close(); @@ -309,16 +309,16 @@ static void parse_file(const char *file) /* Figuring out the network links */ surf_parse_reset_parser(); - ETag_network_link_fun=parse_network_link; + ETag_surfxml_network_link_fun=parse_network_link; surf_parse_open(file); xbt_assert1((!surf_parse()),"Parse error in %s",file); surf_parse_close(); /* Building the routes */ surf_parse_reset_parser(); - STag_route_fun=parse_route_set_endpoints; - ETag_route_element_fun=parse_route_elem; - ETag_route_fun=parse_route_set_route; + STag_surfxml_route_fun=parse_route_set_endpoints; + ETag_surfxml_route_element_fun=parse_route_elem; + ETag_surfxml_route_fun=parse_route_set_route; surf_parse_open(file); xbt_assert1((!surf_parse()),"Parse error in %s",file); surf_parse_close(); diff --git a/src/xbt/graph.c b/src/xbt/graph.c index 62476059fe..b946ef8511 100644 --- a/src/xbt/graph.c +++ b/src/xbt/graph.c @@ -162,10 +162,11 @@ static void __parse_graph_end(void) { DEBUG0(""); } static void __parse_node(void) { - DEBUG1("",A_node_name); + DEBUG1("",A_graphxml_node_name); } static void __parse_edge(void) { - DEBUG2("",A_edge_source,A_edge_target); + DEBUG2("",A_graphxml_edge_source, + A_graphxml_edge_target); } xbt_graph_t xbt_graph_read(const char *filename) @@ -176,10 +177,10 @@ xbt_graph_t xbt_graph_read(const char *filename) xbt_graph_parse_reset_parser(); - STag_graph_fun = __parse_graph_begin; - ETag_graph_fun = __parse_graph_end; - ETag_node_fun = __parse_node; - ETag_edge_fun = __parse_edge; + STag_graphxml_graph_fun = __parse_graph_begin; + ETag_graphxml_graph_fun = __parse_graph_end; + ETag_graphxml_node_fun = __parse_node; + ETag_graphxml_edge_fun = __parse_edge; xbt_graph_parse_open(filename); xbt_assert1((!xbt_graph_parse()),"Parse error in %s",filename); diff --git a/tools/gras/stub_generator.c b/tools/gras/stub_generator.c index 8e0cb51e16..b602aed730 100644 --- a/tools/gras/stub_generator.c +++ b/tools/gras/stub_generator.c @@ -111,14 +111,14 @@ static void parse_process_init(void) parse_argv = NULL; parse_argc++; parse_argv = xbt_realloc(parse_argv, (parse_argc) * sizeof(char *)); - parse_argv[(parse_argc) - 1] = xbt_strdup(A_process_function); + parse_argv[(parse_argc) - 1] = xbt_strdup(A_surfxml_process_function); } static void parse_argument(void) { parse_argc++; parse_argv = xbt_realloc(parse_argv, (parse_argc) * sizeof(char *)); - parse_argv[(parse_argc) - 1] = xbt_strdup(A_argument_value); + parse_argv[(parse_argc) - 1] = xbt_strdup(A_surfxml_argument_value); } static void parse_process_finalize(void) @@ -126,11 +126,11 @@ static void parse_process_finalize(void) s_process_t process; void *p = (void *) 1234; - xbt_dict_set(process_function_set, A_process_function, p, NULL); - xbt_dict_set(machine_set, A_process_host, p, NULL); + xbt_dict_set(process_function_set, A_surfxml_process_function, p, NULL); + xbt_dict_set(machine_set, A_surfxml_process_host, p, NULL); process.argc=parse_argc; process.argv=parse_argv; - process.host=strdup(A_process_host); + process.host=strdup(A_surfxml_process_host); xbt_dynar_push(process_list,&process); } @@ -572,9 +572,9 @@ int main(int argc, char *argv[]) process_list = xbt_dynar_new(sizeof(s_process_t),s_process_free); machine_set = xbt_dict_new(); - STag_process_fun = parse_process_init; - ETag_argument_fun = parse_argument; - ETag_process_fun = parse_process_finalize; + STag_surfxml_process_fun = parse_process_init; + ETag_surfxml_argument_fun = parse_argument; + ETag_surfxml_process_fun = parse_process_finalize; surf_parse_open(deployment_file); if(surf_parse()) xbt_assert1(0,"Parse error in %s",deployment_file); surf_parse_close(); -- 2.20.1