Implement ctf.lttng-live component

[babeltrace.git] / plugins / ctf / common / notif-iter / notif-iter.c

diff --git a/plugins/ctf/common/notif-iter/notif-iter.c b/plugins/ctf/common/notif-iter/notif-iter.c
index bb629b18940bcdc87997ad4af8269b9d16b30db8..bc20f8814b1de423158fa04961a9134d42f4a599 100644 (file)
--- a/plugins/ctf/common/notif-iter/notif-iter.c
+++ b/plugins/ctf/common/notif-iter/notif-iter.c
@@ -361,7 +361,7 @@ static inline
 enum bt_ctf_notif_iter_status notif_iter_status_from_m_status(
                enum bt_ctf_notif_iter_medium_status m_status)
 {
-       return m_status;
+       return (int) m_status;
 }
 
 static inline
@@ -382,38 +382,12 @@ size_t packet_at(struct bt_ctf_notif_iter *notit)
        return notit->buf.packet_offset + notit->buf.at;
 }
 
-static inline
-size_t remaining_content_bits(struct bt_ctf_notif_iter *notit)
-{
-       if (notit->cur_content_size == -1) {
-               return -1;
-       }
-
-       return notit->cur_content_size - packet_at(notit);
-}
-
-static inline
-size_t remaining_packet_bits(struct bt_ctf_notif_iter *notit)
-{
-       if (notit->cur_packet_size == -1) {
-               return -1;
-       }
-
-       return notit->cur_packet_size - packet_at(notit);
-}
-
 static inline
 void buf_consume_bits(struct bt_ctf_notif_iter *notit, size_t incr)
 {
        notit->buf.at += incr;
 }
 
-static inline
-bool buf_has_enough_bits(struct bt_ctf_notif_iter *notit, size_t sz)
-{
-       return buf_available_bits(notit) >= sz;
-}
-
 static
 enum bt_ctf_notif_iter_status request_medium_bytes(
                struct bt_ctf_notif_iter *notit)
@@ -2082,7 +2056,7 @@ struct bt_ctf_event *create_event(struct bt_ctf_notif_iter *notit)
                goto error;
        }
 
-       ret = bt_ctf_event_set_payload_field(event,
+       ret = bt_ctf_event_set_event_payload(event,
                notit->dscopes.event_payload);
        if (ret) {
                goto error;
@@ -2211,30 +2185,6 @@ end:
        BT_PUT(event);
 }
 
-//FIXME: not used ?
-static
-void notify_eos(struct bt_ctf_notif_iter *notit,
-               struct bt_notification **notification)
-{
-       struct bt_ctf_stream *stream = NULL;
-       struct bt_notification *ret = NULL;
-
-       /* Ask the user for the stream */
-       stream = notit->medium.medops.get_stream(notit->meta.stream_class,
-                       notit->medium.data);
-       if (!stream) {
-               goto end;
-       }
-
-       ret = bt_notification_stream_end_create(stream);
-       if (!ret) {
-               goto end;
-       }
-       *notification = ret;
-end:
-       BT_PUT(stream);
-}
-
 static
 int init_clock_states(GHashTable *clock_states, struct bt_ctf_trace *trace)
 {
@@ -2249,7 +2199,7 @@ int init_clock_states(GHashTable *clock_states, struct bt_ctf_trace *trace)
        for (i = 0; i < clock_class_count; i++) {
                struct bt_ctf_clock_class *clock_class;
 
-               clock_class = bt_ctf_trace_get_clock_class(trace, i);
+               clock_class = bt_ctf_trace_get_clock_class_by_index(trace, i);
                if (!clock_class) {
                        ret = -1;
                        goto end;
@@ -2436,6 +2386,10 @@ enum bt_ctf_notif_iter_status bt_ctf_notif_iter_get_next_notification(
 
        while (true) {
                status = handle_state(notit);
+               if (status == BT_CTF_NOTIF_ITER_STATUS_AGAIN) {
+                       PDBG("Medium operation reported \"try again later\"");
+                       goto end;
+               }
                if (status != BT_CTF_NOTIF_ITER_STATUS_OK) {
                        if (status == BT_CTF_NOTIF_ITER_STATUS_EOF) {
                                PDBG("Medium operation reported end of stream\n");