X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=plugins%2Ftext%2Fdmesg%2Fdmesg.c;h=9a8b5beb68180f77d50ecfcf678e89378658b2e7;hb=40f4ba76dd6f9508ca51b6220eaed57632281a07;hp=0edc2e6133dd7d0f4bcf42c705ed18ea48ea04bb;hpb=da91b29ad2964b85601e25843f1dca92f6c97406;p=babeltrace.git diff --git a/plugins/text/dmesg/dmesg.c b/plugins/text/dmesg/dmesg.c index 0edc2e61..9a8b5beb 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 @@ -45,11 +45,11 @@ 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; - struct bt_notification *tmp_event_notif; + struct bt_private_notification *tmp_event_notif; enum { STATE_EMIT_STREAM_BEGINNING, @@ -74,7 +74,6 @@ 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 @@ -96,7 +95,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); @@ -147,7 +147,8 @@ int create_meta(struct dmesg_component *dmesg_comp, bool has_ts) } } - dmesg_comp->stream_class = bt_stream_class_create(dmesg_comp->trace); + dmesg_comp->stream_class = bt_stream_class_create( + dmesg_comp->trace); if (!dmesg_comp->stream_class) { BT_LOGE_STR("Cannot create a stream class object."); goto error; @@ -209,14 +210,15 @@ 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 *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_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 +229,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 +248,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; @@ -346,24 +346,25 @@ void destroy_dmesg_component(struct dmesg_component *dmesg_comp) 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); 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."); @@ -378,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; } @@ -386,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: @@ -412,20 +417,19 @@ 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 -struct bt_notification *create_init_event_notif_from_line( +struct bt_private_notification *create_init_event_notif_from_line( struct dmesg_notif_iter *notif_iter, const char *line, const char **new_start) { struct bt_event *event; - struct bt_notification *notif = NULL; + struct bt_private_notification *notif = NULL; bool has_timestamp = false; unsigned long sec, usec, msec; unsigned int year, mon, mday, hour, min; @@ -495,19 +499,18 @@ skip_ts: goto error; } - notif = bt_notification_event_create(notif_iter->pc_notif_iter, + notif = bt_private_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); + event = bt_private_notification_event_borrow_event(notif); 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_value(event, ts); } goto end; @@ -520,7 +523,8 @@ end: } 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; @@ -529,8 +533,8 @@ int fill_event_payload_from_line(const char *line, struct bt_event *event) 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,11 +569,11 @@ end: } static -struct bt_notification *create_notif_from_line( +struct bt_private_notification *create_notif_from_line( struct dmesg_notif_iter *dmesg_notif_iter, const char *line) { struct bt_event *event = NULL; - struct bt_notification *notif = NULL; + struct bt_private_notification *notif = NULL; const char *new_start; int ret; @@ -580,7 +584,7 @@ struct bt_notification *create_notif_from_line( goto error; } - event = bt_notification_event_borrow_event(notif); + event = bt_private_notification_event_borrow_event(notif); BT_ASSERT(event); ret = fill_event_payload_from_line(new_start, event); if (ret) { @@ -617,29 +621,27 @@ void destroy_dmesg_notif_iter(struct dmesg_notif_iter *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; @@ -652,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_object_put_ref(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) + struct bt_private_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; } @@ -710,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 */ @@ -760,13 +760,13 @@ handle_state: switch (dmesg_notif_iter->state) { case STATE_EMIT_STREAM_BEGINNING: BT_ASSERT(dmesg_notif_iter->tmp_event_notif); - *notif = bt_notification_stream_begin_create( + *notif = bt_private_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); - *notif = bt_notification_packet_begin_create( + *notif = bt_private_notification_packet_begin_create( dmesg_notif_iter->pc_notif_iter, dmesg_comp->packet); dmesg_notif_iter->state = STATE_EMIT_EVENT; break; @@ -776,12 +776,12 @@ handle_state: dmesg_notif_iter->tmp_event_notif = NULL; break; case STATE_EMIT_PACKET_END: - *notif = bt_notification_packet_end_create( + *notif = bt_private_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: - *notif = bt_notification_stream_end_create( + *notif = bt_private_notification_stream_end_create( dmesg_notif_iter->pc_notif_iter, dmesg_comp->stream); dmesg_notif_iter->state = STATE_DONE; break; @@ -792,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: @@ -800,21 +800,27 @@ end: } BT_HIDDEN -enum bt_notification_iterator_status dmesg_notif_iter_next( - struct bt_private_connection_private_notification_iterator *priv_notif_iter, +enum bt_self_notification_iterator_status dmesg_notif_iter_next( + struct bt_self_notification_iterator *self_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; + 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_private_notification *priv_notif = NULL; + + status = dmesg_notif_iter_next_one(dmesg_notif_iter, + &priv_notif); + notifs[i] = bt_private_notification_as_notification( + priv_notif); + if (status == BT_SELF_NOTIFICATION_ITERATOR_STATUS_OK) { i++; } } @@ -823,17 +829,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;