* SOFTWARE.
*/
-#include <babeltrace/plugin/plugin-dev.h>
-#include <babeltrace/graph/component.h>
-#include <babeltrace/graph/private-component.h>
-#include <babeltrace/graph/component-sink.h>
-#include <babeltrace/graph/port.h>
-#include <babeltrace/graph/private-port.h>
-#include <babeltrace/graph/connection.h>
-#include <babeltrace/graph/private-connection.h>
-#include <babeltrace/graph/notification.h>
-#include <babeltrace/graph/notification-iterator.h>
-#include <babeltrace/graph/notification-event.h>
+#include <babeltrace/babeltrace.h>
#include <babeltrace/values.h>
#include <babeltrace/compiler-internal.h>
#include <babeltrace/common-internal.h>
#include <stdio.h>
#include <stdbool.h>
#include <glib.h>
-#include <assert.h>
+#include <babeltrace/assert-internal.h>
#include "pretty.h"
+GQuark stream_packet_context_quarks[STREAM_PACKET_CONTEXT_QUARKS_LEN];
+
static
const char *plugin_options[] = {
"color",
- "output-path",
- "debug-info-dir",
- "debug-info-target-prefix",
- "debug-info-full-path",
+ "path",
"no-delta",
"clock-cycles",
"clock-seconds",
void destroy_pretty_data(struct pretty_component *pretty)
{
bt_put(pretty->input_iterator);
- (void) g_string_free(pretty->string, TRUE);
+
+ if (pretty->string) {
+ (void) g_string_free(pretty->string, TRUE);
+ }
+
+ if (pretty->tmp_string) {
+ (void) g_string_free(pretty->tmp_string, TRUE);
+ }
+
if (pretty->out != stdout) {
int ret;
}
}
g_free(pretty->options.output_path);
- g_free(pretty->options.debug_info_dir);
- g_free(pretty->options.debug_info_target_prefix);
g_free(pretty);
}
if (!pretty->string) {
goto error;
}
+ pretty->tmp_string = g_string_new("");
+ if (!pretty->tmp_string) {
+ goto error;
+ }
end:
return pretty;
{
enum bt_component_status ret = BT_COMPONENT_STATUS_OK;
- if (!pretty) {
- ret = BT_COMPONENT_STATUS_ERROR;
- goto end;
- }
+ BT_ASSERT(pretty);
switch (bt_notification_get_type(notification)) {
- case BT_NOTIFICATION_TYPE_PACKET_BEGIN:
- break;
- case BT_NOTIFICATION_TYPE_PACKET_END:
- break;
case BT_NOTIFICATION_TYPE_EVENT:
- {
- struct bt_ctf_event *event = bt_notification_event_get_event(
- notification);
-
- if (!event) {
- ret = BT_COMPONENT_STATUS_ERROR;
- goto end;
- }
- ret = pretty_print_event(pretty, event);
- bt_put(event);
- if (ret != BT_COMPONENT_STATUS_OK) {
- goto end;
- }
+ ret = pretty_print_event(pretty, notification);
break;
- }
- case BT_NOTIFICATION_TYPE_STREAM_END:
+ case BT_NOTIFICATION_TYPE_INACTIVITY:
+ fprintf(stderr, "Inactivity notification\n");
+ break;
+ case BT_NOTIFICATION_TYPE_DISCARDED_PACKETS:
+ case BT_NOTIFICATION_TYPE_DISCARDED_EVENTS:
+ ret = pretty_print_discarded_elements(pretty, notification);
break;
default:
- puts("Unhandled notification type");
+ break;
}
-end:
+
return ret;
}
struct bt_private_port *self_port,
struct bt_port *other_port)
{
+ enum bt_connection_status conn_status;
struct bt_private_connection *connection;
struct pretty_component *pretty;
pretty = bt_private_component_get_user_data(component);
- assert(pretty);
- assert(!pretty->input_iterator);
+ BT_ASSERT(pretty);
+ BT_ASSERT(!pretty->input_iterator);
connection = bt_private_port_get_private_connection(self_port);
- assert(connection);
- pretty->input_iterator =
- bt_private_connection_create_notification_iterator(connection);
-
- if (!pretty->input_iterator) {
+ BT_ASSERT(connection);
+ conn_status = bt_private_connection_create_notification_iterator(
+ connection, &pretty->input_iterator);
+ if (conn_status != BT_CONNECTION_STATUS_OK) {
pretty->error = true;
}
it_ret = bt_notification_iterator_next(it);
switch (it_ret) {
- case BT_NOTIFICATION_ITERATOR_STATUS_ERROR:
- ret = BT_COMPONENT_STATUS_ERROR;
- goto end;
case BT_NOTIFICATION_ITERATOR_STATUS_END:
ret = BT_COMPONENT_STATUS_END;
BT_PUT(pretty->input_iterator);
goto end;
- default:
+ case BT_NOTIFICATION_ITERATOR_STATUS_AGAIN:
+ ret = BT_COMPONENT_STATUS_AGAIN;
+ goto end;
+ case BT_NOTIFICATION_ITERATOR_STATUS_OK:
break;
+ default:
+ ret = BT_COMPONENT_STATUS_ERROR;
+ goto end;
}
- notification = bt_notification_iterator_get_notification(it);
- assert(notification);
+ notification = bt_notification_iterator_borrow_notification(it);
+ BT_ASSERT(notification);
ret = handle_notification(pretty, notification);
- pretty->processed_first_event = true;
+
end:
- bt_put(notification);
return ret;
}
}
static
-bool check_param_exists(const char *key, struct bt_value *object, void *data)
+bt_bool check_param_exists(const char *key, struct bt_value *object, void *data)
{
struct pretty_component *pretty = data;
struct bt_value *plugin_opt_map = pretty->plugin_opt_map;
- if (!bt_value_map_get(plugin_opt_map, key)) {
+ if (!bt_value_map_has_key(plugin_opt_map, key)) {
fprintf(pretty->err,
"[warning] Parameter \"%s\" unknown to \"text.pretty\" sink component\n", key);
}
- return true;
+ return BT_TRUE;
}
static
enum bt_value_status status;
const char *str;
- value = bt_value_map_get(params, key);
+ value = bt_value_map_borrow(params, key);
if (!value) {
goto end;
}
}
*option = g_strdup(str);
end:
- bt_put(value);
return ret;
}
enum bt_component_status ret = BT_COMPONENT_STATUS_OK;
struct bt_value *value = NULL;
enum bt_value_status status;
+ bt_bool bool_val;
- value = bt_value_map_get(params, key);
+ value = bt_value_map_borrow(params, key);
if (!value) {
goto end;
}
- status = bt_value_bool_get(value, option);
+ status = bt_value_bool_get(value, &bool_val);
switch (status) {
case BT_VALUE_STATUS_OK:
break;
ret = BT_COMPONENT_STATUS_ERROR;
goto end;
}
+ *option = (bool) bool_val;
if (found) {
*found = true;
}
+
end:
- bt_put(value);
return ret;
}
struct bt_value *color_value;
const char *color;
- color_value = bt_value_map_get(params, "color");
+ color_value = bt_value_map_borrow(params, "color");
if (!color_value) {
goto end;
}
warn_wrong_color_param(pretty);
}
}
-
- bt_put(color_value);
}
- ret = apply_one_string("output-path",
- params,
- &pretty->options.output_path);
+ ret = apply_one_string("path", params, &pretty->options.output_path);
if (ret != BT_COMPONENT_STATUS_OK) {
goto end;
}
goto end;
}
- ret = apply_one_string("debug-info-dir",
- params,
- &pretty->options.debug_info_dir);
- if (ret != BT_COMPONENT_STATUS_OK) {
- goto end;
- }
-
- ret = apply_one_string("debug-info-target-prefix",
- params,
- &pretty->options.debug_info_target_prefix);
- if (ret != BT_COMPONENT_STATUS_OK) {
- goto end;
- }
-
- value = false; /* Default. */
- ret = apply_one_bool("debug-info-full-path", params, &value, NULL);
- if (ret != BT_COMPONENT_STATUS_OK) {
- goto end;
- }
- pretty->options.debug_info_full_path = value;
-
value = false; /* Default. */
ret = apply_one_bool("no-delta", params, &value, NULL);
if (ret != BT_COMPONENT_STATUS_OK) {
goto end;
}
+ ret = bt_private_component_sink_add_input_private_port(component,
+ "in", NULL, NULL);
+ if (ret != BT_COMPONENT_STATUS_OK) {
+ goto end;
+ }
+
pretty->out = stdout;
pretty->err = stderr;
}
set_use_colors(pretty);
-
ret = bt_private_component_set_user_data(component, pretty);
if (ret != BT_COMPONENT_STATUS_OK) {
goto error;
projects / babeltrace.git / blobdiff