Fix: handle EINTR return value for bt_posix_fallocate

[babeltrace.git] / formats / ctf / iterator.c

diff --git a/formats/ctf/iterator.c b/formats/ctf/iterator.c
index 0ac041910f7aedf9d967600efd24e718318b6891..e5d32a890b503220a9ecefde2c31ae8464b12030 100644 (file)
--- 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,7 +55,8 @@ 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();
@@ -81,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);
@@ -108,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 >