struct dmesg_notif_iter {
struct dmesg_component *dmesg_comp;
+ struct bt_private_connection_private_notification_iterator *pc_notif_iter; /* Weak */
char *linebuf;
size_t linebuf_len;
FILE *fp;
bt_bool no_timestamp;
} params;
- struct bt_graph *graph; /* Weak */
struct bt_trace *trace;
struct bt_stream_class *stream_class;
struct bt_event_class *event_class;
struct bt_clock_class_priority_map *cc_prio_map;
};
-static
-struct bt_field_type *create_packet_header_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_integer_create(32);
- if (!ft) {
- BT_LOGE_STR("Cannot create an integer field type object.");
- goto error;
- }
-
- ret = bt_field_type_structure_add_field(root_ft, ft, "magic");
- 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: "
- "ret=%d", ret);
- goto error;
- }
-
- goto end;
-
-error:
- BT_PUT(root_ft);
-
-end:
- bt_put(ft);
- return root_ft;
-}
-
static
struct bt_field_type *create_event_payload_ft(void)
{
goto error;
}
- ret = bt_field_type_structure_add_field(root_ft,
- ft, "str");
+ ret = bt_field_type_structure_append_member(root_ft, "str", ft);
if (ret) {
- BT_LOGE("Cannot add `str` field type to structure field type: "
+ BT_LOGE("Cannot add `str` member to structure field type: "
"ret=%d", ret);
goto error;
}
return root_ft;
}
-static
-struct bt_clock_class *create_clock_class(void)
-{
- return bt_clock_class_create("the_clock", 1000000000);
-}
-
static
int create_meta(struct dmesg_component *dmesg_comp, bool has_ts)
{
goto error;
}
- ft = create_packet_header_ft();
- if (!ft) {
- BT_LOGE_STR("Cannot create packet header field type.");
- 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 {
}
}
- dmesg_comp->stream_class = bt_stream_class_create(NULL);
+ dmesg_comp->stream_class = bt_stream_class_create(dmesg_comp->trace);
if (!dmesg_comp->stream_class) {
- BT_LOGE_STR("Cannot create an empty stream class object.");
- goto error;
- }
-
- dmesg_comp->cc_prio_map = bt_clock_class_priority_map_create();
- if (!dmesg_comp->cc_prio_map) {
- BT_LOGE_STR("Cannot create empty clock class priority map.");
+ 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();
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);
+ ret = bt_stream_class_set_default_clock_class(
+ dmesg_comp->stream_class, dmesg_comp->clock_class);
if (ret) {
- BT_LOGE_STR("Cannot add clock class to trace.");
- goto error;
- }
-
- ret = bt_clock_class_priority_map_add_clock_class(
- dmesg_comp->cc_prio_map, dmesg_comp->clock_class, 0);
- if (ret) {
- BT_LOGE_STR("Cannot add clock class to clock class priority map.");
- 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;
- }
-
- ret = bt_stream_class_set_event_header_field_type(
- dmesg_comp->stream_class, ft);
- 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");
+ dmesg_comp->event_class = bt_event_class_create(
+ dmesg_comp->stream_class);
if (!dmesg_comp->event_class) {
- BT_LOGE_STR("Cannot create an empty event class object.");
+ 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;
}
- bt_put(ft);
ft = create_event_payload_ft();
if (!ft) {
BT_LOGE_STR("Cannot create event payload field type.");
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);
- goto error;
- }
-
- ret = bt_trace_add_stream_class(dmesg_comp->trace,
- dmesg_comp->stream_class);
- if (ret) {
- BT_LOGE("Cannot add event class to stream class: ret=%d", ret);
- goto error;
- }
-
goto end;
error:
return ret;
}
-static
-int fill_packet_header_field(struct bt_packet *packet)
-{
- struct bt_field *ph = NULL;
- struct bt_field *magic = NULL;
- int ret;
-
- 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.");
- goto error;
- }
-
- ret = bt_field_integer_unsigned_set_value(magic, 0xc1fc1fc1);
- BT_ASSERT(ret == 0);
- 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,
- NULL, 0);
+ dmesg_comp->stream = bt_stream_create(dmesg_comp->stream_class);
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);
+ ret = bt_trace_make_static(dmesg_comp->trace);
if (ret) {
BT_LOGE_STR("Cannot make trace static.");
goto error;
goto error;
}
- dmesg_comp->graph = bt_component_borrow_graph(
- bt_component_borrow_from_private(priv_comp));
- BT_ASSERT(dmesg_comp->graph);
dmesg_comp->params.path = g_string_new(NULL);
if (!dmesg_comp->params.path) {
BT_LOGE_STR("Failed to allocate a GString.");
static
struct bt_notification *create_init_event_notif_from_line(
- struct dmesg_component *dmesg_comp,
+ struct dmesg_notif_iter *notif_iter,
const char *line, const char **new_start)
{
struct bt_event *event;
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;
*new_start = line;
goto error;
}
- notif = bt_notification_event_create(dmesg_comp->graph,
- dmesg_comp->event_class, dmesg_comp->packet,
- dmesg_comp->cc_prio_map);
+ 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;
BT_ASSERT(event);
if (dmesg_comp->clock_class) {
- struct bt_clock_value *cv = bt_event_borrow_clock_value(event,
- dmesg_comp->clock_class);
-
- ret = bt_clock_value_set_value(cv, ts);
- 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;
- }
-
- ret = bt_field_integer_unsigned_set_value(ts_field, ts);
+ ret = bt_event_set_default_clock_value(event, ts);
BT_ASSERT(ret == 0);
}
}
static
-int fill_event_payload_from_line(struct dmesg_component *dmesg_comp,
- const char *line, struct bt_event *event)
+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(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_component *dmesg_comp, const char *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_comp, line, &new_start);
+ 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(dmesg_comp, new_start,
- event);
+ ret = fill_event_payload_from_line(new_start, event);
if (ret) {
BT_LOGE("Cannot fill event payload field from line: "
"ret=%d", ret);
dmesg_comp = bt_private_component_get_user_data(priv_comp);
BT_ASSERT(dmesg_comp);
dmesg_notif_iter->dmesg_comp = dmesg_comp;
+ dmesg_notif_iter->pc_notif_iter = priv_notif_iter;
if (dmesg_comp->params.read_from_stdin) {
dmesg_notif_iter->fp = stdin;
priv_notif_iter));
}
-BT_HIDDEN
-struct bt_notification_iterator_next_method_return dmesg_notif_iter_next(
- struct bt_private_connection_private_notification_iterator *priv_notif_iter)
+static
+enum bt_notification_iterator_status dmesg_notif_iter_next_one(
+ struct dmesg_notif_iter *dmesg_notif_iter,
+ struct bt_notification **notif)
{
ssize_t len;
- struct dmesg_notif_iter *dmesg_notif_iter =
- bt_private_connection_private_notification_iterator_get_user_data(
- priv_notif_iter);
struct dmesg_component *dmesg_comp;
- struct bt_notification_iterator_next_method_return next_ret = {
- .status = BT_NOTIFICATION_ITERATOR_STATUS_OK,
- .notification = NULL
- };
+ enum bt_notification_iterator_status status =
+ BT_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) {
- next_ret.status = BT_NOTIFICATION_ITERATOR_STATUS_END;
+ status = BT_NOTIFICATION_ITERATOR_STATUS_END;
goto end;
}
&dmesg_notif_iter->linebuf_len, dmesg_notif_iter->fp);
if (len < 0) {
if (errno == EINVAL) {
- next_ret.status =
- BT_NOTIFICATION_ITERATOR_STATUS_ERROR;
+ status = BT_NOTIFICATION_ITERATOR_STATUS_ERROR;
} else if (errno == ENOMEM) {
- next_ret.status =
+ status =
BT_NOTIFICATION_ITERATOR_STATUS_NOMEM;
} else {
if (dmesg_notif_iter->state == STATE_EMIT_STREAM_BEGINNING) {
/* Stream did not even begin */
- next_ret.status =
- BT_NOTIFICATION_ITERATOR_STATUS_END;
+ status = BT_NOTIFICATION_ITERATOR_STATUS_END;
goto end;
} else {
/* End current packet now */
}
}
- dmesg_notif_iter->tmp_event_notif = create_notif_from_line(dmesg_comp,
- dmesg_notif_iter->linebuf);
+ 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,
switch (dmesg_notif_iter->state) {
case STATE_EMIT_STREAM_BEGINNING:
BT_ASSERT(dmesg_notif_iter->tmp_event_notif);
- next_ret.notification = bt_notification_stream_begin_create(
- dmesg_comp->graph, dmesg_comp->stream);
+ *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);
- next_ret.notification = bt_notification_packet_begin_create(
- dmesg_comp->graph, dmesg_comp->packet);
+ *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);
- BT_MOVE(next_ret.notification,
- 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:
- next_ret.notification = bt_notification_packet_end_create(
- dmesg_comp->graph, dmesg_comp->packet);
+ *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:
- next_ret.notification = bt_notification_stream_end_create(
- dmesg_comp->graph, dmesg_comp->stream);
+ *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 (!next_ret.notification) {
+ if (!*notif) {
BT_LOGE("Cannot create notification: dmesg-comp-addr=%p",
dmesg_comp);
- next_ret.status = BT_NOTIFICATION_ITERATOR_STATUS_ERROR;
+ status = BT_NOTIFICATION_ITERATOR_STATUS_ERROR;
}
end:
- return next_ret;
+ return status;
+}
+
+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,
+ 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;
+ 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) {
+ i++;
+ }
+ }
+
+ if (i > 0) {
+ /*
+ * Even if dmesg_notif_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.
+ */
+ *count = i;
+ status = BT_NOTIFICATION_ITERATOR_STATUS_OK;
+ }
+
+ return status;
}
projects / babeltrace.git / blobdiff