X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf%2Fiterator.c;h=d2cd914ef02f62b1bf38596fc3deb90ad5643d64;hp=5cc7dbad14de5d79ae66ba0fcffefba055983b1e;hb=dd06413f0a5c638a20f000f3046755ee229c821d;hpb=8a4722b0ccf5cf30ee76a85bdf6bea2fa0515153

diff --git a/formats/ctf/iterator.c b/formats/ctf/iterator.c
index 5cc7dbad..d2cd914e 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>
@@ -38,13 +46,17 @@ struct bt_ctf_iter *bt_ctf_iter_create(struct bt_context *ctx,
 	struct bt_ctf_iter *iter;
 	int ret;
 
+	if (!ctx)
+		return NULL;
+
 	iter = g_new0(struct bt_ctf_iter, 1);
 	ret = bt_iter_init(&iter->parent, ctx, begin_pos, end_pos);
 	if (ret) {
 		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();
@@ -57,6 +69,8 @@ void bt_ctf_iter_destroy(struct bt_ctf_iter *iter)
 	struct bt_callback_chain *bt_chain;
 	int i, j;
 
+	assert(iter);
+
 	/* free all events callbacks */
 	if (iter->main_callbacks.callback)
 		g_array_free(iter->main_callbacks.callback, TRUE);
@@ -76,6 +90,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);
@@ -83,31 +99,74 @@ void bt_ctf_iter_destroy(struct bt_ctf_iter *iter)
 
 struct bt_iter *bt_ctf_get_iter(struct bt_ctf_iter *iter)
 {
+	if (!iter)
+		return NULL;
+
 	return &iter->parent;
 }
 
-struct ctf_event_definition *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 ctf_event_definition *ret = &iter->current_ctf_event;
+	struct bt_ctf_event *ret;
 	struct ctf_stream_definition *stream;
+	struct packet_index *packet_index;
 
-	file_stream = heap_maximum(iter->parent.stream_heap);
+	/*
+	 * We do not want to fail for any other reason than end of
+	 * trace, hence the assert.
+	 */
+	assert(iter);
+
+	ret = &iter->current_ctf_event;
+	file_stream = bt_heap_maximum(iter->parent.stream_heap);
 	if (!file_stream) {
 		/* end of file for all streams */
 		goto stop;
 	}
 	stream = &file_stream->parent;
-	ret = g_ptr_array_index(stream->events_by_id,
+	ret->parent = g_ptr_array_index(stream->events_by_id,
 			stream->event_id);
 
-	if (ret->stream->stream_id > iter->callbacks->len)
+	if (flags)
+		*flags = 0;
+	if (!file_stream->pos.packet_cycles_index)
+		packet_index = NULL;
+	else
+		packet_index = &g_array_index(file_stream->pos.packet_cycles_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;
 
-	process_callbacks(iter, ret->stream);
+	process_callbacks(iter, ret->parent->stream);
 
 end:
 	return ret;
 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;
+}