X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf%2Fiterator.c;h=6f8eb88a9de7b769817de518a1abf56db9e7f115;hp=ec74e59029381e73acc5cbf97a7c43ae4889fedf;hb=5f07b6ce3098d87af3d413a67dacb5e85b2bcafe;hpb=bb919dd077169b5ee049ba3fc82f8555648cb22e

diff --git a/formats/ctf/iterator.c b/formats/ctf/iterator.c
index ec74e590..6f8eb88a 100644
--- a/formats/ctf/iterator.c
+++ b/formats/ctf/iterator.c
@@ -17,6 +17,14 @@
  *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
  */
 
 #include <babeltrace/babeltrace.h>
@@ -47,13 +55,49 @@ struct bt_ctf_iter *bt_ctf_iter_create(struct bt_context *ctx,
 		g_free(iter);
 		return NULL;
 	}
-	iter->callbacks = g_array_new(0, 1, sizeof(struct bt_stream_callbacks));
+	iter->callbacks = g_array_new(FALSE, TRUE,
+			sizeof(struct bt_stream_callbacks));
 	iter->recalculate_dep_graph = 0;
 	iter->main_callbacks.callback = NULL;
 	iter->dep_gc = g_ptr_array_new();
 	return iter;
 }
 
+struct bt_ctf_iter *bt_ctf_iter_create_intersect(struct bt_context *ctx,
+		struct bt_iter_pos **inter_begin_pos,
+		struct bt_iter_pos **inter_end_pos)
+{
+	uint64_t begin = 0, end = ULLONG_MAX;
+	int ret;
+
+	ret = ctf_find_packets_intersection(ctx, &begin, &end);
+	if (ret == 1) {
+		fprintf(stderr, "[error] No intersection found between trace files.\n");
+		goto error;
+	} else if (ret != 0) {
+		goto error;
+	}
+	*inter_begin_pos = bt_iter_create_time_pos(NULL, begin);
+	if (!(*inter_begin_pos)) {
+		goto error;
+	}
+	*inter_end_pos = bt_iter_create_time_pos(NULL, end);
+	if (!(*inter_end_pos)) {
+		goto error;
+	}
+
+	/*
+	 * bt_ctf_iter does not take ownership of begin and end positions,
+	 * so we return them to the caller who must still assume their ownership
+	 * until the iterator is destroyed.
+	 */
+	return bt_ctf_iter_create(ctx, *inter_begin_pos,
+			*inter_end_pos);
+error:
+	return NULL;
+}
+
+
 void bt_ctf_iter_destroy(struct bt_ctf_iter *iter)
 {
 	struct bt_stream_callbacks *bt_stream_cb;
@@ -81,6 +125,8 @@ void bt_ctf_iter_destroy(struct bt_ctf_iter *iter)
 		}
 		g_array_free(bt_stream_cb->per_id_callbacks, TRUE);
 	}
+	g_array_free(iter->callbacks, TRUE);
+	g_ptr_array_free(iter->dep_gc, TRUE);
 
 	bt_iter_fini(&iter->parent);
 	g_free(iter);
@@ -94,11 +140,13 @@ struct bt_iter *bt_ctf_get_iter(struct bt_ctf_iter *iter)
 	return &iter->parent;
 }
 
-struct bt_ctf_event *bt_ctf_iter_read_event(struct bt_ctf_iter *iter)
+struct bt_ctf_event *bt_ctf_iter_read_event_flags(struct bt_ctf_iter *iter,
+		int *flags)
 {
 	struct ctf_file_stream *file_stream;
 	struct bt_ctf_event *ret;
 	struct ctf_stream_definition *stream;
+	struct packet_index *packet_index;
 
 	/*
 	 * We do not want to fail for any other reason than end of
@@ -106,16 +154,55 @@ struct bt_ctf_event *bt_ctf_iter_read_event(struct bt_ctf_iter *iter)
 	 */
 	assert(iter);
 
+	if (flags)
+		*flags = 0;
+
 	ret = &iter->current_ctf_event;
-	file_stream = heap_maximum(iter->parent.stream_heap);
+	file_stream = bt_heap_maximum(iter->parent.stream_heap);
 	if (!file_stream) {
 		/* end of file for all streams */
 		goto stop;
 	}
+
+	/*
+	 * If the packet is empty (contains only headers or is of size 0), the
+	 * caller has to know that we can't read the current event and we need
+	 * to do a bt_iter_next.
+	 */
+	if (file_stream->pos.data_offset == file_stream->pos.content_size
+			|| file_stream->pos.content_size == 0) {
+		/* More events may come. */
+		ret = NULL;
+		if (flags)
+			*flags |= BT_ITER_FLAG_RETRY;
+		goto end;
+	}
+
 	stream = &file_stream->parent;
+	if (iter->parent.end_pos &&
+		iter->parent.end_pos->type == BT_SEEK_TIME &&
+		stream->real_timestamp > iter->parent.end_pos->u.seek_time) {
+		goto stop;
+	}
 	ret->parent = g_ptr_array_index(stream->events_by_id,
 			stream->event_id);
 
+	if (!file_stream->pos.packet_index)
+		packet_index = NULL;
+	else
+		packet_index = &g_array_index(file_stream->pos.packet_index,
+				struct packet_index, file_stream->pos.cur_index);
+	iter->events_lost = 0;
+	if (packet_index && packet_index->events_discarded >
+			file_stream->pos.last_events_discarded) {
+		if (flags)
+			*flags |= BT_ITER_FLAG_LOST_EVENTS;
+		iter->events_lost += packet_index->events_discarded -
+			file_stream->pos.last_events_discarded;
+		file_stream->pos.last_events_discarded =
+			packet_index->events_discarded;
+	}
+
 	if (ret->parent->stream->stream_id > iter->callbacks->len)
 		goto end;
 
@@ -126,3 +213,16 @@ end:
 stop:
 	return NULL;
 }
+
+struct bt_ctf_event *bt_ctf_iter_read_event(struct bt_ctf_iter *iter)
+{
+	return bt_ctf_iter_read_event_flags(iter, NULL);
+}
+
+uint64_t bt_ctf_get_lost_events_count(struct bt_ctf_iter *iter)
+{
+	if (!iter)
+		return -1ULL;
+
+	return iter->events_lost;
+}