More explicit error reporting around the trace connection mechanism (yeah, just cosme...

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@6264 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/src/surf/network.c b/src/surf/network.c
index fd42c0c..aa60e98 100644 (file)
--- a/src/surf/network.c
+++ b/src/surf/network.c
@@ -253,8 +253,8 @@ static void add_traces(void) {
       tmgr_trace_t trace = xbt_dict_get_or_null(traces_set_list, trace_name);
       link_CM02_t link = xbt_dict_get_or_null(link_set, elm);
       
-      xbt_assert1(link, "Link %s undefined", elm);
-      xbt_assert1(trace, "Trace %s undefined", trace_name);
+      xbt_assert2(link, "Cannot connect trace %s to link %s: link undefined", trace_name,elm);
+      xbt_assert2(trace, "Cannot connect trace %s to link %s: trace undefined", trace_name,elm);
       
       link->state_event = tmgr_history_add_trace(history, trace, 0.0, 0, link);
    }
@@ -263,8 +263,8 @@ static void add_traces(void) {
       tmgr_trace_t trace = xbt_dict_get_or_null(traces_set_list, trace_name);
       link_CM02_t link = xbt_dict_get_or_null(link_set, elm);
       
-      xbt_assert1(link, "Link %s undefined", elm);
-      xbt_assert1(trace, "Trace %s undefined", trace_name);
+      xbt_assert2(link, "Cannot connect trace %s to link %s: link undefined", trace_name,elm);
+      xbt_assert2(trace, "Cannot connect trace %s to link %s: trace undefined", trace_name,elm);
       
       link->bw_event = tmgr_history_add_trace(history, trace, 0.0, 0, link);
    }
@@ -273,8 +273,8 @@ static void add_traces(void) {
       tmgr_trace_t trace = xbt_dict_get_or_null(traces_set_list, trace_name);
       link_CM02_t link = xbt_dict_get_or_null(link_set, elm);
       
-      xbt_assert1(link, "Link %s undefined", elm);
-      xbt_assert1(trace, "Trace %s undefined", trace_name);
+      xbt_assert2(link, "Cannot connect trace %s to link %s: link undefined", trace_name,elm);
+      xbt_assert2(trace, "Cannot connect trace %s to link %s: trace undefined", trace_name,elm);
       
       link->lat_event = tmgr_history_add_trace(history, trace, 0.0, 0, link);
    }

diff --git a/src/surf/surfxml_parse.c b/src/surf/surfxml_parse.c
index 3c38422..e6a8bc2 100644 (file)
--- a/src/surf/surfxml_parse.c
+++ b/src/surf/surfxml_parse.c
@@ -1199,7 +1199,8 @@ static void parse_trace_c_connect(void)
       xbt_dict_set(trace_connect_list_latency, A_surfxml_trace_c_connect_trace, xbt_strdup(A_surfxml_trace_c_connect_element), free);
       break;
     default:
-      xbt_die("kind of trace unknown");
+      xbt_die(bprintf("Cannot connect trace %s to %s: kind of trace unknown",
+                     A_surfxml_trace_c_connect_trace,A_surfxml_trace_c_connect_element));
    }   
 }