/*
* 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
#include <string.h>
#include <ctype.h>
#include <stdio.h>
-#include <babeltrace/assert-internal.h>
-#include <babeltrace/babeltrace.h>
-#include <babeltrace/values-internal.h>
-#include <babeltrace/compat/utc-internal.h>
-#include <babeltrace/compat/stdio-internal.h>
+#include <babeltrace2/assert-internal.h>
+#include <babeltrace2/common-internal.h>
+#include <babeltrace2/babeltrace.h>
+#include <babeltrace2/value-internal.h>
+#include <babeltrace2/compat/utc-internal.h>
+#include <babeltrace2/compat/stdio-internal.h>
#include <glib.h>
#define NSEC_PER_USEC 1000UL
struct dmesg_component;
-struct dmesg_notif_iter {
+struct dmesg_msg_iter {
struct dmesg_component *dmesg_comp;
- struct bt_private_connection_private_notification_iterator *pc_notif_iter; /* Weak */
+ bt_self_message_iterator *pc_msg_iter; /* Weak */
char *linebuf;
size_t linebuf_len;
FILE *fp;
- struct bt_notification *tmp_event_notif;
+ bt_message *tmp_event_msg;
+ uint64_t last_clock_value;
enum {
STATE_EMIT_STREAM_BEGINNING,
+ STATE_EMIT_STREAM_ACTIVITY_BEGINNING,
STATE_EMIT_PACKET_BEGINNING,
STATE_EMIT_EVENT,
STATE_EMIT_PACKET_END,
+ STATE_EMIT_STREAM_ACTIVITY_END,
STATE_EMIT_STREAM_END,
STATE_DONE,
} state;
bt_bool no_timestamp;
} params;
- 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;
- struct bt_clock_class_priority_map *cc_prio_map;
+ bt_self_component_source *self_comp;
+ bt_trace_class *trace_class;
+ bt_stream_class *stream_class;
+ bt_event_class *event_class;
+ bt_trace *trace;
+ bt_stream *stream;
+ bt_packet *packet;
+ bt_clock_class *clock_class;
};
static
-struct bt_field_type *create_packet_header_ft(void)
+bt_field_class *create_event_payload_fc(bt_trace_class *trace_class)
{
- struct bt_field_type *root_ft = NULL;
- struct bt_field_type *ft = NULL;
+ bt_field_class *root_fc = NULL;
+ bt_field_class *fc = NULL;
int ret;
- root_ft = bt_field_type_structure_create();
- if (!root_ft) {
- BT_LOGE_STR("Cannot create an empty structure field type object.");
+ root_fc = bt_field_class_structure_create(trace_class);
+ if (!root_fc) {
+ BT_LOGE_STR("Cannot create an empty structure field class object.");
goto error;
}
- ft = bt_field_type_integer_create(32);
- if (!ft) {
- BT_LOGE_STR("Cannot create an integer field type object.");
+ fc = bt_field_class_string_create(trace_class);
+ if (!fc) {
+ BT_LOGE_STR("Cannot create a string field class object.");
goto error;
}
- ret = bt_field_type_structure_add_field(root_ft, ft, "magic");
+ ret = bt_field_class_structure_append_member(root_fc,
+ "str", fc);
if (ret) {
- BT_LOGE("Cannot add `magic` field type to structure field type: "
- "ret=%d", ret);
- goto error;
- }
-
- BT_PUT(ft);
- ft = bt_field_type_integer_create(8);
- if (!ft) {
- BT_LOGE_STR("Cannot create an integer field type object.");
- goto error;
- }
-
- goto end;
-
-error:
- BT_PUT(root_ft);
-
-end:
- bt_put(ft);
- return root_ft;
-}
-
-static
-struct bt_field_type *create_event_header_ft(
- struct bt_clock_class *clock_class)
-{
- struct bt_field_type *root_ft = NULL;
- struct bt_field_type *ft = NULL;
- int ret;
-
- root_ft = bt_field_type_structure_create();
- if (!root_ft) {
- BT_LOGE_STR("Cannot create an empty structure field type object.");
- goto error;
- }
-
- ft = bt_field_type_integer_create(64);
- if (!ft) {
- BT_LOGE_STR("Cannot create an integer field type object.");
- goto error;
- }
-
- ret = bt_field_type_integer_set_mapped_clock_class(ft, clock_class);
- if (ret) {
- BT_LOGE("Cannot map integer field type to clock class: "
- "ret=%d", ret);
- goto error;
- }
-
- ret = bt_field_type_structure_add_field(root_ft,
- ft, "timestamp");
- if (ret) {
- BT_LOGE("Cannot add `timestamp` field type to structure field type: "
+ BT_LOGE("Cannot add `str` member to structure field class: "
"ret=%d", ret);
goto error;
}
goto end;
error:
- BT_PUT(root_ft);
+ BT_FIELD_CLASS_PUT_REF_AND_RESET(root_fc);
end:
- bt_put(ft);
- return root_ft;
-}
-
-static
-struct bt_field_type *create_event_payload_ft(void)
-{
- struct bt_field_type *root_ft = NULL;
- struct bt_field_type *ft = NULL;
- int ret;
-
- root_ft = bt_field_type_structure_create();
- if (!root_ft) {
- BT_LOGE_STR("Cannot create an empty structure field type object.");
- goto error;
- }
-
- ft = bt_field_type_string_create();
- if (!ft) {
- BT_LOGE_STR("Cannot create a string field type object.");
- goto error;
- }
-
- ret = bt_field_type_structure_add_field(root_ft,
- ft, "str");
- if (ret) {
- BT_LOGE("Cannot add `str` field type to structure field type: "
- "ret=%d", ret);
- goto error;
- }
-
- goto end;
-
-error:
- BT_PUT(root_ft);
-
-end:
- bt_put(ft);
- return root_ft;
-}
-
-static
-struct bt_clock_class *create_clock_class(void)
-{
- return bt_clock_class_create("the_clock", 1000000000);
+ bt_field_class_put_ref(fc);
+ return root_fc;
}
static
int create_meta(struct dmesg_component *dmesg_comp, bool has_ts)
{
- struct bt_field_type *ft = NULL;
- const char *trace_name = NULL;
- gchar *basename = NULL;
+ bt_field_class *fc = NULL;
int ret = 0;
- dmesg_comp->trace = bt_trace_create();
- if (!dmesg_comp->trace) {
- BT_LOGE_STR("Cannot create an empty trace object.");
- goto error;
- }
-
- ft = create_packet_header_ft();
- if (!ft) {
- BT_LOGE_STR("Cannot create packet header field type.");
+ dmesg_comp->trace_class = bt_trace_class_create(
+ bt_self_component_source_as_self_component(
+ dmesg_comp->self_comp));
+ if (!dmesg_comp->trace_class) {
+ BT_LOGE_STR("Cannot create an empty trace class object.");
goto error;
}
- ret = bt_trace_set_packet_header_field_type(dmesg_comp->trace, ft);
- if (ret) {
- BT_LOGE_STR("Cannot set trace's packet header field type.");
- 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(NULL);
+ dmesg_comp->stream_class = bt_stream_class_create(
+ dmesg_comp->trace_class);
if (!dmesg_comp->stream_class) {
- BT_LOGE_STR("Cannot create an empty stream class object.");
+ BT_LOGE_STR("Cannot create a stream class object.");
goto error;
}
if (has_ts) {
- dmesg_comp->clock_class = create_clock_class();
+ dmesg_comp->clock_class = bt_clock_class_create(
+ bt_self_component_source_as_self_component(
+ dmesg_comp->self_comp));
if (!dmesg_comp->clock_class) {
BT_LOGE_STR("Cannot create clock class.");
goto error;
}
- ret = bt_trace_add_clock_class(dmesg_comp->trace,
- dmesg_comp->clock_class);
- if (ret) {
- BT_LOGE_STR("Cannot add clock class to trace.");
- goto error;
- }
-
- bt_put(ft);
- ft = create_event_header_ft(dmesg_comp->clock_class);
- if (!ft) {
- BT_LOGE_STR("Cannot create event header field type.");
- goto error;
- }
+ /*
+ * The `dmesg` timestamp's origin is not the Unix epoch,
+ * it's the boot time.
+ */
+ bt_clock_class_set_origin_is_unix_epoch(dmesg_comp->clock_class,
+ BT_FALSE);
- ret = bt_stream_class_set_event_header_field_type(
- dmesg_comp->stream_class, ft);
+ 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 event header field type.");
+ BT_LOGE_STR("Cannot set stream class's default clock class.");
goto error;
}
- }
- dmesg_comp->event_class = bt_event_class_create("string");
- if (!dmesg_comp->event_class) {
- BT_LOGE_STR("Cannot create an empty event class object.");
- goto error;
+ bt_stream_class_set_packets_have_beginning_default_clock_snapshot(
+ dmesg_comp->stream_class, BT_TRUE);
+ bt_stream_class_set_packets_have_end_default_clock_snapshot(
+ dmesg_comp->stream_class, BT_TRUE);
}
- bt_put(ft);
- ft = create_event_payload_ft();
- if (!ft) {
- BT_LOGE_STR("Cannot create event payload field type.");
+ 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_payload_field_type(dmesg_comp->event_class, ft);
+ ret = bt_event_class_set_name(dmesg_comp->event_class, "string");
if (ret) {
- BT_LOGE_STR("Cannot set event class's event payload field type.");
+ BT_LOGE_STR("Cannot set event class's name.");
goto error;
}
- ret = bt_stream_class_add_event_class(dmesg_comp->stream_class,
- dmesg_comp->event_class);
- if (ret) {
- BT_LOGE("Cannot add event class to stream class: ret=%d", ret);
+ fc = create_event_payload_fc(dmesg_comp->trace_class);
+ if (!fc) {
+ BT_LOGE_STR("Cannot create event payload field class.");
goto error;
}
- ret = bt_trace_add_stream_class(dmesg_comp->trace,
- dmesg_comp->stream_class);
+ ret = bt_event_class_set_payload_field_class(dmesg_comp->event_class, fc);
if (ret) {
- BT_LOGE("Cannot add event class to stream class: ret=%d", ret);
+ BT_LOGE_STR("Cannot set event class's event payload field class.");
goto error;
}
ret = -1;
end:
- bt_put(ft);
-
- if (basename) {
- g_free(basename);
- }
-
+ bt_field_class_put_ref(fc);
return ret;
}
static
-int handle_params(struct dmesg_component *dmesg_comp, struct bt_value *params)
+int handle_params(struct dmesg_component *dmesg_comp,
+ const bt_value *params)
{
- struct bt_value *read_from_stdin = NULL;
- struct bt_value *no_timestamp = NULL;
- struct bt_value *path = NULL;
+ const bt_value *no_timestamp = NULL;
+ const bt_value *path = NULL;
const char *path_str;
int ret = 0;
- no_timestamp = bt_value_map_get(params, "no-extract-timestamp");
+ 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_value_type_string(
+ bt_common_value_type_string(
bt_value_get_type(no_timestamp)));
goto error;
}
- ret = bt_value_bool_get(no_timestamp,
- &dmesg_comp->params.no_timestamp);
- BT_ASSERT(ret == 0);
+ dmesg_comp->params.no_timestamp =
+ bt_value_bool_get(no_timestamp);
}
- path = bt_value_map_get(params, "path");
+ path = bt_value_map_borrow_entry_value_const(params, "path");
if (path) {
if (dmesg_comp->params.read_from_stdin) {
BT_LOGE_STR("Cannot specify both `read-from-stdin` and `path` parameters.");
if (!bt_value_is_string(path)) {
BT_LOGE("Expecting a string value for the `path` parameter: "
"type=%s",
- bt_value_type_string(
+ bt_common_value_type_string(
bt_value_get_type(path)));
goto error;
}
- ret = bt_value_string_get(path, &path_str);
- BT_ASSERT(ret == 0);
+ path_str = bt_value_string_get(path);
g_string_assign(dmesg_comp->params.path, path_str);
} else {
dmesg_comp->params.read_from_stdin = true;
ret = -1;
end:
- bt_put(read_from_stdin);
- bt_put(path);
- bt_put(no_timestamp);
return ret;
}
static
-int fill_packet_header_field(struct bt_packet *packet)
+int create_packet_and_stream_and_trace(struct dmesg_component *dmesg_comp)
{
- struct bt_field *ph = NULL;
- struct bt_field *magic = NULL;
- int ret;
+ int ret = 0;
+ const char *trace_name = NULL;
+ gchar *basename = NULL;
- ph = bt_packet_borrow_header(packet);
- BT_ASSERT(ph);
- magic = bt_field_structure_borrow_field_by_name(ph, "magic");
- if (!magic) {
- BT_LOGE_STR("Cannot borrow `magic` field from structure field.");
+ dmesg_comp->trace = bt_trace_create(dmesg_comp->trace_class);
+ if (!dmesg_comp->trace) {
+ BT_LOGE_STR("Cannot create trace object.");
goto error;
}
- ret = bt_field_integer_unsigned_set_value(magic, 0xc1fc1fc1);
- BT_ASSERT(ret == 0);
- goto end;
-
-error:
- ret = -1;
+ if (dmesg_comp->params.read_from_stdin) {
+ trace_name = "STDIN";
+ } else {
+ basename = g_path_get_basename(dmesg_comp->params.path->str);
+ BT_ASSERT(basename);
-end:
- return ret;
-}
+ if (strcmp(basename, G_DIR_SEPARATOR_S) != 0 &&
+ strcmp(basename, ".") != 0) {
+ trace_name = basename;
+ }
+ }
-static
-int create_packet_and_stream(struct dmesg_component *dmesg_comp)
-{
- int ret = 0;
+ 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,
- NULL, 0);
+ dmesg_comp->trace);
if (!dmesg_comp->stream) {
BT_LOGE_STR("Cannot create stream object.");
goto error;
goto error;
}
- ret = fill_packet_header_field(dmesg_comp->packet);
- if (ret) {
- BT_LOGE_STR("Cannot fill packet header field.");
- goto error;
- }
-
- ret = bt_trace_set_is_static(dmesg_comp->trace);
- if (ret) {
- BT_LOGE_STR("Cannot make trace static.");
- goto error;
- }
-
goto end;
error:
ret = -1;
end:
+ if (basename) {
+ g_free(basename);
+ }
+
return ret;
}
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);
g_string_free(dmesg_comp->params.path, TRUE);
}
- bt_put(dmesg_comp->packet);
- bt_put(dmesg_comp->trace);
- bt_put(dmesg_comp->stream_class);
- bt_put(dmesg_comp->event_class);
- bt_put(dmesg_comp->stream);
- bt_put(dmesg_comp->clock_class);
- bt_put(dmesg_comp->cc_prio_map);
+ bt_packet_put_ref(dmesg_comp->packet);
+ bt_trace_put_ref(dmesg_comp->trace);
+ bt_stream_class_put_ref(dmesg_comp->stream_class);
+ bt_event_class_put_ref(dmesg_comp->event_class);
+ bt_stream_put_ref(dmesg_comp->stream);
+ bt_clock_class_put_ref(dmesg_comp->clock_class);
+ bt_trace_class_put_ref(dmesg_comp->trace_class);
g_free(dmesg_comp);
}
static
-enum bt_component_status create_port(struct bt_private_component *priv_comp)
+bt_self_component_status create_port(
+ bt_self_component_source *self_comp)
{
- return bt_private_component_source_add_output_private_port(priv_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,
- struct bt_value *params, void *init_method_data)
+bt_self_component_status dmesg_init(
+ bt_self_component_source *self_comp,
+ 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;
+ 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->self_comp = self_comp;
dmesg_comp->params.path = g_string_new(NULL);
if (!dmesg_comp->params.path) {
BT_LOGE_STR("Failed to allocate a GString.");
ret = handle_params(dmesg_comp, params);
if (ret) {
- BT_LOGE("Invalid parameters: comp-addr=%p", priv_comp);
+ BT_LOGE("Invalid parameters: comp-addr=%p", self_comp);
goto error;
}
!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\"", priv_comp,
+ "comp-addr=%p, path=\"%s\"", self_comp,
dmesg_comp->params.path->str);
goto error;
}
- status = create_port(priv_comp);
- if (status != BT_COMPONENT_STATUS_OK) {
+ status = create_port(self_comp);
+ if (status != BT_SELF_COMPONENT_STATUS_OK) {
goto error;
}
- (void) bt_private_component_set_user_data(priv_comp, dmesg_comp);
+ bt_self_component_set_data(
+ bt_self_component_source_as_self_component(self_comp),
+ dmesg_comp);
goto end;
error:
destroy_dmesg_component(dmesg_comp);
- (void) bt_private_component_set_user_data(priv_comp, NULL);
+ bt_self_component_set_data(
+ bt_self_component_source_as_self_component(self_comp),
+ NULL);
if (status >= 0) {
- status = BT_COMPONENT_STATUS_ERROR;
+ status = BT_SELF_COMPONENT_STATUS_ERROR;
}
end:
}
BT_HIDDEN
-void dmesg_finalize(struct bt_private_component *priv_comp)
+void dmesg_finalize(bt_self_component_source *self_comp)
{
- void *data = bt_private_component_get_user_data(priv_comp);
-
- destroy_dmesg_component(data);
+ 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,
+bt_message *create_init_event_msg_from_line(
+ struct dmesg_msg_iter *msg_iter,
const char *line, const char **new_start)
{
- struct bt_event *event;
- struct bt_notification *notif = NULL;
+ bt_event *event;
+ bt_message *msg = NULL;
bool has_timestamp = false;
unsigned long sec, usec, msec;
unsigned int year, mon, mday, hour, min;
uint64_t ts = 0;
- struct bt_field *eh_field = NULL;
- struct bt_field *ts_field = NULL;
int ret = 0;
- struct dmesg_component *dmesg_comp = notif_iter->dmesg_comp;
+ struct dmesg_component *dmesg_comp = msg_iter->dmesg_comp;
*new_start = line;
skip_ts:
/*
* At this point, we know if the stream class's event header
- * field type should have a timestamp or not, so we can lazily
+ * 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);
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) {
- ret = bt_event_set_clock_value(event,
- dmesg_comp->clock_class, ts, BT_TRUE);
- BT_ASSERT(ret == 0);
- eh_field = bt_event_borrow_header(event);
- BT_ASSERT(eh_field);
- ts_field = bt_field_structure_borrow_field_by_name(eh_field,
- "timestamp");
- if (!ts_field) {
- BT_LOGE_STR("Cannot borrow `timestamp` field from event header structure field.");
- goto error;
- }
+ msg = bt_message_event_create_with_default_clock_snapshot(
+ msg_iter->pc_msg_iter,
+ dmesg_comp->event_class, dmesg_comp->packet, ts);
+ msg_iter->last_clock_value = ts;
+ } else {
+ msg = bt_message_event_create(msg_iter->pc_msg_iter,
+ dmesg_comp->event_class, dmesg_comp->packet);
+ }
- ret = bt_field_integer_unsigned_set_value(ts_field, ts);
- BT_ASSERT(ret == 0);
+ if (!msg) {
+ BT_LOGE_STR("Cannot create event message.");
+ goto error;
}
+ event = bt_message_event_borrow_event(msg);
+ BT_ASSERT(event);
goto end;
error:
- BT_PUT(notif);
+ BT_MESSAGE_PUT_REF_AND_RESET(msg);
end:
- return notif;
+ return msg;
}
static
-int fill_event_payload_from_line(const char *line, struct bt_event *event)
+int fill_event_payload_from_line(const char *line,
+ bt_event *event)
{
- struct bt_field *ep_field = NULL;
- struct bt_field *str_field = NULL;
+ bt_field *ep_field = NULL;
+ bt_field *str_field = NULL;
size_t len;
int ret;
- ep_field = bt_event_borrow_payload(event);
+ ep_field = bt_event_borrow_payload_field(event);
BT_ASSERT(ep_field);
- str_field = bt_field_structure_borrow_field_by_name(ep_field, "str");
+ 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;
goto error;
}
- ret = bt_field_string_append_len(str_field, line, len);
+ 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);
}
static
-struct bt_notification *create_notif_from_line(
- struct dmesg_notif_iter *dmesg_notif_iter, const char *line)
+bt_message *create_msg_from_line(
+ struct dmesg_msg_iter *dmesg_msg_iter, const char *line)
{
- struct bt_event *event = NULL;
- struct bt_notification *notif = NULL;
+ bt_event *event = NULL;
+ bt_message *msg = NULL;
const char *new_start;
int ret;
- notif = create_init_event_notif_from_line(dmesg_notif_iter,
+ msg = create_init_event_msg_from_line(dmesg_msg_iter,
line, &new_start);
- if (!notif) {
- BT_LOGE_STR("Cannot create and initialize event notification from line.");
+ if (!msg) {
+ BT_LOGE_STR("Cannot create and initialize event message from line.");
goto error;
}
- event = bt_notification_event_borrow_event(notif);
+ event = bt_message_event_borrow_event(msg);
BT_ASSERT(event);
ret = fill_event_payload_from_line(new_start, event);
if (ret) {
goto end;
error:
- BT_PUT(notif);
+ BT_MESSAGE_PUT_REF_AND_RESET(msg);
end:
- return notif;
+ return msg;
}
static
-void destroy_dmesg_notif_iter(struct dmesg_notif_iter *dmesg_notif_iter)
+void destroy_dmesg_msg_iter(struct dmesg_msg_iter *dmesg_msg_iter)
{
- if (!dmesg_notif_iter) {
+ if (!dmesg_msg_iter) {
return;
}
- if (dmesg_notif_iter->fp && dmesg_notif_iter->fp != stdin) {
- if (fclose(dmesg_notif_iter->fp)) {
+ if (dmesg_msg_iter->fp && dmesg_msg_iter->fp != stdin) {
+ if (fclose(dmesg_msg_iter->fp)) {
BT_LOGE_ERRNO("Cannot close input file", ".");
}
}
- bt_put(dmesg_notif_iter->tmp_event_notif);
- free(dmesg_notif_iter->linebuf);
- g_free(dmesg_notif_iter);
+ bt_message_put_ref(dmesg_msg_iter->tmp_event_msg);
+ free(dmesg_msg_iter->linebuf);
+ g_free(dmesg_msg_iter);
}
+
+
BT_HIDDEN
-enum bt_notification_iterator_status dmesg_notif_iter_init(
- struct bt_private_connection_private_notification_iterator *priv_notif_iter,
- struct bt_private_port *priv_port)
+bt_self_message_iterator_status dmesg_msg_iter_init(
+ bt_self_message_iterator *self_msg_iter,
+ bt_self_component_source *self_comp,
+ bt_self_component_port_output *self_port)
{
- struct bt_private_component *priv_comp = NULL;
struct dmesg_component *dmesg_comp;
- struct dmesg_notif_iter *dmesg_notif_iter =
- g_new0(struct dmesg_notif_iter, 1);
- enum bt_notification_iterator_status status =
- BT_NOTIFICATION_ITERATOR_STATUS_OK;
+ struct dmesg_msg_iter *dmesg_msg_iter =
+ g_new0(struct dmesg_msg_iter, 1);
+ bt_self_message_iterator_status status =
+ BT_SELF_MESSAGE_ITERATOR_STATUS_OK;
- if (!dmesg_notif_iter) {
- BT_LOGE_STR("Failed to allocate on dmesg notification iterator structure.");
+ if (!dmesg_msg_iter) {
+ BT_LOGE_STR("Failed to allocate on dmesg message iterator structure.");
goto error;
}
- priv_comp = bt_private_connection_private_notification_iterator_get_private_component(
- priv_notif_iter);
- BT_ASSERT(priv_comp);
- dmesg_comp = bt_private_component_get_user_data(priv_comp);
+ 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 = priv_notif_iter;
+ dmesg_msg_iter->dmesg_comp = dmesg_comp;
+ dmesg_msg_iter->pc_msg_iter = self_msg_iter;
if (dmesg_comp->params.read_from_stdin) {
- dmesg_notif_iter->fp = stdin;
+ dmesg_msg_iter->fp = stdin;
} else {
- dmesg_notif_iter->fp = fopen(dmesg_comp->params.path->str, "r");
- if (!dmesg_notif_iter->fp) {
+ dmesg_msg_iter->fp = fopen(dmesg_comp->params.path->str, "r");
+ if (!dmesg_msg_iter->fp) {
BT_LOGE_ERRNO("Cannot open input file in read mode", ": path=\"%s\"",
dmesg_comp->params.path->str);
goto error;
}
}
- (void) bt_private_connection_private_notification_iterator_set_user_data(priv_notif_iter,
- dmesg_notif_iter);
+ bt_self_message_iterator_set_data(self_msg_iter,
+ dmesg_msg_iter);
goto end;
error:
- destroy_dmesg_notif_iter(dmesg_notif_iter);
- (void) bt_private_connection_private_notification_iterator_set_user_data(priv_notif_iter,
- NULL);
+ destroy_dmesg_msg_iter(dmesg_msg_iter);
+ bt_self_message_iterator_set_data(self_msg_iter, NULL);
if (status >= 0) {
- status = BT_NOTIFICATION_ITERATOR_STATUS_ERROR;
+ status = BT_SELF_MESSAGE_ITERATOR_STATUS_ERROR;
}
end:
- bt_put(priv_comp);
return status;
}
BT_HIDDEN
-void dmesg_notif_iter_finalize(
- struct bt_private_connection_private_notification_iterator *priv_notif_iter)
+void dmesg_msg_iter_finalize(
+ bt_self_message_iterator *priv_msg_iter)
{
- destroy_dmesg_notif_iter(bt_private_connection_private_notification_iterator_get_user_data(
- priv_notif_iter));
+ destroy_dmesg_msg_iter(bt_self_message_iterator_get_data(
+ priv_msg_iter));
}
static
-enum bt_notification_iterator_status dmesg_notif_iter_next_one(
- struct dmesg_notif_iter *dmesg_notif_iter,
- struct bt_notification **notif)
+bt_self_message_iterator_status dmesg_msg_iter_next_one(
+ struct dmesg_msg_iter *dmesg_msg_iter,
+ bt_message **msg)
{
ssize_t len;
struct dmesg_component *dmesg_comp;
- enum bt_notification_iterator_status status =
- BT_NOTIFICATION_ITERATOR_STATUS_OK;
+ bt_self_message_iterator_status status =
+ BT_SELF_MESSAGE_ITERATOR_STATUS_OK;
- BT_ASSERT(dmesg_notif_iter);
- dmesg_comp = dmesg_notif_iter->dmesg_comp;
+ BT_ASSERT(dmesg_msg_iter);
+ dmesg_comp = dmesg_msg_iter->dmesg_comp;
BT_ASSERT(dmesg_comp);
- if (dmesg_notif_iter->state == STATE_DONE) {
- status = BT_NOTIFICATION_ITERATOR_STATUS_END;
+ if (dmesg_msg_iter->state == STATE_DONE) {
+ status = BT_SELF_MESSAGE_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) {
+ if (dmesg_msg_iter->tmp_event_msg ||
+ dmesg_msg_iter->state == STATE_EMIT_PACKET_END ||
+ dmesg_msg_iter->state == STATE_EMIT_STREAM_ACTIVITY_END ||
+ dmesg_msg_iter->state == STATE_EMIT_STREAM_END) {
goto handle_state;
}
const char *ch;
bool only_spaces = true;
- len = bt_getline(&dmesg_notif_iter->linebuf,
- &dmesg_notif_iter->linebuf_len, dmesg_notif_iter->fp);
+ len = bt_getline(&dmesg_msg_iter->linebuf,
+ &dmesg_msg_iter->linebuf_len, dmesg_msg_iter->fp);
if (len < 0) {
if (errno == EINVAL) {
- status = BT_NOTIFICATION_ITERATOR_STATUS_ERROR;
+ status = BT_SELF_MESSAGE_ITERATOR_STATUS_ERROR;
} else if (errno == ENOMEM) {
status =
- BT_NOTIFICATION_ITERATOR_STATUS_NOMEM;
+ BT_SELF_MESSAGE_ITERATOR_STATUS_NOMEM;
} else {
- if (dmesg_notif_iter->state == STATE_EMIT_STREAM_BEGINNING) {
+ if (dmesg_msg_iter->state == STATE_EMIT_STREAM_BEGINNING) {
/* Stream did not even begin */
- status = BT_NOTIFICATION_ITERATOR_STATUS_END;
+ status = BT_SELF_MESSAGE_ITERATOR_STATUS_END;
goto end;
} else {
/* End current packet now */
- dmesg_notif_iter->state =
+ dmesg_msg_iter->state =
STATE_EMIT_PACKET_END;
goto handle_state;
}
goto end;
}
- BT_ASSERT(dmesg_notif_iter->linebuf);
+ BT_ASSERT(dmesg_msg_iter->linebuf);
/* Ignore empty lines, once trimmed */
- for (ch = dmesg_notif_iter->linebuf; *ch != '\0'; ch++) {
+ for (ch = dmesg_msg_iter->linebuf; *ch != '\0'; ch++) {
if (!isspace(*ch)) {
only_spaces = false;
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_msg_iter->tmp_event_msg = create_msg_from_line(
+ dmesg_msg_iter, dmesg_msg_iter->linebuf);
+ if (!dmesg_msg_iter->tmp_event_msg) {
+ BT_LOGE("Cannot create event message from line: "
"dmesg-comp-addr=%p, line=\"%s\"", dmesg_comp,
- dmesg_notif_iter->linebuf);
+ dmesg_msg_iter->linebuf);
goto end;
}
handle_state:
BT_ASSERT(dmesg_comp->trace);
- switch (dmesg_notif_iter->state) {
+ switch (dmesg_msg_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;
+ BT_ASSERT(dmesg_msg_iter->tmp_event_msg);
+ *msg = bt_message_stream_beginning_create(
+ dmesg_msg_iter->pc_msg_iter, dmesg_comp->stream);
+ dmesg_msg_iter->state = STATE_EMIT_STREAM_ACTIVITY_BEGINNING;
+ break;
+ case STATE_EMIT_STREAM_ACTIVITY_BEGINNING:
+ BT_ASSERT(dmesg_msg_iter->tmp_event_msg);
+ *msg = bt_message_stream_activity_beginning_create(
+ dmesg_msg_iter->pc_msg_iter, dmesg_comp->stream);
+ dmesg_msg_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;
+ BT_ASSERT(dmesg_msg_iter->tmp_event_msg);
+
+ if (dmesg_comp->clock_class) {
+ *msg = bt_message_packet_beginning_create_with_default_clock_snapshot(
+ dmesg_msg_iter->pc_msg_iter, dmesg_comp->packet,
+ dmesg_msg_iter->last_clock_value);
+ } else {
+ *msg = bt_message_packet_beginning_create(
+ dmesg_msg_iter->pc_msg_iter, dmesg_comp->packet);
+ }
+
+ dmesg_msg_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;
+ BT_ASSERT(dmesg_msg_iter->tmp_event_msg);
+ *msg = dmesg_msg_iter->tmp_event_msg;
+ dmesg_msg_iter->tmp_event_msg = 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;
+ if (dmesg_comp->clock_class) {
+ *msg = bt_message_packet_end_create_with_default_clock_snapshot(
+ dmesg_msg_iter->pc_msg_iter, dmesg_comp->packet,
+ dmesg_msg_iter->last_clock_value);
+ } else {
+ *msg = bt_message_packet_end_create(
+ dmesg_msg_iter->pc_msg_iter, dmesg_comp->packet);
+ }
+
+ dmesg_msg_iter->state = STATE_EMIT_STREAM_ACTIVITY_END;
+ break;
+ case STATE_EMIT_STREAM_ACTIVITY_END:
+ *msg = bt_message_stream_activity_end_create(
+ dmesg_msg_iter->pc_msg_iter, dmesg_comp->stream);
+ dmesg_msg_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;
+ *msg = bt_message_stream_end_create(
+ dmesg_msg_iter->pc_msg_iter, dmesg_comp->stream);
+ dmesg_msg_iter->state = STATE_DONE;
break;
default:
break;
}
- if (!*notif) {
- BT_LOGE("Cannot create notification: dmesg-comp-addr=%p",
+ if (!*msg) {
+ BT_LOGE("Cannot create message: dmesg-comp-addr=%p",
dmesg_comp);
- status = BT_NOTIFICATION_ITERATOR_STATUS_ERROR;
+ status = BT_SELF_MESSAGE_ITERATOR_STATUS_ERROR;
}
end:
}
BT_HIDDEN
-enum bt_notification_iterator_status dmesg_notif_iter_next(
- struct bt_private_connection_private_notification_iterator *priv_notif_iter,
- bt_notification_array notifs, uint64_t capacity,
+bt_self_message_iterator_status dmesg_msg_iter_next(
+ bt_self_message_iterator *self_msg_iter,
+ bt_message_array_const msgs, uint64_t capacity,
uint64_t *count)
{
- struct dmesg_notif_iter *dmesg_notif_iter =
- bt_private_connection_private_notification_iterator_get_user_data(
- priv_notif_iter);
- enum bt_notification_iterator_status status =
- BT_NOTIFICATION_ITERATOR_STATUS_OK;
+ struct dmesg_msg_iter *dmesg_msg_iter =
+ bt_self_message_iterator_get_data(
+ self_msg_iter);
+ bt_self_message_iterator_status status =
+ BT_SELF_MESSAGE_ITERATOR_STATUS_OK;
uint64_t i = 0;
- while (i < capacity && status == BT_NOTIFICATION_ITERATOR_STATUS_OK) {
- status = dmesg_notif_iter_next_one(dmesg_notif_iter, ¬ifs[i]);
- if (status == BT_NOTIFICATION_ITERATOR_STATUS_OK) {
+ while (i < capacity &&
+ status == BT_SELF_MESSAGE_ITERATOR_STATUS_OK) {
+ bt_message *priv_msg = NULL;
+
+ status = dmesg_msg_iter_next_one(dmesg_msg_iter,
+ &priv_msg);
+ msgs[i] = priv_msg;
+ if (status == BT_SELF_MESSAGE_ITERATOR_STATUS_OK) {
i++;
}
}
if (i > 0) {
/*
- * Even if dmesg_notif_iter_next_one() returned
+ * Even if dmesg_msg_iter_next_one() returned
* something else than
- * BT_NOTIFICATION_ITERATOR_STATUS_OK, we accumulated
- * notification objects in the output notification
- * array, so we need to return
- * BT_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.
+ * BT_SELF_MESSAGE_ITERATOR_STATUS_OK, we
+ * accumulated message objects in the output
+ * message array, so we need to return
+ * BT_SELF_MESSAGE_ITERATOR_STATUS_OK so that they
+ * are transfered to downstream. This other status
+ * occurs again the next time muxer_msg_iter_do_next()
+ * is called, possibly without any accumulated
+ * message, in which case we'll return it.
*/
*count = i;
- status = BT_NOTIFICATION_ITERATOR_STATUS_OK;
+ status = BT_SELF_MESSAGE_ITERATOR_STATUS_OK;
}
return status;
}
+
+BT_HIDDEN
+bt_bool dmesg_msg_iter_can_seek_beginning(
+ bt_self_message_iterator *self_msg_iter)
+{
+ struct dmesg_msg_iter *dmesg_msg_iter =
+ bt_self_message_iterator_get_data(self_msg_iter);
+
+ /* Can't seek the beginning of the standard input stream */
+ return !dmesg_msg_iter->dmesg_comp->params.read_from_stdin;
+}
+
+BT_HIDDEN
+bt_self_message_iterator_status dmesg_msg_iter_seek_beginning(
+ bt_self_message_iterator *self_msg_iter)
+{
+ struct dmesg_msg_iter *dmesg_msg_iter =
+ bt_self_message_iterator_get_data(self_msg_iter);
+
+ BT_ASSERT(!dmesg_msg_iter->dmesg_comp->params.read_from_stdin);
+
+ BT_MESSAGE_PUT_REF_AND_RESET(dmesg_msg_iter->tmp_event_msg);
+ dmesg_msg_iter->last_clock_value = 0;
+ dmesg_msg_iter->state = STATE_EMIT_STREAM_BEGINNING;
+ return BT_SELF_MESSAGE_ITERATOR_STATUS_OK;
+}
projects / babeltrace.git / blobdiff