/*
* Copyright 2010-2011 EfficiOS Inc. and Linux Foundation
- * Copyright 2017 Philippe Proulx <jeremie.galarneau@efficios.com>
+ * Copyright 2017 Philippe Proulx <pproulx@efficios.com>
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* SOFTWARE.
*/
+#define BT_LOG_TAG "PLUGIN-TEXT-DMESG-SRC"
+#include "logging.h"
+
#include <stdbool.h>
+#include <string.h>
+#include <ctype.h>
#include <stdio.h>
-#include <assert.h>
-#include <babeltrace/babeltrace-internal.h>
-#include <babeltrace/graph/component.h>
-#include <babeltrace/graph/clock-class-priority-map.h>
+#include <babeltrace/assert-internal.h>
+#include <babeltrace/common-internal.h>
+#include <babeltrace/babeltrace.h>
+#include <babeltrace/values-internal.h>
+#include <babeltrace/compat/utc-internal.h>
+#include <babeltrace/compat/stdio-internal.h>
#include <glib.h>
+#define NSEC_PER_USEC 1000UL
+#define NSEC_PER_MSEC 1000000UL
+#define NSEC_PER_SEC 1000000000ULL
+#define USEC_PER_SEC 1000000UL
+
struct dmesg_component;
struct dmesg_notif_iter {
struct dmesg_component *dmesg_comp;
+ struct bt_self_notification_iterator *pc_notif_iter; /* Weak */
+ char *linebuf;
+ size_t linebuf_len;
FILE *fp;
+ struct bt_notification *tmp_event_notif;
+
+ enum {
+ STATE_EMIT_STREAM_BEGINNING,
+ STATE_EMIT_PACKET_BEGINNING,
+ STATE_EMIT_EVENT,
+ STATE_EMIT_PACKET_END,
+ STATE_EMIT_STREAM_END,
+ STATE_DONE,
+ } state;
};
struct dmesg_component {
struct {
GString *path;
- bool read_from_stdin;
+ bt_bool read_from_stdin;
+ bt_bool no_timestamp;
} params;
- struct bt_ctf_packet *packet;
- struct bt_ctf_event_class *event_class;
- struct bt_ctf_stream *stream;
- struct bt_clock_class_priority_map *cc_prio_map;
+ struct bt_trace *trace;
+ struct bt_stream_class *stream_class;
+ struct bt_event_class *event_class;
+ struct bt_stream *stream;
+ struct bt_packet *packet;
+ struct bt_clock_class *clock_class;
};
static
-int check_params(struct dmesg_component *dmesg_comp, struct bt_value *params)
+struct bt_field_class *create_event_payload_fc(void)
{
- struct bt_value *read_from_stdin;
- struct bt_value *path;
- const char *path_str;
+ struct bt_field_class *root_fc = NULL;
+ struct bt_field_class *fc = NULL;
+ int ret;
+
+ root_fc = bt_field_class_structure_create();
+ if (!root_fc) {
+ BT_LOGE_STR("Cannot create an empty structure field class object.");
+ goto error;
+ }
+
+ fc = bt_field_class_string_create();
+ if (!fc) {
+ BT_LOGE_STR("Cannot create a string field class object.");
+ goto error;
+ }
+
+ ret = bt_field_class_structure_append_member(root_fc,
+ "str", fc);
+ if (ret) {
+ BT_LOGE("Cannot add `str` member to structure field class: "
+ "ret=%d", ret);
+ goto error;
+ }
+
+ goto end;
+
+error:
+ BT_OBJECT_PUT_REF_AND_RESET(root_fc);
+
+end:
+ bt_object_put_ref(fc);
+ return root_fc;
+}
+
+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;
- if (!params || !bt_value_is_map(params)) {
- fprintf(stderr, "Expecting a map value as parameters.\n");
+ dmesg_comp->trace = bt_trace_create();
+ if (!dmesg_comp->trace) {
+ BT_LOGE_STR("Cannot create an empty trace object.");
goto error;
}
- read_from_stdin = bt_value_map_get(params, "read-from-stdin");
- if (read_from_stdin) {
- if (!bt_value_is_bool(read_from_stdin)) {
- fprintf(stderr, "Expecting a boolean value for `read-from-stdin` parameter.\n");
+ 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;
}
+ }
- ret = bt_value_bool_get(read_from_stdin,
- &dmesg_comp->params.read_from_stdin);
- assert(ret == 0);
+ dmesg_comp->stream_class = bt_stream_class_create(
+ dmesg_comp->trace);
+ if (!dmesg_comp->stream_class) {
+ BT_LOGE_STR("Cannot create a stream class object.");
+ goto error;
}
- path = bt_value_map_get(params, "path");
+ if (has_ts) {
+ dmesg_comp->clock_class = bt_clock_class_create();
+ if (!dmesg_comp->clock_class) {
+ BT_LOGE_STR("Cannot create clock class.");
+ goto error;
+ }
+
+ ret = bt_stream_class_set_default_clock_class(
+ dmesg_comp->stream_class, dmesg_comp->clock_class);
+ if (ret) {
+ BT_LOGE_STR("Cannot set stream class's default clock class.");
+ goto error;
+ }
+ }
+
+ dmesg_comp->event_class = bt_event_class_create(
+ dmesg_comp->stream_class);
+ if (!dmesg_comp->event_class) {
+ BT_LOGE_STR("Cannot create an event class object.");
+ goto error;
+ }
+
+ ret = bt_event_class_set_name(dmesg_comp->event_class, "string");
+ if (ret) {
+ BT_LOGE_STR("Cannot set event class's name.");
+ goto error;
+ }
+
+ fc = create_event_payload_fc();
+ if (!fc) {
+ BT_LOGE_STR("Cannot create event payload field class.");
+ goto error;
+ }
+
+ ret = bt_event_class_set_payload_field_class(dmesg_comp->event_class, fc);
+ if (ret) {
+ BT_LOGE_STR("Cannot set event class's event payload field class.");
+ goto error;
+ }
+
+ goto end;
+
+error:
+ ret = -1;
+
+end:
+ bt_object_put_ref(fc);
+
+ if (basename) {
+ g_free(basename);
+ }
+
+ return ret;
+}
+
+static
+int handle_params(struct dmesg_component *dmesg_comp,
+ const struct bt_value *params)
+{
+ const struct bt_value *no_timestamp = NULL;
+ const struct bt_value *path = NULL;
+ const char *path_str;
+ int ret = 0;
+
+ no_timestamp = bt_value_map_borrow_entry_value_const(params,
+ "no-extract-timestamp");
+ if (no_timestamp) {
+ if (!bt_value_is_bool(no_timestamp)) {
+ BT_LOGE("Expecting a boolean value for the `no-extract-timestamp` parameter: "
+ "type=%s",
+ bt_common_value_type_string(
+ bt_value_get_type(no_timestamp)));
+ goto error;
+ }
+
+ dmesg_comp->params.no_timestamp =
+ bt_value_bool_get(no_timestamp);
+ }
+
+ path = bt_value_map_borrow_entry_value_const(params, "path");
if (path) {
if (dmesg_comp->params.read_from_stdin) {
- fprintf(stderr, "Cannot specify both `read-from-stdin` and `path` parameters.\n");
+ BT_LOGE_STR("Cannot specify both `read-from-stdin` and `path` parameters.");
goto error;
}
if (!bt_value_is_string(path)) {
- fprintf(stderr, "Expecting a string value for `path` parameter.\n");
+ BT_LOGE("Expecting a string value for the `path` parameter: "
+ "type=%s",
+ bt_common_value_type_string(
+ bt_value_get_type(path)));
goto error;
}
- ret = bt_value_bool_get(path, &path_str);
- assert(ret == 0);
+ path_str = bt_value_string_get(path);
g_string_assign(dmesg_comp->params.path, path_str);
} else {
- if (!dmesg_comp->params.read_from_stdin) {
- fprintf(stderr, "Expecting `path` parameter or `read-from-stdin` parameter set to true.\n");
- goto error;
- }
+ dmesg_comp->params.read_from_stdin = true;
+ }
+
+ goto end;
+
+error:
+ ret = -1;
+
+end:
+ return ret;
+}
+
+static
+int create_packet_and_stream(struct dmesg_component *dmesg_comp)
+{
+ int ret = 0;
+
+ dmesg_comp->stream = bt_stream_create(dmesg_comp->stream_class);
+ if (!dmesg_comp->stream) {
+ BT_LOGE_STR("Cannot create stream object.");
+ goto error;
+ }
+
+ dmesg_comp->packet = bt_packet_create(dmesg_comp->stream);
+ if (!dmesg_comp->packet) {
+ BT_LOGE_STR("Cannot create packet object.");
+ goto error;
+ }
+
+ ret = bt_trace_make_static(dmesg_comp->trace);
+ if (ret) {
+ BT_LOGE_STR("Cannot make trace static.");
+ goto error;
}
goto end;
ret = -1;
end:
- bt_put(read_from_stdin);
- bt_put(path);
return ret;
}
static
-int create_stream()
+int try_create_meta_stream_packet(struct dmesg_component *dmesg_comp,
+ bool has_ts)
+{
+ int ret = 0;
+
+ if (dmesg_comp->trace) {
+ /* Already created */
+ goto end;
+ }
+
+ ret = create_meta(dmesg_comp, has_ts);
+ if (ret) {
+ BT_LOGE("Cannot create metadata objects: dmesg-comp-addr=%p",
+ dmesg_comp);
+ goto error;
+ }
+
+ ret = create_packet_and_stream(dmesg_comp);
+ if (ret) {
+ BT_LOGE("Cannot create packet and stream objects: "
+ "dmesg-comp-addr=%p", dmesg_comp);
+ goto error;
+ }
+
+ goto end;
+
+error:
+ ret = -1;
+
+end:
+ return ret;
+}
static
void destroy_dmesg_component(struct dmesg_component *dmesg_comp)
g_string_free(dmesg_comp->params.path, TRUE);
}
- bt_put(dmesg_comp->packet);
- bt_put(dmesg_comp->event_class);
- bt_put(dmesg_comp->stream);
- bt_put(dmesg_comp->cc_prio_map);
+ bt_object_put_ref(dmesg_comp->packet);
+ bt_object_put_ref(dmesg_comp->trace);
+ bt_object_put_ref(dmesg_comp->stream_class);
+ bt_object_put_ref(dmesg_comp->event_class);
+ bt_object_put_ref(dmesg_comp->stream);
+ bt_object_put_ref(dmesg_comp->clock_class);
g_free(dmesg_comp);
}
+static
+enum bt_self_component_status create_port(
+ struct bt_self_component_source *self_comp)
+{
+ return bt_self_component_source_add_output_port(self_comp,
+ "out", NULL, NULL);
+}
+
BT_HIDDEN
-enum bt_component_status dmesg_init(struct bt_private_component *priv_comp,
+enum bt_self_component_status dmesg_init(
+ struct bt_self_component_source *self_comp,
struct bt_value *params, void *init_method_data)
{
int ret = 0;
struct dmesg_component *dmesg_comp = g_new0(struct dmesg_component, 1);
- enum bt_component_status status = BT_COMPONENT_STATUS_OK;
+ enum bt_self_component_status status = BT_SELF_COMPONENT_STATUS_OK;
if (!dmesg_comp) {
+ BT_LOGE_STR("Failed to allocate one dmesg component structure.");
goto error;
}
dmesg_comp->params.path = g_string_new(NULL);
if (!dmesg_comp->params.path) {
+ BT_LOGE_STR("Failed to allocate a GString.");
goto error;
}
- ret = check_params(dmesg_comp, params);
+ ret = handle_params(dmesg_comp, params);
if (ret) {
+ BT_LOGE("Invalid parameters: comp-addr=%p", self_comp);
goto error;
}
+ if (!dmesg_comp->params.read_from_stdin &&
+ !g_file_test(dmesg_comp->params.path->str,
+ G_FILE_TEST_IS_REGULAR)) {
+ BT_LOGE("Input path is not a regular file: "
+ "comp-addr=%p, path=\"%s\"", self_comp,
+ dmesg_comp->params.path->str);
+ goto error;
+ }
+ status = create_port(self_comp);
+ if (status != BT_SELF_COMPONENT_STATUS_OK) {
+ goto error;
+ }
+ bt_self_component_set_data(
+ bt_self_component_source_as_self_component(self_comp),
+ dmesg_comp);
goto end;
error:
destroy_dmesg_component(dmesg_comp);
- status = BT_COMPONENT_STATUS_ERROR;
+ bt_self_component_set_data(
+ bt_self_component_source_as_self_component(self_comp),
+ NULL);
+
+ if (status >= 0) {
+ status = BT_SELF_COMPONENT_STATUS_ERROR;
+ }
end:
return status;
}
BT_HIDDEN
-void dmesg_finalize(struct bt_private_component *priv_comp)
+void dmesg_finalize(struct bt_self_component_source *self_comp)
{
+ destroy_dmesg_component(bt_self_component_get_data(
+ bt_self_component_source_as_self_component(self_comp)));
+}
+
+static
+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_notification *notif = NULL;
+ bool has_timestamp = false;
+ unsigned long sec, usec, msec;
+ unsigned int year, mon, mday, hour, min;
+ uint64_t ts = 0;
+ int ret = 0;
+ struct dmesg_component *dmesg_comp = notif_iter->dmesg_comp;
+ *new_start = line;
+
+ if (dmesg_comp->params.no_timestamp) {
+ goto skip_ts;
+ }
+
+ /* Extract time from input line */
+ if (sscanf(line, "[%lu.%lu] ", &sec, &usec) == 2) {
+ ts = (uint64_t) sec * USEC_PER_SEC + (uint64_t) usec;
+
+ /*
+ * The clock class we use has a 1 GHz frequency: convert
+ * from µs to ns.
+ */
+ ts *= NSEC_PER_USEC;
+ has_timestamp = true;
+ } else if (sscanf(line, "[%u-%u-%u %u:%u:%lu.%lu] ",
+ &year, &mon, &mday, &hour, &min,
+ &sec, &msec) == 7) {
+ time_t ep_sec;
+ struct tm ti;
+
+ memset(&ti, 0, sizeof(ti));
+ ti.tm_year = year - 1900; /* From 1900 */
+ ti.tm_mon = mon - 1; /* 0 to 11 */
+ ti.tm_mday = mday;
+ ti.tm_hour = hour;
+ ti.tm_min = min;
+ ti.tm_sec = sec;
+
+ ep_sec = bt_timegm(&ti);
+ if (ep_sec != (time_t) -1) {
+ ts = (uint64_t) ep_sec * NSEC_PER_SEC
+ + (uint64_t) msec * NSEC_PER_MSEC;
+ }
+
+ has_timestamp = true;
+ }
+
+ if (has_timestamp) {
+ /* Set new start for the message portion of the line */
+ *new_start = strchr(line, ']');
+ BT_ASSERT(*new_start);
+ (*new_start)++;
+
+ if ((*new_start)[0] == ' ') {
+ (*new_start)++;
+ }
+ }
+
+skip_ts:
+ /*
+ * At this point, we know if the stream class's event header
+ * field class should have a timestamp or not, so we can lazily
+ * create the metadata, stream, and packet objects.
+ */
+ ret = try_create_meta_stream_packet(dmesg_comp, has_timestamp);
+ if (ret) {
+ /* try_create_meta_stream_packet() logs errors */
+ goto error;
+ }
+
+ 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_notification_event_borrow_event(notif);
+ BT_ASSERT(event);
+
+ if (dmesg_comp->clock_class) {
+ bt_event_set_default_clock_value(event, ts);
+ }
+
+ goto end;
+
+error:
+ BT_OBJECT_PUT_REF_AND_RESET(notif);
+
+end:
+ return notif;
+}
+
+static
+int fill_event_payload_from_line(const char *line,
+ struct bt_event *event)
+{
+ struct bt_field *ep_field = NULL;
+ struct bt_field *str_field = NULL;
+ size_t len;
+ int ret;
+
+ ep_field = bt_event_borrow_payload_field(event);
+ BT_ASSERT(ep_field);
+ str_field = bt_field_structure_borrow_member_field_by_index(
+ ep_field, 0);
+ if (!str_field) {
+ BT_LOGE_STR("Cannot borrow `timestamp` field from event payload structure field.");
+ goto error;
+ }
+
+ len = strlen(line);
+ if (line[len - 1] == '\n') {
+ /* Do not include the newline character in the payload */
+ len--;
+ }
+
+ ret = bt_field_string_clear(str_field);
+ if (ret) {
+ BT_LOGE_STR("Cannot clear string field object.");
+ goto error;
+ }
+
+ ret = bt_field_string_append_with_length(str_field, line, len);
+ if (ret) {
+ BT_LOGE("Cannot append value to string field object: "
+ "len=%zu", len);
+ goto error;
+ }
+
+ goto end;
+
+error:
+ ret = -1;
+
+end:
+ return ret;
+}
+
+static
+struct bt_notification *create_notif_from_line(
+ struct dmesg_notif_iter *dmesg_notif_iter, const char *line)
+{
+ struct bt_event *event = NULL;
+ struct bt_notification *notif = NULL;
+ const char *new_start;
+ int ret;
+
+ notif = create_init_event_notif_from_line(dmesg_notif_iter,
+ line, &new_start);
+ if (!notif) {
+ BT_LOGE_STR("Cannot create and initialize event notification from line.");
+ goto error;
+ }
+
+ event = bt_notification_event_borrow_event(notif);
+ BT_ASSERT(event);
+ ret = fill_event_payload_from_line(new_start, event);
+ if (ret) {
+ BT_LOGE("Cannot fill event payload field from line: "
+ "ret=%d", ret);
+ goto error;
+ }
+
+ goto end;
+
+error:
+ BT_OBJECT_PUT_REF_AND_RESET(notif);
+
+end:
+ return notif;
+}
+
+static
+void destroy_dmesg_notif_iter(struct dmesg_notif_iter *dmesg_notif_iter)
+{
+ if (!dmesg_notif_iter) {
+ return;
+ }
+
+ if (dmesg_notif_iter->fp && dmesg_notif_iter->fp != stdin) {
+ if (fclose(dmesg_notif_iter->fp)) {
+ BT_LOGE_ERRNO("Cannot close input file", ".");
+ }
+ }
+
+ bt_object_put_ref(dmesg_notif_iter->tmp_event_notif);
+ free(dmesg_notif_iter->linebuf);
+ g_free(dmesg_notif_iter);
}
BT_HIDDEN
-enum bt_notification_iterator_status dmesg_notif_iter_init(
- struct bt_private_notification_iterator *priv_notif_iter,
- struct bt_private_port *priv_port)
+enum bt_self_notification_iterator_status dmesg_notif_iter_init(
+ struct bt_self_notification_iterator *self_notif_iter,
+ struct bt_self_component_source *self_comp,
+ struct bt_self_component_port_output *self_port)
{
+ struct dmesg_component *dmesg_comp;
+ struct dmesg_notif_iter *dmesg_notif_iter =
+ g_new0(struct dmesg_notif_iter, 1);
+ enum bt_self_notification_iterator_status status =
+ BT_SELF_NOTIFICATION_ITERATOR_STATUS_OK;
+
+ if (!dmesg_notif_iter) {
+ BT_LOGE_STR("Failed to allocate on dmesg notification iterator structure.");
+ goto error;
+ }
+
+ dmesg_comp = bt_self_component_get_data(
+ bt_self_component_source_as_self_component(self_comp));
+ BT_ASSERT(dmesg_comp);
+ dmesg_notif_iter->dmesg_comp = dmesg_comp;
+ dmesg_notif_iter->pc_notif_iter = self_notif_iter;
+
+ if (dmesg_comp->params.read_from_stdin) {
+ dmesg_notif_iter->fp = stdin;
+ } else {
+ dmesg_notif_iter->fp = fopen(dmesg_comp->params.path->str, "r");
+ if (!dmesg_notif_iter->fp) {
+ BT_LOGE_ERRNO("Cannot open input file in read mode", ": path=\"%s\"",
+ dmesg_comp->params.path->str);
+ goto error;
+ }
+ }
+
+ bt_self_notification_iterator_set_data(self_notif_iter,
+ dmesg_notif_iter);
+ goto end;
+error:
+ destroy_dmesg_notif_iter(dmesg_notif_iter);
+ bt_self_notification_iterator_set_data(self_notif_iter, NULL);
+ if (status >= 0) {
+ status = BT_SELF_NOTIFICATION_ITERATOR_STATUS_ERROR;
+ }
+
+end:
+ return status;
}
BT_HIDDEN
-void dmesg_iterator_finalize(
- struct bt_private_notification_iterator *priv_notif_iter)
+void dmesg_notif_iter_finalize(
+ struct bt_self_notification_iterator *priv_notif_iter)
+{
+ destroy_dmesg_notif_iter(bt_self_notification_iterator_get_data(
+ priv_notif_iter));
+}
+
+static
+enum bt_self_notification_iterator_status dmesg_notif_iter_next_one(
+ struct dmesg_notif_iter *dmesg_notif_iter,
+ struct bt_notification **notif)
{
+ ssize_t len;
+ struct dmesg_component *dmesg_comp;
+ enum bt_self_notification_iterator_status status =
+ BT_SELF_NOTIFICATION_ITERATOR_STATUS_OK;
+
+ BT_ASSERT(dmesg_notif_iter);
+ dmesg_comp = dmesg_notif_iter->dmesg_comp;
+ BT_ASSERT(dmesg_comp);
+
+ if (dmesg_notif_iter->state == STATE_DONE) {
+ status = BT_SELF_NOTIFICATION_ITERATOR_STATUS_END;
+ goto end;
+ }
+
+ if (dmesg_notif_iter->tmp_event_notif ||
+ dmesg_notif_iter->state == STATE_EMIT_PACKET_END ||
+ dmesg_notif_iter->state == STATE_EMIT_STREAM_END) {
+ goto handle_state;
+ }
+
+ while (true) {
+ const char *ch;
+ bool only_spaces = true;
+
+ len = bt_getline(&dmesg_notif_iter->linebuf,
+ &dmesg_notif_iter->linebuf_len, dmesg_notif_iter->fp);
+ if (len < 0) {
+ if (errno == EINVAL) {
+ status = BT_SELF_NOTIFICATION_ITERATOR_STATUS_ERROR;
+ } else if (errno == ENOMEM) {
+ status =
+ BT_SELF_NOTIFICATION_ITERATOR_STATUS_NOMEM;
+ } else {
+ if (dmesg_notif_iter->state == STATE_EMIT_STREAM_BEGINNING) {
+ /* Stream did not even begin */
+ status = BT_SELF_NOTIFICATION_ITERATOR_STATUS_END;
+ goto end;
+ } else {
+ /* End current packet now */
+ dmesg_notif_iter->state =
+ STATE_EMIT_PACKET_END;
+ goto handle_state;
+ }
+ }
+
+ goto end;
+ }
+
+ BT_ASSERT(dmesg_notif_iter->linebuf);
+
+ /* Ignore empty lines, once trimmed */
+ for (ch = dmesg_notif_iter->linebuf; *ch != '\0'; ch++) {
+ if (!isspace(*ch)) {
+ only_spaces = false;
+ break;
+ }
+ }
+ if (!only_spaces) {
+ break;
+ }
+ }
+
+ dmesg_notif_iter->tmp_event_notif = create_notif_from_line(
+ dmesg_notif_iter, dmesg_notif_iter->linebuf);
+ if (!dmesg_notif_iter->tmp_event_notif) {
+ BT_LOGE("Cannot create event notification from line: "
+ "dmesg-comp-addr=%p, line=\"%s\"", dmesg_comp,
+ dmesg_notif_iter->linebuf);
+ goto end;
+ }
+
+handle_state:
+ BT_ASSERT(dmesg_comp->trace);
+
+ switch (dmesg_notif_iter->state) {
+ case STATE_EMIT_STREAM_BEGINNING:
+ BT_ASSERT(dmesg_notif_iter->tmp_event_notif);
+ *notif = bt_notification_stream_begin_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_notification_packet_begin_create(
+ dmesg_notif_iter->pc_notif_iter, dmesg_comp->packet);
+ dmesg_notif_iter->state = STATE_EMIT_EVENT;
+ break;
+ case STATE_EMIT_EVENT:
+ BT_ASSERT(dmesg_notif_iter->tmp_event_notif);
+ *notif = dmesg_notif_iter->tmp_event_notif;
+ dmesg_notif_iter->tmp_event_notif = NULL;
+ break;
+ case STATE_EMIT_PACKET_END:
+ *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_notification_stream_end_create(
+ dmesg_notif_iter->pc_notif_iter, dmesg_comp->stream);
+ dmesg_notif_iter->state = STATE_DONE;
+ break;
+ default:
+ break;
+ }
+
+ if (!*notif) {
+ BT_LOGE("Cannot create notification: dmesg-comp-addr=%p",
+ dmesg_comp);
+ status = BT_SELF_NOTIFICATION_ITERATOR_STATUS_ERROR;
+ }
+
+end:
+ return status;
}
BT_HIDDEN
-struct bt_notification_iterator_next_return dmesg_notif_iter_next(
- struct bt_private_notification_iterator *priv_notif_iter)
+enum bt_self_notification_iterator_status dmesg_notif_iter_next(
+ struct bt_self_notification_iterator *self_notif_iter,
+ bt_notification_array_const notifs, uint64_t capacity,
+ uint64_t *count)
{
+ struct dmesg_notif_iter *dmesg_notif_iter =
+ bt_self_notification_iterator_get_data(
+ self_notif_iter);
+ enum bt_self_notification_iterator_status status =
+ BT_SELF_NOTIFICATION_ITERATOR_STATUS_OK;
+ uint64_t i = 0;
+
+ while (i < capacity &&
+ status == BT_SELF_NOTIFICATION_ITERATOR_STATUS_OK) {
+ struct bt_notification *priv_notif = NULL;
+
+ status = dmesg_notif_iter_next_one(dmesg_notif_iter,
+ &priv_notif);
+ notifs[i] = priv_notif;
+ if (status == BT_SELF_NOTIFICATION_ITERATOR_STATUS_OK) {
+ i++;
+ }
+ }
+
+ if (i > 0) {
+ /*
+ * Even if dmesg_notif_iter_next_one() returned
+ * something else than
+ * BT_SELF_NOTIFICATION_ITERATOR_STATUS_OK, we
+ * accumulated notification objects in the output
+ * notification array, so we need to return
+ * BT_SELF_NOTIFICATION_ITERATOR_STATUS_OK so that they
+ * are transfered to downstream. This other status
+ * occurs again the next time muxer_notif_iter_do_next()
+ * is called, possibly without any accumulated
+ * notification, in which case we'll return it.
+ */
+ *count = i;
+ status = BT_SELF_NOTIFICATION_ITERATOR_STATUS_OK;
+ }
+ return status;
}