projects / babeltrace.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
lib: return `void` when setting a simple value with no side effects
[babeltrace.git] / lib / graph / notification / stream.c
diff --git a/lib/graph/notification/stream.c b/lib/graph/notification/stream.c
index e6015c250d15b06b2b632e8881c6ecc2be8cdcbf..f24194d81efea23f84488ca9f66cf02dd2d0868f 100644 (file)
--- a/lib/graph/notification/stream.c
+++ b/lib/graph/notification/stream.c
@@ -1,6 +1,4 @@
 /*
- * Babeltrace Plug-in Stream-related Notifications
- *
  * Copyright 2016 Jérémie Galarneau <jeremie.galarneau@efficios.com>
  *
  * Author: Jérémie Galarneau <jeremie.galarneau@efficios.com>
@@ -29,12 +27,13 @@
 
 #include <babeltrace/assert-pre-internal.h>
 #include <babeltrace/compiler-internal.h>
-#include <babeltrace/ctf-ir/stream-internal.h>
-#include <babeltrace/ctf-ir/stream-class.h>
-#include <babeltrace/ctf-ir/stream-class-internal.h>
+#include <babeltrace/trace-ir/stream-internal.h>
+#include <babeltrace/trace-ir/stream-class.h>
+#include <babeltrace/trace-ir/stream-class-internal.h>
+#include <babeltrace/graph/private-notification-stream.h>
 #include <babeltrace/graph/notification-stream-internal.h>
-#include <babeltrace/graph/private-connection-private-notification-iterator.h>
 #include <babeltrace/assert-internal.h>
+#include <babeltrace/object.h>
 #include <inttypes.h>
 
 static
@@ -43,36 +42,33 @@ void bt_notification_stream_end_destroy(struct bt_object *obj)
        struct bt_notification_stream_end *notification =
                        (struct bt_notification_stream_end *) obj;
 
-       BT_LOGD("Destroying stream end notification: addr=%p",
+       BT_LIB_LOGD("Destroying stream end notification: %!+n",
                notification);
-       BT_LOGD_STR("Putting stream.");
-       BT_PUT(notification->stream);
+       BT_LIB_LOGD("Putting stream: %!+s", notification->stream);
+       BT_OBJECT_PUT_REF_AND_RESET(notification->stream);
 
        if (notification->default_cv) {
                bt_clock_value_recycle(notification->default_cv);
+               notification->default_cv = NULL;
        }
 
        g_free(notification);
 }
 
-struct bt_notification *bt_notification_stream_end_create(
-               struct bt_private_connection_private_notification_iterator *notif_iter,
-               struct bt_stream *stream)
+struct bt_private_notification *bt_private_notification_stream_end_create(
+               struct bt_self_notification_iterator *self_notif_iter,
+               struct bt_private_stream *priv_stream)
 {
+       struct bt_stream *stream = (void *) priv_stream;
        struct bt_notification_stream_end *notification;
        struct bt_stream_class *stream_class;
 
+       BT_ASSERT_PRE_NON_NULL(self_notif_iter, "Notification iterator");
        BT_ASSERT_PRE_NON_NULL(stream, "Stream");
        stream_class = bt_stream_borrow_class(stream);
        BT_ASSERT(stream_class);
-       BT_LOGD("Creating stream end notification object: "
-               "stream-addr=%p, stream-name=\"%s\", "
-               "stream-class-addr=%p, stream-class-name=\"%s\", "
-               "stream-class-id=%" PRId64,
-               stream, bt_stream_get_name(stream),
-               stream_class,
-               bt_stream_class_get_name(stream_class),
-               bt_stream_class_get_id(stream_class));
+       BT_LIB_LOGD("Creating stream end notification object: "
+               "%![stream-]+s, %![sc-]+S", stream, stream_class);
        notification = g_new0(struct bt_notification_stream_end, 1);
        if (!notification) {
                BT_LOGE_STR("Failed to allocate one stream end notification.");
@@ -82,16 +78,12 @@ struct bt_notification *bt_notification_stream_end_create(
        bt_notification_init(&notification->parent,
                        BT_NOTIFICATION_TYPE_STREAM_END,
                        bt_notification_stream_end_destroy, NULL);
-       notification->stream = bt_get(stream);
-       BT_LOGD("Created stream end notification object: "
-               "stream-addr=%p, stream-name=\"%s\", "
-               "stream-class-addr=%p, stream-class-name=\"%s\", "
-               "stream-class-id=%" PRId64 ", addr=%p",
-               stream, bt_stream_get_name(stream),
-               stream_class,
-               bt_stream_class_get_name(stream_class),
-               bt_stream_class_get_id(stream_class), notification);
-       return &notification->parent;
+       notification->stream = bt_object_get_ref(stream);
+       BT_LIB_LOGD("Created stream end notification object: "
+               "%![notif-]+n, %![stream-]+s, %![sc-]+S", notification,
+               stream, stream_class);
+
+       return (void *) &notification->parent;
 error:
        return NULL;
 }
@@ -109,10 +101,18 @@ struct bt_stream *bt_notification_stream_end_borrow_stream(
        return stream_end->stream;
 }
 
-int bt_notification_stream_end_set_default_clock_value(
-               struct bt_notification *notif, uint64_t value_cycles)
+struct bt_private_stream *bt_private_notification_stream_end_borrow_stream(
+               struct bt_private_notification *notification)
 {
-       int ret = 0;
+       return (void *) bt_notification_stream_end_borrow_stream(
+               (void *) notification);
+}
+
+void bt_private_notification_stream_end_set_default_clock_value(
+               struct bt_private_notification *priv_notif,
+               uint64_t value_cycles)
+{
+       struct bt_notification *notif = (void *) priv_notif;
        struct bt_notification_stream_end *se_notif = (void *) notif;
 
        BT_ASSERT_PRE_NON_NULL(notif, "Notification");
@@ -122,21 +122,13 @@ int bt_notification_stream_end_set_default_clock_value(
                "Notification's stream class has no default clock class: "
                "%![notif-]+n, %![sc-]+S", notif, se_notif->stream->class);
 
-       if (!se_notif->default_cv) {
-               se_notif->default_cv = bt_clock_value_create(
-                       se_notif->stream->class->default_clock_class);
-               if (!se_notif->default_cv) {
-                       ret = -1;
-                       goto end;
-               }
-       }
-
+       /* TODO: have the object already created */
+       se_notif->default_cv = bt_clock_value_create(
+               se_notif->stream->class->default_clock_class);
+       BT_ASSERT(se_notif->default_cv);
        bt_clock_value_set_value_inline(se_notif->default_cv, value_cycles);
        BT_LIB_LOGV("Set notification's default clock value: %![notif-]+n, "
                "value=%" PRIu64, value_cycles);
