projects / babeltrace.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
lib: make graph API const-correct
[babeltrace.git] / lib / graph / notification / packet.c
diff --git a/lib/graph/notification/packet.c b/lib/graph/notification/packet.c
index acf0ce5f1b8eb2b5235445f7eb4479cb6121c62d..a1750764584bbf7d2b9314cb551f045e54d3b022 100644 (file)
--- a/lib/graph/notification/packet.c
+++ b/lib/graph/notification/packet.c
@@ -1,6 +1,4 @@
 /*
- * Babeltrace Plug-in Packet-related Notifications
- *
  * Copyright 2016 Jérémie Galarneau <jeremie.galarneau@efficios.com>
  *
  * Author: Jérémie Galarneau <jeremie.galarneau@efficios.com>
@@ -34,8 +32,10 @@
 #include <babeltrace/trace-ir/stream.h>
 #include <babeltrace/trace-ir/stream-internal.h>
 #include <babeltrace/graph/graph-internal.h>
+#include <babeltrace/graph/notification-packet-const.h>
+#include <babeltrace/graph/notification-packet.h>
 #include <babeltrace/graph/notification-packet-internal.h>
-#include <babeltrace/graph/private-connection-private-notification-iterator.h>
+#include <babeltrace/object.h>
 #include <babeltrace/assert-internal.h>
 #include <babeltrace/assert-pre-internal.h>
 #include <babeltrace/object-internal.h>
@@ -66,13 +66,14 @@ end:
 }
 
 struct bt_notification *bt_notification_packet_begin_create(
-               struct bt_private_connection_private_notification_iterator *notif_iter,
+               struct bt_self_notification_iterator *self_notif_iter,
                struct bt_packet *packet)
 {
+       struct bt_self_component_port_input_notification_iterator *notif_iter =
+               (void *) self_notif_iter;
        struct bt_notification_packet_begin *notification = NULL;
        struct bt_stream *stream;
        struct bt_stream_class *stream_class;
-       struct bt_graph *graph;
 
        BT_ASSERT_PRE_NON_NULL(notif_iter, "Notification iterator");
        BT_ASSERT_PRE_NON_NULL(packet, "Packet");
@@ -80,18 +81,11 @@ struct bt_notification *bt_notification_packet_begin_create(
        BT_ASSERT(stream);
        stream_class = bt_stream_borrow_class(stream);
        BT_ASSERT(stream_class);
-       BT_LOGD("Creating packet beginning notification object: "
-               "packet-addr=%p, stream-addr=%p, stream-name=\"%s\", "
-               "stream-class-addr=%p, stream-class-name=\"%s\", "
-               "stream-class-id=%" PRId64,
-               packet, stream, bt_stream_get_name(stream),
-               stream_class,
-               bt_stream_class_get_name(stream_class),
-               bt_stream_class_get_id(stream_class));
-       graph = bt_private_connection_private_notification_iterator_borrow_graph(
-               notif_iter);
+       BT_LIB_LOGD("Creating packet beginning notification object: "
+               "%![packet-]+a, %![stream-]+s, %![sc-]+S",
+               packet, stream, stream_class);
        notification = (void *) bt_notification_create_from_pool(
-               &graph->packet_begin_notif_pool, graph);
+               &notif_iter->graph->packet_begin_notif_pool, notif_iter->graph);
        if (!notification) {
                /* bt_notification_create_from_pool() logs errors */
                goto end;
@@ -102,14 +96,9 @@ struct bt_notification *bt_notification_packet_begin_create(
        bt_object_get_no_null_check_no_parent_check(
                &notification->packet->base);
        bt_packet_set_is_frozen(packet, true);
-       BT_LOGD("Created packet beginning notification object: "
-               "packet-addr=%p, stream-addr=%p, stream-name=\"%s\", "
-               "stream-class-addr=%p, stream-class-name=\"%s\", "
-               "stream-class-id=%" PRId64 ", addr=%p",
-               packet, stream, bt_stream_get_name(stream),
-               stream_class,
-               bt_stream_class_get_name(stream_class),
-               bt_stream_class_get_id(stream_class), notification);
+       BT_LIB_LOGD("Created packet beginning notification object: "
+               "%![notif-]+n, %![packet-]+a, %![stream-]+s, %![sc-]+S",
+               notification, packet, stream, stream_class);
        goto end;
 
 end:
@@ -121,8 +110,8 @@ void bt_notification_packet_begin_destroy(struct bt_notification *notif)
 {
        struct bt_notification_packet_begin *packet_begin_notif = (void *) notif;
 
-       BT_LOGD("Destroying packet beginning notification: addr=%p", notif);
-       BT_LOGD_STR("Putting packet.");
+       BT_LIB_LOGD("Destroying packet beginning notification: %!+n", notif);
+       BT_LIB_LOGD("Putting packet: %!+a", packet_begin_notif->packet);
        BT_OBJECT_PUT_REF_AND_RESET(packet_begin_notif->packet);
        g_free(notif);
 }
@@ -140,7 +129,7 @@ void bt_notification_packet_begin_recycle(struct bt_notification *notif)
                return;
        }
 
-       BT_LOGD("Recycling packet beginning notification: addr=%p", notif);
+       BT_LIB_LOGD("Recycling packet beginning notification: %!+n", notif);
        bt_notification_reset(notif);
        bt_object_put_no_null_check(&packet_begin_notif->packet->base);
        packet_begin_notif->packet = NULL;
