lib: rename "begin" to "beginning" when used as a noun

[babeltrace.git] / plugins / text / dmesg / dmesg.c

diff --git a/plugins/text/dmesg/dmesg.c b/plugins/text/dmesg/dmesg.c
index 9a8b5beb68180f77d50ecfcf678e89378658b2e7..4da898bdb4f75559c57519be1d50c93f16af1a8b 100644 (file)
--- a/plugins/text/dmesg/dmesg.c
+++ b/plugins/text/dmesg/dmesg.c
@@ -49,7 +49,7 @@ struct dmesg_notif_iter {
        char *linebuf;
        size_t linebuf_len;
        FILE *fp;
-       struct bt_private_notification *tmp_event_notif;
+       struct bt_notification *tmp_event_notif;
 
        enum {
                STATE_EMIT_STREAM_BEGINNING,
@@ -68,9 +68,10 @@ struct dmesg_component {
                bt_bool no_timestamp;
        } params;
 
-       struct bt_trace *trace;
+       struct bt_trace_class *trace_class;
        struct bt_stream_class *stream_class;
        struct bt_event_class *event_class;
+       struct bt_trace *trace;
        struct bt_stream *stream;
        struct bt_packet *packet;
        struct bt_clock_class *clock_class;
@@ -117,38 +118,16 @@ static
 int create_meta(struct dmesg_component *dmesg_comp, bool has_ts)
 {
        struct bt_field_class *fc = NULL;
-       const char *trace_name = NULL;
-       gchar *basename = NULL;
        int ret = 0;
 
-       dmesg_comp->trace = bt_trace_create();
-       if (!dmesg_comp->trace) {
-               BT_LOGE_STR("Cannot create an empty trace object.");
+       dmesg_comp->trace_class = bt_trace_class_create();
+       if (!dmesg_comp->trace_class) {
+               BT_LOGE_STR("Cannot create an empty trace class object.");
                goto error;
        }
 
-       if (dmesg_comp->params.read_from_stdin) {
-               trace_name = "STDIN";
-       } else {
-               basename = g_path_get_basename(dmesg_comp->params.path->str);
-               BT_ASSERT(basename);
-
-               if (strcmp(basename, G_DIR_SEPARATOR_S) != 0 &&
-                               strcmp(basename, ".") != 0) {
-                       trace_name = basename;
-               }
-       }
-
-       if (trace_name) {
-               ret = bt_trace_set_name(dmesg_comp->trace, trace_name);
-               if (ret) {
-                       BT_LOGE("Cannot set trace's name: name=\"%s\"", trace_name);
-                       goto error;
-               }
-       }
-
        dmesg_comp->stream_class = bt_stream_class_create(
-               dmesg_comp->trace);
+               dmesg_comp->trace_class);
        if (!dmesg_comp->stream_class) {
                BT_LOGE_STR("Cannot create a stream class object.");
                goto error;
@@ -201,11 +180,6 @@ error:
 
 end:
        bt_object_put_ref(fc);
-
-       if (basename) {
-               g_free(basename);
-       }
-
        return ret;
 }
 
@@ -264,11 +238,41 @@ end:
 }
 
 static
-int create_packet_and_stream(struct dmesg_component *dmesg_comp)
+int create_packet_and_stream_and_trace(struct dmesg_component *dmesg_comp)
 {
        int ret = 0;
+       const char *trace_name;
+       gchar *basename = NULL;
+
+       dmesg_comp->trace = bt_trace_create(dmesg_comp->trace_class);
+       if (!dmesg_comp->trace) {
+               BT_LOGE_STR("Cannot create trace object.");
+               goto error;
+       }
 
-       dmesg_comp->stream = bt_stream_create(dmesg_comp->stream_class);
+       if (dmesg_comp->params.read_from_stdin) {
+               trace_name = "STDIN";
+       } else {
+               basename = g_path_get_basename(dmesg_comp->params.path->str);
+               BT_ASSERT(basename);
+
+               if (strcmp(basename, G_DIR_SEPARATOR_S) != 0 &&
+                               strcmp(basename, ".") != 0) {
+                       trace_name = basename;
+               }
+       }
+
+       if (trace_name) {
+               ret = bt_trace_set_name(dmesg_comp->trace, trace_name);
+               if (ret) {
+                       BT_LOGE("Cannot set trace's name: name=\"%s\"",
+                               trace_name);
+                       goto error;
+               }
+       }
+
+       dmesg_comp->stream = bt_stream_create(dmesg_comp->stream_class,
+               dmesg_comp->trace);
        if (!dmesg_comp->stream) {
                BT_LOGE_STR("Cannot create stream object.");
                goto error;
@@ -292,6 +296,10 @@ error:
        ret = -1;
 
 end:
+       if (basename) {
+               g_free(basename);
+       }
+
        return ret;
 }
 
@@ -313,7 +321,7 @@ int try_create_meta_stream_packet(struct dmesg_component *dmesg_comp,
                goto error;
        }
 
-       ret = create_packet_and_stream(dmesg_comp);
+       ret = create_packet_and_stream_and_trace(dmesg_comp);
        if (ret) {
                BT_LOGE("Cannot create packet and stream objects: "
                        "dmesg-comp-addr=%p", dmesg_comp);
@@ -424,12 +432,12 @@ void dmesg_finalize(struct bt_self_component_source *self_comp)
 }
 
 static
-struct bt_private_notification *create_init_event_notif_from_line(
+struct bt_notification *create_init_event_notif_from_line(
                struct dmesg_notif_iter *notif_iter,
                const char *line, const char **new_start)
 {
        struct bt_event *event;
-       struct bt_private_notification *notif = NULL;
+       struct bt_notification *notif = NULL;
        bool has_timestamp = false;
        unsigned long sec, usec, msec;
        unsigned int year, mon, mday, hour, min;
@@ -499,14 +507,14 @@ skip_ts:
                goto error;
        }
 
-       notif = bt_private_notification_event_create(notif_iter->pc_notif_iter,
+       notif = bt_notification_event_create(notif_iter->pc_notif_iter,
                dmesg_comp->event_class, dmesg_comp->packet);
        if (!notif) {
                BT_LOGE_STR("Cannot create event notification.");
                goto error;
        }
 
-       event = bt_private_notification_event_borrow_event(notif);
+       event = bt_notification_event_borrow_event(notif);
        BT_ASSERT(event);
 
        if (dmesg_comp->clock_class) {
@@ -569,11 +577,11 @@ end:
 }
 
 static
-struct bt_private_notification *create_notif_from_line(
+struct bt_notification *create_notif_from_line(
                struct dmesg_notif_iter *dmesg_notif_iter, const char *line)
 {
        struct bt_event *event = NULL;
-       struct bt_private_notification *notif = NULL;
+       struct bt_notification *notif = NULL;
        const char *new_start;
        int ret;
 
@@ -584,7 +592,7 @@ struct bt_private_notification *create_notif_from_line(
                goto error;
        }
 
-       event = bt_private_notification_event_borrow_event(notif);
+       event = bt_notification_event_borrow_event(notif);
        BT_ASSERT(event);
        ret = fill_event_payload_from_line(new_start, event);
        if (ret) {
@@ -680,7 +688,7 @@ void dmesg_notif_iter_finalize(
 static
 enum bt_self_notification_iterator_status dmesg_notif_iter_next_one(
                struct dmesg_notif_iter *dmesg_notif_iter,
-               struct bt_private_notification **notif)
+               struct bt_notification **notif)
 {
        ssize_t len;
        struct dmesg_component *dmesg_comp;
@@ -760,13 +768,13 @@ handle_state:
        switch (dmesg_notif_iter->state) {
        case STATE_EMIT_STREAM_BEGINNING:
                BT_ASSERT(dmesg_notif_iter->tmp_event_notif);
-               *notif = bt_private_notification_stream_begin_create(
+               *notif = bt_notification_stream_beginning_create(
                        dmesg_notif_iter->pc_notif_iter, dmesg_comp->stream);
                dmesg_notif_iter->state = STATE_EMIT_PACKET_BEGINNING;
                break;
        case STATE_EMIT_PACKET_BEGINNING:
                BT_ASSERT(dmesg_notif_iter->tmp_event_notif);
-               *notif = bt_private_notification_packet_begin_create(
+               *notif = bt_notification_packet_beginning_create(
                        dmesg_notif_iter->pc_notif_iter, dmesg_comp->packet);
                dmesg_notif_iter->state = STATE_EMIT_EVENT;
                break;
@@ -776,12 +784,12 @@ handle_state:
                dmesg_notif_iter->tmp_event_notif = NULL;
                break;
        case STATE_EMIT_PACKET_END:
-               *notif = bt_private_notification_packet_end_create(
+               *notif = bt_notification_packet_end_create(
                        dmesg_notif_iter->pc_notif_iter, dmesg_comp->packet);
                dmesg_notif_iter->state = STATE_EMIT_STREAM_END;
                break;
        case STATE_EMIT_STREAM_END:
-               *notif = bt_private_notification_stream_end_create(
+               *notif = bt_notification_stream_end_create(
                        dmesg_notif_iter->pc_notif_iter, dmesg_comp->stream);
                dmesg_notif_iter->state = STATE_DONE;
                break;
@@ -802,7 +810,7 @@ end:
 BT_HIDDEN
 enum bt_self_notification_iterator_status dmesg_notif_iter_next(
                struct bt_self_notification_iterator *self_notif_iter,
-               bt_notification_array notifs, uint64_t capacity,
+               bt_notification_array_const notifs, uint64_t capacity,
                uint64_t *count)
 {
        struct dmesg_notif_iter *dmesg_notif_iter =
@@ -814,12 +822,11 @@ enum bt_self_notification_iterator_status dmesg_notif_iter_next(
 
        while (i < capacity &&
                        status == BT_SELF_NOTIFICATION_ITERATOR_STATUS_OK) {
-               struct bt_private_notification *priv_notif = NULL;
+               struct bt_notification *priv_notif = NULL;
 
                status = dmesg_notif_iter_next_one(dmesg_notif_iter,
                        &priv_notif);
-               notifs[i] = bt_private_notification_as_notification(
-                       priv_notif);
+               notifs[i] = priv_notif;
                if (status == BT_SELF_NOTIFICATION_ITERATOR_STATUS_OK) {
                        i++;
                }