X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/687f4837379b6b1d25eecb3c3ad9faa6e495efc8..f6ed451b54e9f16d1b1e58987f34aef5cdbc56f7:/src/surf/surfxml_parse.c

diff --git a/src/surf/surfxml_parse.c b/src/surf/surfxml_parse.c
index 9bb8b4e375..7698853255 100644
--- a/src/surf/surfxml_parse.c
+++ b/src/surf/surfxml_parse.c
@@ -7,6 +7,7 @@
 
 #include "xbt/misc.h"
 #include "xbt/log.h"
+#include "xbt/str.h"
 #include "xbt/dict.h"
 #include "surf/surfxml_parse_private.h"
 #include "surf/surf_private.h"
@@ -15,12 +16,17 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_parse, surf,
 				"Logging specific to the SURF parsing module");
 
 #undef CLEANUP
-#include "surfxml.c"
+#include "simgrid_dtd.c"
 
 /* Initialize the parsing globals */
 int route_action = 0;
 xbt_dict_t traces_set_list = NULL;
-xbt_dynar_t traces_connect_list = NULL;
+//xbt_dynar_t traces_connect_list = NULL;
+xbt_dict_t trace_connect_list_host_avail = NULL;
+xbt_dict_t trace_connect_list_power = NULL;
+xbt_dict_t trace_connect_list_link_avail = NULL;
+xbt_dict_t trace_connect_list_bandwidth = NULL;
+xbt_dict_t trace_connect_list_latency = NULL;
 
 /* This buffer is used to store the original buffer before substituing it by out own buffer. Usefull for the foreach tag */
 char* old_buff;
@@ -503,9 +509,14 @@ void init_data(void)
   route_multi_table = xbt_dict_new();
   route_multi_elements = xbt_dynar_new(sizeof(char*), NULL);
   traces_set_list = xbt_dict_new();
-  traces_connect_list = xbt_dynar_new(sizeof(char*), NULL);
-  random_data_list = xbt_dict_new();
+   
+  trace_connect_list_host_avail = xbt_dict_new();
+  trace_connect_list_power = xbt_dict_new();
+  trace_connect_list_link_avail = xbt_dict_new();
+  trace_connect_list_bandwidth = xbt_dict_new();
+  trace_connect_list_latency = xbt_dict_new();
 
+  random_data_list = xbt_dict_new();
 }
 
 void parse_platform_file(const char* file)
@@ -590,7 +601,7 @@ void parse_sets(void)
   current_set = xbt_dynar_new(sizeof(char*), NULL);
 
   
-  for (i=start; i<end; i++) {
+  for (i=start; i<=end; i++) {
      value = bprintf("%s%d%s", prefix, i, suffix);
      xbt_dynar_push(current_set, &value);
   } 
@@ -850,12 +861,14 @@ static void convert_route_multi_to_routes(void)
   unsigned int cpt, cpt2, cursor;
   char *src_host_name, *dst_host_name, *key, *src, *dst, *val, *key_w, *data_w; 
   const char* sep="#";
+  xbt_dict_t set;
   xbt_dynar_t src_names = NULL, dst_names = NULL, links;
 
   if (!route_multi_elements) return;
 
-  xbt_dict_t set = cpu_set;
-  if (workstation_set != NULL)
+  set = cpu_set;
+  DEBUG1("%d", xbt_dict_length(workstation_set));				
+  if (workstation_set != NULL && xbt_dict_length(workstation_set) > 0)
      set = workstation_set;
   
 
@@ -880,18 +893,23 @@ static void convert_route_multi_to_routes(void)
        src_names = xbt_dynar_new(sizeof(char *), &free_string);
        val = xbt_strdup(src);
        xbt_dynar_push(src_names, &val);
+       if (strcmp(val,"$*") != 0 && NULL == xbt_dict_get_or_null(set, val))
+         THROW3(unknown_error,0,"(In route:multi (%s -> %s) source %s does not exist (not a set or a host)", src, dst, src);
     }
     if (dst_names == NULL) {
        dst_names = xbt_dynar_new(sizeof(char *), &free_string);
        val = xbt_strdup(dst);
+       if (strcmp(val,"$*") != 0 && NULL == xbt_dict_get_or_null(set, val))
+         THROW3(unknown_error,0,"(In route:multi (%s -> %s) destination %s does not exist (not a set or a host)", src, dst, dst);
        xbt_dynar_push(dst_names, &val);
     }
