All elements must exist, having one of them is not enough

[simgrid.git] / src / surf / surfxml_parse.cpp

diff --git a/src/surf/surfxml_parse.cpp b/src/surf/surfxml_parse.cpp
index da1c63d..7bb17c0 100644 (file)
--- a/src/surf/surfxml_parse.cpp
+++ b/src/surf/surfxml_parse.cpp
@@ -15,7 +15,6 @@
 #include "xbt/dict.h"
 #include "src/surf/surf_private.h"
 #include "simgrid/sg_config.h"
-#include "surfxml_private.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_parse, surf,
                                 "Logging specific to the SURF parsing module");
@@ -55,7 +54,6 @@ double surf_parse_get_double(const char *string) {
   int ret = sscanf(string, "%lg", &res);
   if (ret != 1)
     surf_parse_error("%s is not a double", string);
-  //printf("Parsed double [%g] %s\n", res, string);
   return res;
 }
 
@@ -508,7 +506,7 @@ void STag_surfxml_host___link(void){
   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_netcard(&host_link);
+  sg_platf_new_hostlink(&host_link);
 }
 
 void STag_surfxml_router(void){
@@ -732,9 +730,9 @@ void STag_surfxml_route(void){
 
 void STag_surfxml_ASroute(void){
   xbt_assert(strlen(A_surfxml_ASroute_src) > 0
-             || strlen(A_surfxml_ASroute_dst) > 0
-             || strlen(A_surfxml_ASroute_gw___src) > 0
-             || strlen(A_surfxml_ASroute_gw___dst) > 0,
+             && strlen(A_surfxml_ASroute_dst) > 0
+             && strlen(A_surfxml_ASroute_gw___src) > 0
+             && strlen(A_surfxml_ASroute_gw___dst) > 0,
              "Missing end-points while defining route \"%s\"->\"%s\" (with %s and %s as gateways)",
              A_surfxml_ASroute_src, A_surfxml_ASroute_dst,
              A_surfxml_ASroute_gw___src, A_surfxml_ASroute_gw___dst);
@@ -743,17 +741,17 @@ void STag_surfxml_ASroute(void){
 
 void STag_surfxml_bypassRoute(void){
   xbt_assert(strlen(A_surfxml_bypassRoute_src) > 0
-             || strlen(A_surfxml_bypassRoute_dst) > 0,
-             "Missing end-points while defining bupass route \"%s\"->\"%s\"",
+             && strlen(A_surfxml_bypassRoute_dst) > 0,
+             "Missing end-points while defining bypass route \"%s\"->\"%s\"",
              A_surfxml_bypassRoute_src, A_surfxml_bypassRoute_dst);
   parsed_link_list = xbt_dynar_new(sizeof(char *), &xbt_free_ref);
 }
 
 void STag_surfxml_bypassASroute(void){
   xbt_assert(strlen(A_surfxml_bypassASroute_src) > 0
-             || strlen(A_surfxml_bypassASroute_dst) > 0
-             || strlen(A_surfxml_bypassASroute_gw___src) > 0
-             || strlen(A_surfxml_bypassASroute_gw___dst) > 0,
+             && strlen(A_surfxml_bypassASroute_dst) > 0
+             && strlen(A_surfxml_bypassASroute_gw___src) > 0
+             && strlen(A_surfxml_bypassASroute_gw___dst) > 0,
              "Missing end-points while defining route \"%s\"->\"%s\" (with %s and %s as gateways)",
              A_surfxml_bypassASroute_src, A_surfxml_bypassASroute_dst,
              A_surfxml_bypassASroute_gw___src,A_surfxml_bypassASroute_gw___dst);
@@ -813,7 +811,7 @@ void ETag_surfxml_ASroute(void){
     break;
   }
 
-  sg_platf_new_ASroute(&ASroute);
+  sg_platf_new_route(&ASroute);
   parsed_link_list = NULL;
 }
 
@@ -844,7 +842,7 @@ void ETag_surfxml_bypassASroute(void){
   ASroute.gw_src = sg_netcard_by_name_or_null(A_surfxml_bypassASroute_gw___src);
   ASroute.gw_dst = sg_netcard_by_name_or_null(A_surfxml_bypassASroute_gw___dst);
 
-  sg_platf_new_bypassASroute(&ASroute);
+  sg_platf_new_bypassRoute(&ASroute);
   parsed_link_list = NULL;
 }