X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=lib%2Fiterator.c;h=966a00010e3e82a8393987f72f78b9e4d820c70f;hp=dc12a2f41020d34fa4903bc61494bddb092e53c7;hb=d899d6de0f3ee37fdb4400dcf05e83c52cd4173c;hpb=dd06413f0a5c638a20f000f3046755ee229c821d

diff --git a/lib/iterator.c b/lib/iterator.c
index dc12a2f4..966a0001 100644
--- a/lib/iterator.c
+++ b/lib/iterator.c
@@ -73,16 +73,24 @@ static int stream_read_event(struct ctf_file_stream *sin)
 }
 
 /*
- * returns true if a < b, false otherwise.
+ * Return true if a < b, false otherwise.
+ * If time stamps are exactly the same, compare by stream path. This
+ * ensures we get the same result between runs on the same trace
+ * collection on different environments.
+ * The result will be random for memory-mapped traces since there is no
+ * fixed path leading to those (they have empty path string).
  */
 static int stream_compare(void *a, void *b)
 {
 	struct ctf_file_stream *s_a = a, *s_b = b;
 
-	if (s_a->parent.real_timestamp < s_b->parent.real_timestamp)
+	if (s_a->parent.real_timestamp < s_b->parent.real_timestamp) {
 		return 1;
-	else
+	} else if (likely(s_a->parent.real_timestamp > s_b->parent.real_timestamp)) {
 		return 0;
+	} else {
+		return strcmp(s_a->parent.path, s_b->parent.path);
+	}
 }
 
 void bt_iter_free_pos(struct bt_iter_pos *iter_pos)
@@ -309,7 +317,7 @@ static int seek_last_ctf_trace_collection(struct trace_collection *tc,
 	/* For each trace in the trace_collection */
 	for (i = 0; i < tc->array->len; i++) {
 		struct ctf_trace *tin;
-		struct trace_descriptor *td_read;
+		struct bt_trace_descriptor *td_read;
 
 		td_read = g_ptr_array_index(tc->array, i);
 		if (!td_read)
@@ -421,7 +429,7 @@ int bt_iter_set_pos(struct bt_iter *iter, const struct bt_iter_pos *iter_pos)
 		/* for each trace in the trace_collection */
 		for (i = 0; i < tc->array->len; i++) {
 			struct ctf_trace *tin;
-			struct trace_descriptor *td_read;
+			struct bt_trace_descriptor *td_read;
 
 			td_read = g_ptr_array_index(tc->array, i);
 			if (!td_read)
@@ -451,7 +459,7 @@ int bt_iter_set_pos(struct bt_iter *iter, const struct bt_iter_pos *iter_pos)
 
 		for (i = 0; i < tc->array->len; i++) {
 			struct ctf_trace *tin;
-			struct trace_descriptor *td_read;
+			struct bt_trace_descriptor *td_read;
 			int stream_id;
 
 			td_read = g_ptr_array_index(tc->array, i);
@@ -675,7 +683,7 @@ int bt_iter_init(struct bt_iter *iter,
 
 	for (i = 0; i < ctx->tc->array->len; i++) {
 		struct ctf_trace *tin;
-		struct trace_descriptor *td_read;
+		struct bt_trace_descriptor *td_read;
 
 		td_read = g_ptr_array_index(ctx->tc->array, i);
 		if (!td_read)
@@ -694,23 +702,17 @@ int bt_iter_init(struct bt_iter *iter,
 			for (filenr = 0; filenr < stream->streams->len;
 					filenr++) {
 				struct ctf_file_stream *file_stream;
+				struct bt_iter_pos pos;
 
 				file_stream = g_ptr_array_index(stream->streams,
 						filenr);
 				if (!file_stream)
 					continue;
-				if (begin_pos) {
-					ret = babeltrace_filestream_seek(
-							file_stream,
-							begin_pos,
-							stream_id);
-				} else {
-					struct bt_iter_pos pos;
-					pos.type = BT_SEEK_BEGIN;
-					ret = babeltrace_filestream_seek(
-							file_stream, &pos,
-							stream_id);
-				}
+
+				pos.type = BT_SEEK_BEGIN;
+				ret = babeltrace_filestream_seek(file_stream,
+					&pos, stream_id);
+
 				if (ret == EOF) {
 					ret = 0;
 					continue;
@@ -726,7 +728,11 @@ int bt_iter_init(struct bt_iter *iter,
 	}
 
 	ctx->current_iterator = iter;
-	return 0;
+	if (begin_pos && begin_pos->type != BT_SEEK_BEGIN) {
+		ret = bt_iter_set_pos(iter, begin_pos);
+	}
+
+	return ret;
 
 error:
 	bt_heap_free(iter->stream_heap);