X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=plugins%2Ftext%2Fdmesg%2Fdmesg.c;h=4a7876d7053fc3680001b0ef66fdaecbb591516f;hb=416937235b48b55387c6074adc6a0dd59a5c76f4;hp=0edc2e6133dd7d0f4bcf42c705ed18ea48ea04bb;hpb=da91b29ad2964b85601e25843f1dca92f6c97406;p=babeltrace.git diff --git a/plugins/text/dmesg/dmesg.c b/plugins/text/dmesg/dmesg.c index 0edc2e61..4a7876d7 100644 --- a/plugins/text/dmesg/dmesg.c +++ b/plugins/text/dmesg/dmesg.c @@ -1,6 +1,6 @@ /* * Copyright 2010-2011 EfficiOS Inc. and Linux Foundation - * Copyright 2017 Philippe Proulx + * Copyright 2017 Philippe Proulx * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include #include @@ -43,13 +43,13 @@ 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; enum { STATE_EMIT_STREAM_BEGINNING, @@ -68,20 +68,21 @@ struct dmesg_component { 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_class *create_event_payload_fc(void) +bt_field_class *create_event_payload_fc(void) { - struct bt_field_class *root_fc = NULL; - struct bt_field_class *fc = NULL; + bt_field_class *root_fc = NULL; + bt_field_class *fc = NULL; int ret; root_fc = bt_field_class_structure_create(); @@ -96,7 +97,8 @@ struct bt_field_class *create_event_payload_fc(void) goto error; } - ret = bt_field_class_structure_append_member(root_fc, "str", fc); + 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); @@ -106,48 +108,29 @@ struct bt_field_class *create_event_payload_fc(void) goto end; error: - BT_OBJECT_PUT_REF_AND_RESET(root_fc); + BT_FIELD_CLASS_PUT_REF_AND_RESET(root_fc); end: - bt_object_put_ref(fc); + bt_field_class_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; + 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."); + 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; } - 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->stream_class = bt_stream_class_create( + dmesg_comp->trace_class); if (!dmesg_comp->stream_class) { BT_LOGE_STR("Cannot create a stream class object."); goto error; @@ -199,24 +182,20 @@ error: ret = -1; end: - bt_object_put_ref(fc); - - 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 *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_borrow_entry_value(params, + no_timestamp = bt_value_map_borrow_entry_value_const(params, "no-extract-timestamp"); if (no_timestamp) { if (!bt_value_is_bool(no_timestamp)) { @@ -227,12 +206,11 @@ int handle_params(struct dmesg_component *dmesg_comp, struct bt_value *params) 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_borrow_entry_value(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."); @@ -247,8 +225,7 @@ int handle_params(struct dmesg_component *dmesg_comp, struct bt_value *params) 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; @@ -264,11 +241,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; + } + + if (dmesg_comp->params.read_from_stdin) { + trace_name = "STDIN"; + } else { + basename = g_path_get_basename(dmesg_comp->params.path->str); + BT_ASSERT(basename); - dmesg_comp->stream = bt_stream_create(dmesg_comp->stream_class); + 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 +299,10 @@ error: ret = -1; end: + if (basename) { + g_free(basename); + } + return ret; } @@ -313,7 +324,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); @@ -340,36 +351,38 @@ void destroy_dmesg_component(struct dmesg_component *dmesg_comp) g_string_free(dmesg_comp->params.path, TRUE); } - 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); - bt_object_put_ref(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); 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."); @@ -378,7 +391,7 @@ enum bt_component_status dmesg_init(struct bt_private_component *priv_comp, 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; } @@ -386,25 +399,29 @@ enum bt_component_status dmesg_init(struct bt_private_component *priv_comp, !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: @@ -412,26 +429,25 @@ 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; int ret = 0; - struct dmesg_component *dmesg_comp = notif_iter->dmesg_comp; + struct dmesg_component *dmesg_comp = msg_iter->dmesg_comp; *new_start = line; @@ -495,42 +511,42 @@ skip_ts: goto error; } - notif = bt_notification_event_create(notif_iter->pc_notif_iter, + msg = bt_message_event_create(msg_iter->pc_msg_iter, dmesg_comp->event_class, dmesg_comp->packet); - if (!notif) { - BT_LOGE_STR("Cannot create event notification."); + if (!msg) { + BT_LOGE_STR("Cannot create event message."); goto error; } - event = bt_notification_event_borrow_event(notif); + event = bt_message_event_borrow_event(msg); BT_ASSERT(event); if (dmesg_comp->clock_class) { - ret = bt_event_set_default_clock_value(event, ts); - BT_ASSERT(ret == 0); + bt_event_set_default_clock_snapshot(event, ts); } goto end; error: - BT_OBJECT_PUT_REF_AND_RESET(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_field(event); BT_ASSERT(ep_field); - str_field = bt_field_structure_borrow_member_field_by_index(ep_field, - 0); + 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; @@ -565,22 +581,22 @@ end: } 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) { @@ -592,113 +608,109 @@ struct bt_notification *create_notif_from_line( goto end; error: - BT_OBJECT_PUT_REF_AND_RESET(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_object_put_ref(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_object_put_ref(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_END) { goto handle_state; } @@ -706,22 +718,22 @@ enum bt_notification_iterator_status dmesg_notif_iter_next_one( 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; } @@ -730,10 +742,10 @@ enum bt_notification_iterator_status dmesg_notif_iter_next_one( 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; @@ -745,54 +757,54 @@ enum bt_notification_iterator_status dmesg_notif_iter_next_one( } } - 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_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); + *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; + *msg = bt_message_packet_end_create( + dmesg_msg_iter->pc_msg_iter, dmesg_comp->packet); + 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: @@ -800,40 +812,45 @@ 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;