-
-end:
-       return ret;
 }
 
 struct bt_clock_value *bt_notification_stream_end_borrow_default_clock_value(
@@ -155,36 +147,33 @@ void bt_notification_stream_begin_destroy(struct bt_object *obj)
        struct bt_notification_stream_begin *notification =
                        (struct bt_notification_stream_begin *) obj;
 
-       BT_LOGD("Destroying stream beginning notification: addr=%p",
+       BT_LIB_LOGD("Destroying stream beginning notification: %!+n",
                notification);
-       BT_LOGD_STR("Putting stream.");
-       BT_PUT(notification->stream);
+       BT_LIB_LOGD("Putting stream: %!+s", notification->stream);
+       BT_OBJECT_PUT_REF_AND_RESET(notification->stream);
 
        if (notification->default_cv) {
                bt_clock_value_recycle(notification->default_cv);
+               notification->default_cv = NULL;
        }
 
        g_free(notification);
 }
 
-struct bt_notification *bt_notification_stream_begin_create(
-               struct bt_private_connection_private_notification_iterator *notif_iter,
-               struct bt_stream *stream)
+struct bt_private_notification *bt_private_notification_stream_begin_create(
+               struct bt_self_notification_iterator *self_notif_iter,
+               struct bt_private_stream *priv_stream)
 {
+       struct bt_stream *stream = (void *) priv_stream;
        struct bt_notification_stream_begin *notification;
        struct bt_stream_class *stream_class;
 
+       BT_ASSERT_PRE_NON_NULL(self_notif_iter, "Notification iterator");
        BT_ASSERT_PRE_NON_NULL(stream, "Stream");
        stream_class = bt_stream_borrow_class(stream);
        BT_ASSERT(stream_class);
-       BT_LOGD("Creating stream beginning notification object: "
-               "stream-addr=%p, stream-name=\"%s\", "
-               "stream-class-addr=%p, stream-class-name=\"%s\", "
-               "stream-class-id=%" PRId64,
-               stream, bt_stream_get_name(stream),
-               stream_class,
-               bt_stream_class_get_name(stream_class),
-               bt_stream_class_get_id(stream_class));
+       BT_LIB_LOGD("Creating stream beginning notification object: "
+               "%![stream-]+s, %![sc-]+S", stream, stream_class);
        notification = g_new0(struct bt_notification_stream_begin, 1);
        if (!notification) {
                BT_LOGE_STR("Failed to allocate one stream beginning notification.");
@@ -194,16 +183,11 @@ struct bt_notification *bt_notification_stream_begin_create(
        bt_notification_init(&notification->parent,
                        BT_NOTIFICATION_TYPE_STREAM_BEGIN,
                        bt_notification_stream_begin_destroy, NULL);
-       notification->stream = bt_get(stream);
-       BT_LOGD("Created stream beginning notification object: "
-               "stream-addr=%p, stream-name=\"%s\", "
-               "stream-class-addr=%p, stream-class-name=\"%s\", "
-               "stream-class-id=%" PRId64 ", addr=%p",
-               stream, bt_stream_get_name(stream),
-               stream_class,
-               bt_stream_class_get_name(stream_class),
-               bt_stream_class_get_id(stream_class), notification);
-       return &notification->parent;
+       notification->stream = bt_object_get_ref(stream);
+       BT_LIB_LOGD("Created stream beginning notification object: "
+               "%![notif-]+n, %![stream-]+s, %![sc-]+S", notification,
+               stream, stream_class);
+       return (void *) &notification->parent;
 error:
        return NULL;
 }
@@ -221,10 +205,18 @@ struct bt_stream *bt_notification_stream_begin_borrow_stream(
        return stream_begin->stream;
 }
 
-int bt_notification_stream_begin_set_default_clock_value(
-               struct bt_notification *notif, uint64_t value_cycles)
+struct bt_private_stream *bt_private_notification_stream_begin_borrow_stream(
+               struct bt_private_notification *notification)
+{
+       return (void *) bt_notification_stream_begin_borrow_stream(
+               (void *) notification);
+}
+
+void bt_private_notification_stream_begin_set_default_clock_value(
+               struct bt_private_notification *priv_notif,
+               uint64_t value_cycles)
 {
-       int ret = 0;
+       struct bt_notification *notif = (void *) priv_notif;
        struct bt_notification_stream_begin *sb_notif = (void *) notif;
 
        BT_ASSERT_PRE_NON_NULL(notif, "Notification");
@@ -234,21 +226,13 @@ int bt_notification_stream_begin_set_default_clock_value(
                "Notification's stream class has no default clock class: "
                "%![notif-]+n, %![sc-]+S", notif, sb_notif->stream->class);
 
-       if (!sb_notif->default_cv) {
-               sb_notif->default_cv = bt_clock_value_create(
-                       sb_notif->stream->class->default_clock_class);
-               if (!sb_notif->default_cv) {
-                       ret = -1;
-                       goto end;
-               }
-       }
-
+       /* TODO: have the object already created */
+       sb_notif->default_cv = bt_clock_value_create(
+               sb_notif->stream->class->default_clock_class);
+       BT_ASSERT(sb_notif->default_cv);
        bt_clock_value_set_value_inline(sb_notif->default_cv, value_cycles);
        BT_LIB_LOGV("Set notification's default clock value: %![notif-]+n, "
                "value=%" PRIu64, value_cycles);
-
-end:
-       return ret;
 }
 
 struct bt_clock_value *bt_notification_stream_begin_borrow_default_clock_value(
BabelTrace - Trace Format Babel Tower
This page took 0.028866 seconds and 4 git commands to generate.