X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fplugins%2Ftext%2Fdmesg%2Fdmesg.c;h=d52ddb2181d867affa702ea4158f43bdf0d43382;hb=1353b066072e6c389ff35853bac83f65597e7a6a;hp=e8317d47a50bc5e3a29409f388e6b7f9e3230a1d;hpb=d9c39b0a4ad9517178899334c0ca89fd20901609;p=babeltrace.git diff --git a/src/plugins/text/dmesg/dmesg.c b/src/plugins/text/dmesg/dmesg.c index e8317d47..d52ddb21 100644 --- a/src/plugins/text/dmesg/dmesg.c +++ b/src/plugins/text/dmesg/dmesg.c @@ -1,24 +1,8 @@ /* + * SPDX-License-Identifier: MIT + * * Copyright 2010-2011 EfficiOS Inc. and Linux Foundation * 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 - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. */ #define BT_COMP_LOG_SELF_COMP (dmesg_comp->self_comp) @@ -26,6 +10,8 @@ #define BT_LOG_TAG "PLUGIN/SRC.TEXT.DMESG" #include "logging/comp-logging.h" +#include "dmesg.h" + #include #include #include @@ -36,6 +22,7 @@ #include "compat/utc.h" #include "compat/stdio.h" #include +#include "plugins/common/param-validation/param-validation.h" #define NSEC_PER_USEC 1000UL #define NSEC_PER_MSEC 1000000UL @@ -46,7 +33,10 @@ struct dmesg_component; struct dmesg_msg_iter { struct dmesg_component *dmesg_comp; - bt_self_message_iterator *pc_msg_iter; /* Weak */ + + /* Weak */ + bt_self_message_iterator *self_msg_iter; + char *linebuf; size_t linebuf_len; FILE *fp; @@ -86,25 +76,28 @@ bt_field_class *create_event_payload_fc(struct dmesg_component *dmesg_comp, { bt_field_class *root_fc = NULL; bt_field_class *fc = NULL; - int ret; + bt_field_class_structure_append_member_status append_member_status; root_fc = bt_field_class_structure_create(trace_class); if (!root_fc) { - BT_COMP_LOGE_STR("Cannot create an empty structure field class object."); + BT_COMP_LOGE_APPEND_CAUSE(dmesg_comp->self_comp, + "Cannot create an empty structure field class object."); goto error; } fc = bt_field_class_string_create(trace_class); if (!fc) { - BT_COMP_LOGE_STR("Cannot create a string field class object."); + BT_COMP_LOGE_APPEND_CAUSE(dmesg_comp->self_comp, + "Cannot create a string field class object."); goto error; } - ret = bt_field_class_structure_append_member(root_fc, + append_member_status = bt_field_class_structure_append_member(root_fc, "str", fc); - if (ret) { - BT_COMP_LOGE("Cannot add `str` member to structure field class: " - "ret=%d", ret); + if (append_member_status != BT_FIELD_CLASS_STRUCTURE_APPEND_MEMBER_STATUS_OK) { + BT_COMP_LOGE_APPEND_CAUSE(dmesg_comp->self_comp, + "Cannot add `str` member to structure field class: ret=%d", + append_member_status); goto error; } @@ -126,14 +119,16 @@ int create_meta(struct dmesg_component *dmesg_comp, bool has_ts) dmesg_comp->trace_class = bt_trace_class_create(dmesg_comp->self_comp); if (!dmesg_comp->trace_class) { - BT_COMP_LOGE_STR("Cannot create an empty trace class object."); + BT_COMP_LOGE_APPEND_CAUSE(dmesg_comp->self_comp, + "Cannot create an empty trace class object."); goto error; } dmesg_comp->stream_class = bt_stream_class_create( dmesg_comp->trace_class); if (!dmesg_comp->stream_class) { - BT_COMP_LOGE_STR("Cannot create a stream class object."); + BT_COMP_LOGE_APPEND_CAUSE(dmesg_comp->self_comp, + "Cannot create a stream class object."); goto error; } @@ -141,7 +136,8 @@ int create_meta(struct dmesg_component *dmesg_comp, bool has_ts) dmesg_comp->clock_class = bt_clock_class_create( dmesg_comp->self_comp); if (!dmesg_comp->clock_class) { - BT_COMP_LOGE_STR("Cannot create clock class."); + BT_COMP_LOGE_APPEND_CAUSE(dmesg_comp->self_comp, + "Cannot create clock class."); goto error; } @@ -155,7 +151,8 @@ int create_meta(struct dmesg_component *dmesg_comp, bool has_ts) ret = bt_stream_class_set_default_clock_class( dmesg_comp->stream_class, dmesg_comp->clock_class); if (ret) { - BT_COMP_LOGE_STR("Cannot set stream class's default clock class."); + BT_COMP_LOGE_APPEND_CAUSE(dmesg_comp->self_comp, + "Cannot set stream class's default clock class."); goto error; } } @@ -163,25 +160,29 @@ int create_meta(struct dmesg_component *dmesg_comp, bool has_ts) dmesg_comp->event_class = bt_event_class_create( dmesg_comp->stream_class); if (!dmesg_comp->event_class) { - BT_COMP_LOGE_STR("Cannot create an event class object."); + BT_COMP_LOGE_APPEND_CAUSE(dmesg_comp->self_comp, + "Cannot create an event class object."); goto error; } ret = bt_event_class_set_name(dmesg_comp->event_class, "string"); if (ret) { - BT_COMP_LOGE_STR("Cannot set event class's name."); + BT_COMP_LOGE_APPEND_CAUSE(dmesg_comp->self_comp, + "Cannot set event class's name."); goto error; } fc = create_event_payload_fc(dmesg_comp, dmesg_comp->trace_class); if (!fc) { - BT_COMP_LOGE_STR("Cannot create event payload field class."); + BT_COMP_LOGE_APPEND_CAUSE(dmesg_comp->self_comp, + "Cannot create event payload field class."); goto error; } ret = bt_event_class_set_payload_field_class(dmesg_comp->event_class, fc); if (ret) { - BT_COMP_LOGE_STR("Cannot set event class's event payload field class."); + BT_COMP_LOGE_APPEND_CAUSE(dmesg_comp->self_comp, + "Cannot set event class's event payload field class."); goto error; } @@ -196,57 +197,56 @@ end: } static -int handle_params(struct dmesg_component *dmesg_comp, +struct bt_param_validation_map_value_entry_descr dmesg_params[] = { + { "no-extract-timestamp", BT_PARAM_VALIDATION_MAP_VALUE_ENTRY_OPTIONAL, { .type = BT_VALUE_TYPE_BOOL } }, + { "path", BT_PARAM_VALIDATION_MAP_VALUE_ENTRY_OPTIONAL, { .type = BT_VALUE_TYPE_STRING } }, + BT_PARAM_VALIDATION_MAP_VALUE_ENTRY_END +}; + +static +bt_component_class_initialize_method_status handle_params( + struct dmesg_component *dmesg_comp, const bt_value *params) { const bt_value *no_timestamp = NULL; const bt_value *path = NULL; - const char *path_str; - int ret = 0; + bt_component_class_initialize_method_status status; + enum bt_param_validation_status validation_status; + gchar *validate_error = NULL; + + validation_status = bt_param_validation_validate(params, + dmesg_params, &validate_error); + if (validation_status == BT_PARAM_VALIDATION_STATUS_MEMORY_ERROR) { + status = BT_COMPONENT_CLASS_INITIALIZE_METHOD_STATUS_MEMORY_ERROR; + goto end; + } else if (validation_status == BT_PARAM_VALIDATION_STATUS_VALIDATION_ERROR) { + status = BT_COMPONENT_CLASS_INITIALIZE_METHOD_STATUS_ERROR; + BT_COMP_LOGE_APPEND_CAUSE(dmesg_comp->self_comp, + "%s", validate_error); + goto end; + } no_timestamp = bt_value_map_borrow_entry_value_const(params, "no-extract-timestamp"); if (no_timestamp) { - if (!bt_value_is_bool(no_timestamp)) { - BT_COMP_LOGE("Expecting a boolean value for the `no-extract-timestamp` parameter: " - "type=%s", - bt_common_value_type_string( - bt_value_get_type(no_timestamp))); - goto error; - } - dmesg_comp->params.no_timestamp = bt_value_bool_get(no_timestamp); } path = bt_value_map_borrow_entry_value_const(params, "path"); if (path) { - if (dmesg_comp->params.read_from_stdin) { - BT_COMP_LOGE_STR("Cannot specify both `read-from-stdin` and `path` parameters."); - goto error; - } + const char *path_str = bt_value_string_get(path); - if (!bt_value_is_string(path)) { - BT_COMP_LOGE("Expecting a string value for the `path` parameter: " - "type=%s", - bt_common_value_type_string( - bt_value_get_type(path))); - goto error; - } - - path_str = bt_value_string_get(path); g_string_assign(dmesg_comp->params.path, path_str); } else { dmesg_comp->params.read_from_stdin = true; } - goto end; - -error: - ret = -1; - + status = BT_COMPONENT_CLASS_INITIALIZE_METHOD_STATUS_OK; end: - return ret; + g_free(validate_error); + + return status; } static @@ -258,7 +258,8 @@ int create_stream_and_trace(struct dmesg_component *dmesg_comp) dmesg_comp->trace = bt_trace_create(dmesg_comp->trace_class); if (!dmesg_comp->trace) { - BT_COMP_LOGE_STR("Cannot create trace object."); + BT_COMP_LOGE_APPEND_CAUSE(dmesg_comp->self_comp, + "Cannot create trace object."); goto error; } @@ -277,7 +278,8 @@ int create_stream_and_trace(struct dmesg_component *dmesg_comp) if (trace_name) { ret = bt_trace_set_name(dmesg_comp->trace, trace_name); if (ret) { - BT_COMP_LOGE("Cannot set trace's name: name=\"%s\"", + BT_COMP_LOGE_APPEND_CAUSE(dmesg_comp->self_comp, + "Cannot set trace's name: name=\"%s\"", trace_name); goto error; } @@ -286,7 +288,8 @@ int create_stream_and_trace(struct dmesg_component *dmesg_comp) dmesg_comp->stream = bt_stream_create(dmesg_comp->stream_class, dmesg_comp->trace); if (!dmesg_comp->stream) { - BT_COMP_LOGE_STR("Cannot create stream object."); + BT_COMP_LOGE_APPEND_CAUSE(dmesg_comp->self_comp, + "Cannot create stream object."); goto error; } @@ -313,15 +316,17 @@ int try_create_meta_stream(struct dmesg_component *dmesg_comp, bool has_ts) ret = create_meta(dmesg_comp, has_ts); if (ret) { - BT_COMP_LOGE("Cannot create metadata objects: dmesg-comp-addr=%p", + BT_COMP_LOGE_APPEND_CAUSE(dmesg_comp->self_comp, + "Cannot create metadata objects: dmesg-comp-addr=%p", dmesg_comp); goto error; } ret = create_stream_and_trace(dmesg_comp); if (ret) { - BT_COMP_LOGE("Cannot create stream object: " - "dmesg-comp-addr=%p", dmesg_comp); + BT_COMP_LOGE_APPEND_CAUSE(dmesg_comp->self_comp, + "Cannot create stream object: dmesg-comp-addr=%p", + dmesg_comp); goto error; } @@ -354,50 +359,29 @@ void destroy_dmesg_component(struct dmesg_component *dmesg_comp) g_free(dmesg_comp); } -static -bt_component_class_init_method_status create_port( - bt_self_component_source *self_comp) -{ - bt_component_class_init_method_status status; - bt_self_component_add_port_status add_port_status; - - add_port_status = bt_self_component_source_add_output_port(self_comp, - "out", NULL, NULL); - switch (add_port_status) { - case BT_SELF_COMPONENT_ADD_PORT_STATUS_OK: - status = BT_COMPONENT_CLASS_INIT_METHOD_STATUS_OK; - break; - case BT_SELF_COMPONENT_ADD_PORT_STATUS_ERROR: - status = BT_COMPONENT_CLASS_INIT_METHOD_STATUS_ERROR; - break; - case BT_SELF_COMPONENT_ADD_PORT_STATUS_MEMORY_ERROR: - status = BT_COMPONENT_CLASS_INIT_METHOD_STATUS_MEMORY_ERROR; - break; - default: - abort(); - } - - return status; -} - -BT_HIDDEN -bt_component_class_init_method_status dmesg_init( +bt_component_class_initialize_method_status dmesg_init( bt_self_component_source *self_comp_src, - bt_value *params, void *init_method_data) + bt_self_component_source_configuration *config, + const bt_value *params, void *init_method_data) { - int ret = 0; struct dmesg_component *dmesg_comp = g_new0(struct dmesg_component, 1); - bt_component_class_init_method_status status = - BT_COMPONENT_CLASS_INIT_METHOD_STATUS_OK; + bt_component_class_initialize_method_status status; bt_self_component *self_comp = bt_self_component_source_as_self_component(self_comp_src); const bt_component *comp = bt_self_component_as_component(self_comp); bt_logging_level log_level = bt_component_get_logging_level(comp); + bt_self_component_add_port_status add_port_status; if (!dmesg_comp) { - /* Implicit log level is not available here */ + /* + * Don't use BT_COMP_LOGE_APPEND_CAUSE, as `dmesg_comp` is not + * initialized. + */ BT_COMP_LOG_CUR_LVL(BT_LOG_ERROR, log_level, self_comp, "Failed to allocate one dmesg component structure."); + BT_CURRENT_THREAD_ERROR_APPEND_CAUSE_FROM_COMPONENT(self_comp, + "Failed to allocate one dmesg component structure."); + status = BT_COMPONENT_CLASS_INITIALIZE_METHOD_STATUS_MEMORY_ERROR; goto error; } @@ -406,47 +390,52 @@ bt_component_class_init_method_status dmesg_init( dmesg_comp->self_comp_src = self_comp_src; dmesg_comp->params.path = g_string_new(NULL); if (!dmesg_comp->params.path) { - BT_COMP_LOGE_STR("Failed to allocate a GString."); + BT_COMP_LOGE_APPEND_CAUSE(self_comp, "Failed to allocate a GString."); + status = BT_COMPONENT_CLASS_INITIALIZE_METHOD_STATUS_MEMORY_ERROR; goto error; } - ret = handle_params(dmesg_comp, params); - if (ret) { - BT_COMP_LOGE("Invalid parameters: comp-addr=%p", self_comp); + status = handle_params(dmesg_comp, params); + if (status != BT_COMPONENT_CLASS_INITIALIZE_METHOD_STATUS_OK) { + BT_COMP_LOGE_APPEND_CAUSE(self_comp, + "Invalid parameters: comp-addr=%p", self_comp); + status = BT_COMPONENT_CLASS_INITIALIZE_METHOD_STATUS_ERROR; goto error; } if (!dmesg_comp->params.read_from_stdin && !g_file_test(dmesg_comp->params.path->str, G_FILE_TEST_IS_REGULAR)) { - BT_COMP_LOGE("Input path is not a regular file: " + BT_COMP_LOGE_APPEND_CAUSE(self_comp, + "Input path is not a regular file: " "comp-addr=%p, path=\"%s\"", self_comp, dmesg_comp->params.path->str); + status = BT_COMPONENT_CLASS_INITIALIZE_METHOD_STATUS_ERROR; goto error; } - status = create_port(self_comp_src); - if (status != BT_COMPONENT_CLASS_INIT_METHOD_STATUS_OK) { + add_port_status = bt_self_component_source_add_output_port( + self_comp_src, "out", NULL, NULL); + if (add_port_status != BT_SELF_COMPONENT_ADD_PORT_STATUS_OK) { + BT_COMP_LOGE_APPEND_CAUSE(self_comp, "Failed to add output port."); + status = (int) add_port_status; goto error; } bt_self_component_set_data(self_comp, dmesg_comp); BT_COMP_LOGI_STR("Component initialized."); + + status = BT_COMPONENT_CLASS_INITIALIZE_METHOD_STATUS_OK; goto end; error: destroy_dmesg_component(dmesg_comp); bt_self_component_set_data(self_comp, NULL); - if (status >= 0) { - status = BT_COMPONENT_CLASS_INIT_METHOD_STATUS_ERROR; - } - end: return status; } -BT_HIDDEN void dmesg_finalize(bt_self_component_source *self_comp) { destroy_dmesg_component(bt_self_component_get_data( @@ -509,7 +498,7 @@ bt_message *create_init_event_msg_from_line( if (has_timestamp) { /* Set new start for the message portion of the line */ *new_start = strchr(line, ']'); - BT_ASSERT(*new_start); + BT_ASSERT_DBG(*new_start); (*new_start)++; if ((*new_start)[0] == ' ') { @@ -531,21 +520,22 @@ skip_ts: if (dmesg_comp->clock_class) { msg = bt_message_event_create_with_default_clock_snapshot( - msg_iter->pc_msg_iter, + msg_iter->self_msg_iter, dmesg_comp->event_class, dmesg_comp->stream, ts); msg_iter->last_clock_value = ts; } else { - msg = bt_message_event_create(msg_iter->pc_msg_iter, + msg = bt_message_event_create(msg_iter->self_msg_iter, dmesg_comp->event_class, dmesg_comp->stream); } if (!msg) { - BT_COMP_LOGE_STR("Cannot create event message."); + BT_COMP_LOGE_APPEND_CAUSE(dmesg_comp->self_comp, + "Cannot create event message."); goto error; } event = bt_message_event_borrow_event(msg); - BT_ASSERT(event); + BT_ASSERT_DBG(event); goto end; error: @@ -565,11 +555,12 @@ int fill_event_payload_from_line(struct dmesg_component *dmesg_comp, int ret; ep_field = bt_event_borrow_payload_field(event); - BT_ASSERT(ep_field); + BT_ASSERT_DBG(ep_field); str_field = bt_field_structure_borrow_member_field_by_index( ep_field, 0); if (!str_field) { - BT_COMP_LOGE_STR("Cannot borrow `timestamp` field from event payload structure field."); + BT_COMP_LOGE_APPEND_CAUSE(dmesg_comp->self_comp, + "Cannot borrow `timestamp` field from event payload structure field."); goto error; } @@ -582,8 +573,8 @@ int fill_event_payload_from_line(struct dmesg_component *dmesg_comp, bt_field_string_clear(str_field); ret = bt_field_string_append_with_length(str_field, line, len); if (ret) { - BT_COMP_LOGE("Cannot append value to string field object: " - "len=%zu", len); + BT_COMP_LOGE_APPEND_CAUSE(dmesg_comp->self_comp, + "Cannot append value to string field object: len=%zu", len); goto error; } @@ -609,16 +600,17 @@ bt_message *create_msg_from_line( msg = create_init_event_msg_from_line(dmesg_msg_iter, line, &new_start); if (!msg) { - BT_COMP_LOGE_STR("Cannot create and initialize event message from line."); + BT_COMP_LOGE_APPEND_CAUSE(dmesg_comp->self_comp, + "Cannot create and initialize event message from line."); goto error; } event = bt_message_event_borrow_event(msg); - BT_ASSERT(event); + BT_ASSERT_DBG(event); ret = fill_event_payload_from_line(dmesg_comp, new_start, event); if (ret) { - BT_COMP_LOGE("Cannot fill event payload field from line: " - "ret=%d", ret); + BT_COMP_LOGE_APPEND_CAUSE(dmesg_comp->self_comp, + "Cannot fill event payload field from line: ret=%d", ret); goto error; } @@ -634,15 +626,18 @@ end: static void destroy_dmesg_msg_iter(struct dmesg_msg_iter *dmesg_msg_iter) { - struct dmesg_component *dmesg_comp = dmesg_msg_iter->dmesg_comp; + struct dmesg_component *dmesg_comp; if (!dmesg_msg_iter) { return; } + dmesg_comp = dmesg_msg_iter->dmesg_comp; + if (dmesg_msg_iter->fp && dmesg_msg_iter->fp != stdin) { if (fclose(dmesg_msg_iter->fp)) { - BT_COMP_LOGE_ERRNO("Cannot close input file", "."); + BT_COMP_LOGE_APPEND_CAUSE_ERRNO(dmesg_comp->self_comp, + "Cannot close input file", "."); } } @@ -653,55 +648,56 @@ void destroy_dmesg_msg_iter(struct dmesg_msg_iter *dmesg_msg_iter) -BT_HIDDEN -bt_component_class_message_iterator_init_method_status dmesg_msg_iter_init( +bt_message_iterator_class_initialize_method_status dmesg_msg_iter_init( bt_self_message_iterator *self_msg_iter, - bt_self_component_source *self_comp, + bt_self_message_iterator_configuration *config, bt_self_component_port_output *self_port) { - struct dmesg_component *dmesg_comp = bt_self_component_get_data( - bt_self_component_source_as_self_component(self_comp)); + bt_self_component *self_comp = + bt_self_message_iterator_borrow_component(self_msg_iter); + struct dmesg_component *dmesg_comp = bt_self_component_get_data(self_comp); struct dmesg_msg_iter *dmesg_msg_iter = g_new0(struct dmesg_msg_iter, 1); - bt_component_class_message_iterator_init_method_status status = - BT_COMPONENT_CLASS_MESSAGE_ITERATOR_INIT_METHOD_STATUS_OK; + bt_message_iterator_class_initialize_method_status status; if (!dmesg_msg_iter) { - BT_COMP_LOGE_STR("Failed to allocate on dmesg message iterator structure."); + BT_COMP_LOGE_APPEND_CAUSE(self_comp, + "Failed to allocate on dmesg message iterator structure."); + status = BT_MESSAGE_ITERATOR_CLASS_INITIALIZE_METHOD_STATUS_MEMORY_ERROR; goto error; } BT_ASSERT(dmesg_comp); dmesg_msg_iter->dmesg_comp = dmesg_comp; - dmesg_msg_iter->pc_msg_iter = self_msg_iter; + dmesg_msg_iter->self_msg_iter = self_msg_iter; if (dmesg_comp->params.read_from_stdin) { dmesg_msg_iter->fp = stdin; } else { dmesg_msg_iter->fp = fopen(dmesg_comp->params.path->str, "r"); if (!dmesg_msg_iter->fp) { - BT_COMP_LOGE_ERRNO("Cannot open input file in read mode", ": path=\"%s\"", + BT_COMP_LOGE_APPEND_CAUSE_ERRNO(self_comp, + "Cannot open input file in read mode", ": path=\"%s\"", dmesg_comp->params.path->str); + status = BT_MESSAGE_ITERATOR_CLASS_INITIALIZE_METHOD_STATUS_ERROR; goto error; } } bt_self_message_iterator_set_data(self_msg_iter, dmesg_msg_iter); + + status = BT_MESSAGE_ITERATOR_CLASS_INITIALIZE_METHOD_STATUS_OK; goto end; error: destroy_dmesg_msg_iter(dmesg_msg_iter); bt_self_message_iterator_set_data(self_msg_iter, NULL); - if (status >= 0) { - status = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_INIT_METHOD_STATUS_ERROR; - } end: return status; } -BT_HIDDEN void dmesg_msg_iter_finalize( bt_self_message_iterator *priv_msg_iter) { @@ -710,21 +706,20 @@ void dmesg_msg_iter_finalize( } static -bt_component_class_message_iterator_next_method_status dmesg_msg_iter_next_one( +bt_message_iterator_class_next_method_status dmesg_msg_iter_next_one( struct dmesg_msg_iter *dmesg_msg_iter, bt_message **msg) { ssize_t len; struct dmesg_component *dmesg_comp; - bt_component_class_message_iterator_next_method_status status = - BT_COMPONENT_CLASS_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_OK; + bt_message_iterator_class_next_method_status status; - BT_ASSERT(dmesg_msg_iter); + BT_ASSERT_DBG(dmesg_msg_iter); dmesg_comp = dmesg_msg_iter->dmesg_comp; - BT_ASSERT(dmesg_comp); + BT_ASSERT_DBG(dmesg_comp); if (dmesg_msg_iter->state == STATE_DONE) { - status = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_END; + status = BT_MESSAGE_ITERATOR_CLASS_NEXT_METHOD_STATUS_END; goto end; } @@ -741,13 +736,15 @@ bt_component_class_message_iterator_next_method_status dmesg_msg_iter_next_one( &dmesg_msg_iter->linebuf_len, dmesg_msg_iter->fp); if (len < 0) { if (errno == EINVAL) { - status = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_ERROR; + status = BT_MESSAGE_ITERATOR_CLASS_NEXT_METHOD_STATUS_ERROR; + goto end; } else if (errno == ENOMEM) { - status = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_MEMORY_ERROR; + status = BT_MESSAGE_ITERATOR_CLASS_NEXT_METHOD_STATUS_MEMORY_ERROR; + goto end; } else { if (dmesg_msg_iter->state == STATE_EMIT_STREAM_BEGINNING) { /* Stream did not even begin */ - status = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_END; + status = BT_MESSAGE_ITERATOR_CLASS_NEXT_METHOD_STATUS_END; goto end; } else { /* End stream now */ @@ -756,15 +753,13 @@ bt_component_class_message_iterator_next_method_status dmesg_msg_iter_next_one( goto handle_state; } } - - goto end; } - BT_ASSERT(dmesg_msg_iter->linebuf); + BT_ASSERT_DBG(dmesg_msg_iter->linebuf); /* Ignore empty lines, once trimmed */ for (ch = dmesg_msg_iter->linebuf; *ch != '\0'; ch++) { - if (!isspace(*ch)) { + if (!isspace((unsigned char) *ch)) { only_spaces = false; break; } @@ -778,30 +773,32 @@ bt_component_class_message_iterator_next_method_status dmesg_msg_iter_next_one( 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_COMP_LOGE("Cannot create event message from line: " + BT_COMP_LOGE_APPEND_CAUSE(dmesg_comp->self_comp, + "Cannot create event message from line: " "dmesg-comp-addr=%p, line=\"%s\"", dmesg_comp, dmesg_msg_iter->linebuf); + status = BT_MESSAGE_ITERATOR_CLASS_NEXT_METHOD_STATUS_ERROR; goto end; } handle_state: - BT_ASSERT(dmesg_comp->trace); + BT_ASSERT_DBG(dmesg_comp->trace); switch (dmesg_msg_iter->state) { case STATE_EMIT_STREAM_BEGINNING: - BT_ASSERT(dmesg_msg_iter->tmp_event_msg); + BT_ASSERT_DBG(dmesg_msg_iter->tmp_event_msg); *msg = bt_message_stream_beginning_create( - dmesg_msg_iter->pc_msg_iter, dmesg_comp->stream); + dmesg_msg_iter->self_msg_iter, dmesg_comp->stream); dmesg_msg_iter->state = STATE_EMIT_EVENT; break; case STATE_EMIT_EVENT: - BT_ASSERT(dmesg_msg_iter->tmp_event_msg); + BT_ASSERT_DBG(dmesg_msg_iter->tmp_event_msg); *msg = dmesg_msg_iter->tmp_event_msg; dmesg_msg_iter->tmp_event_msg = NULL; break; case STATE_EMIT_STREAM_END: *msg = bt_message_stream_end_create( - dmesg_msg_iter->pc_msg_iter, dmesg_comp->stream); + dmesg_msg_iter->self_msg_iter, dmesg_comp->stream); dmesg_msg_iter->state = STATE_DONE; break; default: @@ -809,17 +806,20 @@ handle_state: } if (!*msg) { - BT_COMP_LOGE("Cannot create message: dmesg-comp-addr=%p", + BT_COMP_LOGE_APPEND_CAUSE(dmesg_comp->self_comp, + "Cannot create message: dmesg-comp-addr=%p", dmesg_comp); - status = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_ERROR; + status = BT_MESSAGE_ITERATOR_CLASS_NEXT_METHOD_STATUS_ERROR; + goto end; } + status = BT_MESSAGE_ITERATOR_CLASS_NEXT_METHOD_STATUS_OK; + end: return status; } -BT_HIDDEN -bt_component_class_message_iterator_next_method_status dmesg_msg_iter_next( +bt_message_iterator_class_next_method_status dmesg_msg_iter_next( bt_self_message_iterator *self_msg_iter, bt_message_array_const msgs, uint64_t capacity, uint64_t *count) @@ -827,18 +827,18 @@ bt_component_class_message_iterator_next_method_status dmesg_msg_iter_next( struct dmesg_msg_iter *dmesg_msg_iter = bt_self_message_iterator_get_data( self_msg_iter); - bt_component_class_message_iterator_next_method_status status = - BT_COMPONENT_CLASS_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_OK; + bt_message_iterator_class_next_method_status status = + BT_MESSAGE_ITERATOR_CLASS_NEXT_METHOD_STATUS_OK; uint64_t i = 0; while (i < capacity && - status == BT_COMPONENT_CLASS_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_OK) { + status == BT_MESSAGE_ITERATOR_CLASS_NEXT_METHOD_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_COMPONENT_CLASS_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_OK) { + if (status == BT_MESSAGE_ITERATOR_CLASS_NEXT_METHOD_STATUS_OK) { i++; } } @@ -857,25 +857,26 @@ bt_component_class_message_iterator_next_method_status dmesg_msg_iter_next( * message, in which case we'll return it. */ *count = i; - status = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_OK; + status = BT_MESSAGE_ITERATOR_CLASS_NEXT_METHOD_STATUS_OK; } return status; } -BT_HIDDEN -bt_bool dmesg_msg_iter_can_seek_beginning( - bt_self_message_iterator *self_msg_iter) +bt_message_iterator_class_can_seek_beginning_method_status +dmesg_msg_iter_can_seek_beginning( + bt_self_message_iterator *self_msg_iter, bt_bool *can_seek) { 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; + *can_seek = !dmesg_msg_iter->dmesg_comp->params.read_from_stdin; + + return BT_MESSAGE_ITERATOR_CLASS_CAN_SEEK_BEGINNING_METHOD_STATUS_OK; } -BT_HIDDEN -bt_component_class_message_iterator_seek_beginning_method_status +bt_message_iterator_class_seek_beginning_method_status dmesg_msg_iter_seek_beginning( bt_self_message_iterator *self_msg_iter) { @@ -887,5 +888,5 @@ dmesg_msg_iter_seek_beginning( 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_COMPONENT_CLASS_MESSAGE_ITERATOR_SEEK_BEGINNING_METHOD_STATUS_OK; + return BT_MESSAGE_ITERATOR_CLASS_SEEK_BEGINNING_METHOD_STATUS_OK; }