X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=formats%2Fctf%2Fiterator.c;h=e5d32a890b503220a9ecefde2c31ae8464b12030;hb=e83ce12aec89eb2aea94e892e66ba451f281acbd;hp=5b36d168c73aa3c38f30eac48884aa40a798a6a4;hpb=6743ae7d80368d451ba9c4583ae826dc76af0061;p=babeltrace.git

diff --git a/formats/ctf/iterator.c b/formats/ctf/iterator.c
index 5b36d168..e5d32a89 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>
@@ -111,22 +119,43 @@ struct bt_ctf_event *bt_ctf_iter_read_event_flags(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 (flags)
-		*flags = 0;
-	if (!file_stream->pos.packet_cycles_index)
+	if (!file_stream->pos.packet_index)
 		packet_index = NULL;
 	else
-		packet_index = &g_array_index(file_stream->pos.packet_cycles_index,
+		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 >