X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=lib%2Ftrace-collection.c;h=c117874812bfebf28110ee8d9c3013ac16402831;hp=0ee3c29f08fcb81ad213f4a349e3d4ec18196ce9;hb=f7bbd50246fde81a4ef90fa6bd78e441fccdbb40;hpb=6cba487f031260536d6a77acde888c8b1a876fcf

diff --git a/lib/trace-collection.c b/lib/trace-collection.c
index 0ee3c29f..c1178748 100644
--- a/lib/trace-collection.c
+++ b/lib/trace-collection.c
@@ -132,7 +132,8 @@ static void clock_add(gpointer key, gpointer value, gpointer user_data)
 
 /*
  * Whenever we add a trace to the trace collection, check that we can
- * correlate this trace with at least one other clock in the trace.
+ * correlate this trace with at least one other clock in the trace and
+ * convert the index from cycles to real time.
  */
 int trace_collection_add(struct trace_collection *tc,
 				struct trace_descriptor *td)
@@ -157,7 +158,7 @@ int trace_collection_add(struct trace_collection *tc,
 				check_clock_match,
 				&clock_match);
 		if (!clock_match.clock_match) {
-			fprintf(stderr, "[error] No clocks can be correlated and multiple traces are added to the collection.\n");
+			fprintf(stderr, "[error] No clocks can be correlated and multiple traces are added to the collection. If you are certain those traces can be correlated, try using \"--clock-force-correlate\".\n");
 			goto error;
 		}
 	}
@@ -177,6 +178,7 @@ int trace_collection_add(struct trace_collection *tc,
 				clock_add,
 				&clock_match);
 	}
+
 	return 0;
 error:
 	return -EPERM;