X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=plugins%2Ftext%2Fdmesg%2Fdmesg.c;h=cb2414f0cacde6baf151253da45288a903d2c4d3;hb=0d72b8c329ad51d14ab4e83330b38c2c8da69dd4;hp=8cb9539cdbb9bd06d70f2f923964306f7db03d43;hpb=f0010051db62783ef057e8a6b625d6b4444671c2;p=babeltrace.git diff --git a/plugins/text/dmesg/dmesg.c b/plugins/text/dmesg/dmesg.c index 8cb9539c..cb2414f0 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 @@ -29,6 +29,7 @@ #include #include #include +#include #include #include #include @@ -44,7 +45,7 @@ struct dmesg_component; struct dmesg_notif_iter { struct dmesg_component *dmesg_comp; - struct bt_private_connection_private_notification_iterator *pc_notif_iter; /* Weak */ + struct bt_self_notification_iterator *pc_notif_iter; /* Weak */ char *linebuf; size_t linebuf_len; FILE *fp; @@ -73,120 +74,31 @@ struct dmesg_component { struct bt_stream *stream; struct bt_packet *packet; struct bt_clock_class *clock_class; - struct bt_clock_class_priority_map *cc_prio_map; }; static -struct bt_field_type *create_packet_header_ft(void) +struct bt_field_class *create_event_payload_fc(void) { - struct bt_field_type *root_ft = NULL; - struct bt_field_type *ft = NULL; + struct bt_field_class *root_fc = NULL; + struct 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(); + 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(); + 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: " - "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) -{ - 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: " + BT_LOGE("Cannot add `str` member to structure field class: " "ret=%d", ret); goto error; } @@ -194,23 +106,17 @@ struct bt_field_type *create_event_payload_ft(void) goto end; error: - BT_PUT(root_ft); + BT_OBJECT_PUT_REF_AND_RESET(root_fc); 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_object_put_ref(fc); + return root_fc; } static int create_meta(struct dmesg_component *dmesg_comp, bool has_ts) { - struct bt_field_type *ft = NULL; + struct bt_field_class *fc = NULL; const char *trace_name = NULL; gchar *basename = NULL; int ret = 0; @@ -221,18 +127,6 @@ 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 { @@ -253,71 +147,50 @@ int create_meta(struct dmesg_component *dmesg_comp, bool has_ts) } } - 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."); + 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); - 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; - } - - 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"); + 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; } - bt_put(ft); - ft = create_event_payload_ft(); - if (!ft) { - BT_LOGE_STR("Cannot create event payload field type."); - 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(); + 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; } @@ -327,7 +200,7 @@ error: ret = -1; end: - bt_put(ft); + bt_object_put_ref(fc); if (basename) { g_free(basename); @@ -337,30 +210,30 @@ end: } static -int handle_params(struct dmesg_component *dmesg_comp, struct bt_value *params) +int handle_params(struct dmesg_component *dmesg_comp, + const struct bt_value *params) { - struct bt_value *read_from_stdin = NULL; - struct bt_value *no_timestamp = NULL; - struct bt_value *path = NULL; + 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_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."); @@ -370,13 +243,12 @@ int handle_params(struct dmesg_component *dmesg_comp, struct bt_value *params) 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; @@ -387,35 +259,6 @@ int handle_params(struct dmesg_component *dmesg_comp, struct bt_value *params) error: 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) -{ - 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; } @@ -425,8 +268,7 @@ 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; @@ -438,13 +280,7 @@ int create_packet_and_stream(struct dmesg_component *dmesg_comp) 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; @@ -504,30 +340,31 @@ 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->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_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_component_status create_port(struct bt_private_component *priv_comp) +enum bt_self_component_status create_port( + struct 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, +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."); @@ -542,7 +379,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; } @@ -550,25 +387,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: @@ -576,11 +417,10 @@ end: } BT_HIDDEN -void dmesg_finalize(struct bt_private_component *priv_comp) +void dmesg_finalize(struct 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 @@ -594,8 +434,6 @@ struct bt_notification *create_init_event_notif_from_line( 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; @@ -652,7 +490,7 @@ struct bt_notification *create_init_event_notif_from_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); @@ -672,42 +510,31 @@ skip_ts: 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; - } - - ret = bt_field_integer_unsigned_set_value(ts_field, ts); - BT_ASSERT(ret == 0); + bt_event_set_default_clock_value(event, ts); } goto end; error: - BT_PUT(notif); + BT_OBJECT_PUT_REF_AND_RESET(notif); end: return notif; } static -int fill_event_payload_from_line(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; @@ -725,7 +552,7 @@ int fill_event_payload_from_line(const char *line, struct bt_event *event) 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); @@ -769,7 +596,7 @@ struct bt_notification *create_notif_from_line( goto end; error: - BT_PUT(notif); + BT_OBJECT_PUT_REF_AND_RESET(notif); end: return notif; @@ -788,35 +615,33 @@ void destroy_dmesg_notif_iter(struct dmesg_notif_iter *dmesg_notif_iter) } } - bt_put(dmesg_notif_iter->tmp_event_notif); + 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_connection_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 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; + 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; } - 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_notif_iter->pc_notif_iter = self_notif_iter; if (dmesg_comp->params.read_from_stdin) { dmesg_notif_iter->fp = stdin; @@ -829,47 +654,45 @@ enum bt_notification_iterator_status dmesg_notif_iter_init( } } - (void) bt_private_connection_private_notification_iterator_set_user_data(priv_notif_iter, + bt_self_notification_iterator_set_data(self_notif_iter, dmesg_notif_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); + bt_self_notification_iterator_set_data(self_notif_iter, NULL); if (status >= 0) { - status = BT_NOTIFICATION_ITERATOR_STATUS_ERROR; + status = BT_SELF_NOTIFICATION_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) + struct bt_self_notification_iterator *priv_notif_iter) { - destroy_dmesg_notif_iter(bt_private_connection_private_notification_iterator_get_user_data( + destroy_dmesg_notif_iter(bt_self_notification_iterator_get_data( priv_notif_iter)); } static -enum bt_notification_iterator_status dmesg_notif_iter_next_one( +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_notification_iterator_status status = - BT_NOTIFICATION_ITERATOR_STATUS_OK; + 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_NOTIFICATION_ITERATOR_STATUS_END; + status = BT_SELF_NOTIFICATION_ITERATOR_STATUS_END; goto end; } @@ -887,14 +710,14 @@ enum bt_notification_iterator_status dmesg_notif_iter_next_one( &dmesg_notif_iter->linebuf_len, dmesg_notif_iter->fp); if (len < 0) { if (errno == EINVAL) { - status = BT_NOTIFICATION_ITERATOR_STATUS_ERROR; + status = BT_SELF_NOTIFICATION_ITERATOR_STATUS_ERROR; } else if (errno == ENOMEM) { status = - BT_NOTIFICATION_ITERATOR_STATUS_NOMEM; + BT_SELF_NOTIFICATION_ITERATOR_STATUS_NOMEM; } else { if (dmesg_notif_iter->state == STATE_EMIT_STREAM_BEGINNING) { /* Stream did not even begin */ - status = BT_NOTIFICATION_ITERATOR_STATUS_END; + status = BT_SELF_NOTIFICATION_ITERATOR_STATUS_END; goto end; } else { /* End current packet now */ @@ -969,7 +792,7 @@ handle_state: if (!*notif) { BT_LOGE("Cannot create notification: dmesg-comp-addr=%p", dmesg_comp); - status = BT_NOTIFICATION_ITERATOR_STATUS_ERROR; + status = BT_SELF_NOTIFICATION_ITERATOR_STATUS_ERROR; } end: @@ -977,21 +800,26 @@ 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, +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_private_connection_private_notification_iterator_get_user_data( - priv_notif_iter); - enum bt_notification_iterator_status status = - BT_NOTIFICATION_ITERATOR_STATUS_OK; + 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_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_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++; } } @@ -1000,17 +828,17 @@ enum bt_notification_iterator_status dmesg_notif_iter_next( /* * 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 + * 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_NOTIFICATION_ITERATOR_STATUS_OK; + status = BT_SELF_NOTIFICATION_ITERATOR_STATUS_OK; } return status;