+
     /* Build the routes */
     DEBUG2("ADDING MULTI ROUTE: %s -> %s", xbt_dynar_get_as(keys, 0, char*), xbt_dynar_get_as(keys, 1, char*));
     xbt_dynar_foreach(src_names, cpt, src_host_name) {
       xbt_dynar_foreach(dst_names, cpt2, dst_host_name) {
         /* If dst is $* then set this route to have its dst point to all hosts */
-        if (strcmp(src_host_name,"$*") != 0 && strcmp(dst_host_name,"$*") == 0){			
+        if (strcmp(src_host_name,"$*") != 0 && strcmp(dst_host_name,"$*") == 0){
 		  xbt_dict_foreach(set, cursor_w, key_w, data_w) {
                           //int n = xbt_dynar_member(src_names, (char*)key_w);
        			    add_multi_links(src, dst, links, src_host_name, key_w);               
@@ -1044,12 +1062,28 @@ void parse_trace_finalize(void)
 
 void parse_trace_c_connect(void)
 {
-	char* trace_connect;
-   xbt_assert1(xbt_dict_get_or_null(traces_set_list, A_surfxml_trace_c_connect_trace_id),
-	      "Trace %s undefined", A_surfxml_trace_c_connect_trace_id);
-   trace_connect = bprintf("%s#%d#%d#%s", A_surfxml_trace_c_connect_trace_id, A_surfxml_trace_c_connect_element, 
-                                   A_surfxml_trace_c_connect_kind, A_surfxml_trace_c_connect_connector_id);
-   xbt_dynar_push(traces_connect_list, &trace_connect);
+   xbt_assert2(xbt_dict_get_or_null(traces_set_list, A_surfxml_trace_c_connect_trace),
+	      "Cannot connect trace %s to %s: trace unknown", A_surfxml_trace_c_connect_trace,A_surfxml_trace_c_connect_element);
+   
+   switch (A_surfxml_trace_c_connect_kind) {
+    case A_surfxml_trace_c_connect_kind_HOST_AVAIL:
+      xbt_dict_set(trace_connect_list_host_avail, A_surfxml_trace_c_connect_element, xbt_strdup(A_surfxml_trace_c_connect_trace), free);
+      break;
+    case A_surfxml_trace_c_connect_kind_POWER:
+      xbt_dict_set(trace_connect_list_power, A_surfxml_trace_c_connect_element, xbt_strdup(A_surfxml_trace_c_connect_trace), free);
+      break;
+    case A_surfxml_trace_c_connect_kind_LINK_AVAIL:
+      xbt_dict_set(trace_connect_list_link_avail, A_surfxml_trace_c_connect_element, xbt_strdup(A_surfxml_trace_c_connect_trace), free);
+      break;
+    case A_surfxml_trace_c_connect_kind_BANDWIDTH:
+      xbt_dict_set(trace_connect_list_bandwidth, A_surfxml_trace_c_connect_element, xbt_strdup(A_surfxml_trace_c_connect_trace), free);
+      break;
+    case A_surfxml_trace_c_connect_kind_LATENCY:
+      xbt_dict_set(trace_connect_list_latency, A_surfxml_trace_c_connect_element, xbt_strdup(A_surfxml_trace_c_connect_trace), free);
+      break;
+    default:
+      xbt_die("kind of trace unknown");
+   }   
 }
 
 /* Random tag functions */
@@ -1093,7 +1127,7 @@ void init_randomness(void)
 void add_randomness(void)
 {
    /* If needed aditional properties can be added by using the prop tag */
-   random_data_t random = random_new(random_generator, random_min, random_max, random_mean, random_std_deviation);
+  random_data_t random = random_new(random_generator, 0, random_min, random_max, random_mean, random_std_deviation);
    xbt_dict_set(random_data_list, random_id, (void *)random, NULL);
 }