@@ -157,11 +146,17 @@ struct bt_packet *bt_notification_packet_begin_borrow_packet(
        BT_ASSERT_PRE_NON_NULL(notification, "Notification");
        BT_ASSERT_PRE_NOTIF_IS_TYPE(notification,
                BT_NOTIFICATION_TYPE_PACKET_BEGIN);
-       packet_begin = container_of(notification,
-                       struct bt_notification_packet_begin, parent);
+       packet_begin = (void *) notification;
        return packet_begin->packet;
 }
 
+const struct bt_packet *bt_notification_packet_begin_borrow_packet_const(
+               const struct bt_notification *notification)
+{
+       return bt_notification_packet_begin_borrow_packet(
+               (void *) notification);
+}
+
 BT_HIDDEN
 struct bt_notification *bt_notification_packet_end_new(struct bt_graph *graph)
 {
@@ -187,13 +182,14 @@ end:
 }
 
 struct bt_notification *bt_notification_packet_end_create(
-               struct bt_private_connection_private_notification_iterator *notif_iter,
+               struct bt_self_notification_iterator *self_notif_iter,
                struct bt_packet *packet)
 {
+       struct bt_self_component_port_input_notification_iterator *notif_iter =
+               (void *) self_notif_iter;
        struct bt_notification_packet_end *notification = NULL;
        struct bt_stream *stream;
        struct bt_stream_class *stream_class;
-       struct bt_graph *graph;
 
        BT_ASSERT_PRE_NON_NULL(notif_iter, "Notification iterator");
        BT_ASSERT_PRE_NON_NULL(packet, "Packet");
@@ -201,18 +197,11 @@ struct bt_notification *bt_notification_packet_end_create(
        BT_ASSERT(stream);
        stream_class = bt_stream_borrow_class(stream);
        BT_ASSERT(stream_class);
-       BT_LOGD("Creating packet end notification object: "
-               "packet-addr=%p, stream-addr=%p, stream-name=\"%s\", "
-               "stream-class-addr=%p, stream-class-name=\"%s\", "
-               "stream-class-id=%" PRId64,
-               packet, stream, bt_stream_get_name(stream),
-               stream_class,
-               bt_stream_class_get_name(stream_class),
-               bt_stream_class_get_id(stream_class));
-       graph = bt_private_connection_private_notification_iterator_borrow_graph(
-               notif_iter);
+       BT_LIB_LOGD("Creating packet end notification object: "
+               "%![packet-]+a, %![stream-]+s, %![sc-]+S",
+               packet, stream, stream_class);
        notification = (void *) bt_notification_create_from_pool(
-               &graph->packet_end_notif_pool, graph);
+               &notif_iter->graph->packet_end_notif_pool, notif_iter->graph);
        if (!notification) {
                /* bt_notification_create_from_pool() logs errors */
                goto end;
@@ -223,14 +212,9 @@ struct bt_notification *bt_notification_packet_end_create(
        bt_object_get_no_null_check_no_parent_check(
                &notification->packet->base);
        bt_packet_set_is_frozen(packet, true);
-       BT_LOGD("Created packet end notification object: "
-               "packet-addr=%p, stream-addr=%p, stream-name=\"%s\", "
-               "stream-class-addr=%p, stream-class-name=\"%s\", "
-               "stream-class-id=%" PRId64 ", addr=%p",
-               packet, stream, bt_stream_get_name(stream),
-               stream_class,
-               bt_stream_class_get_name(stream_class),
-               bt_stream_class_get_id(stream_class), notification);
+       BT_LIB_LOGD("Created packet end notification object: "
+               "%![notif-]+n, %![packet-]+a, %![stream-]+s, %![sc-]+S",
+               notification, packet, stream, stream_class);
        goto end;
 
 end:
@@ -242,8 +226,8 @@ void bt_notification_packet_end_destroy(struct bt_notification *notif)
 {
        struct bt_notification_packet_end *packet_end_notif = (void *) notif;
 
-       BT_LOGD("Destroying packet end notification: addr=%p", notif);
-       BT_LOGD_STR("Putting packet.");
+       BT_LIB_LOGD("Destroying packet end notification: %!+n", notif);
+       BT_LIB_LOGD("Putting packet: %!+a", packet_end_notif->packet);
        BT_OBJECT_PUT_REF_AND_RESET(packet_end_notif->packet);
        g_free(notif);
 }
@@ -261,7 +245,7 @@ void bt_notification_packet_end_recycle(struct bt_notification *notif)
                return;
        }
 
-       BT_LOGD("Recycling packet end notification: addr=%p", notif);
+       BT_LIB_LOGD("Recycling packet end notification: %!+n", notif);
        bt_notification_reset(notif);
        BT_OBJECT_PUT_REF_AND_RESET(packet_end_notif->packet);
        graph = notif->graph;
@@ -277,7 +261,13 @@ struct bt_packet *bt_notification_packet_end_borrow_packet(
        BT_ASSERT_PRE_NON_NULL(notification, "Notification");
        BT_ASSERT_PRE_NOTIF_IS_TYPE(notification,
                BT_NOTIFICATION_TYPE_PACKET_END);
-       packet_end = container_of(notification,
-                       struct bt_notification_packet_end, parent);
+       packet_end = (void *) notification;
        return packet_end->packet;
 }
+
+const struct bt_packet *bt_notification_packet_end_borrow_packet_const(
+               const struct bt_notification *notification)
+{
+       return bt_notification_packet_end_borrow_packet(
+               (void *) notification);
+}
BabelTrace - Trace Format Babel Tower
This page took 0.026788 seconds and 4 git commands to generate.