X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=plugins%2Ftext%2Fpretty%2Fpretty.h;h=4ebf54b354d72bb77e4e3ae3340b2ee8c7030789;hb=68b66a256a54d32992dfefeaad11eea88b7df234;hp=0c8b27d99ec28572292616da49b850203814a248;hpb=d9f65f09bceeaa3dca4270986b4b05347be54d00;p=babeltrace.git

diff --git a/plugins/text/pretty/pretty.h b/plugins/text/pretty/pretty.h
index 0c8b27d9..4ebf54b3 100644
--- a/plugins/text/pretty/pretty.h
+++ b/plugins/text/pretty/pretty.h
@@ -2,8 +2,6 @@
 #define BABELTRACE_PLUGIN_TEXT_PRETTY_PRETTY_H
 
 /*
- * BabelTrace - CTF Text Output Plug-in
- *
  * Copyright 2016 Jérémie Galarneau <jeremie.galarneau@efficios.com>
  *
  * Author: Jérémie Galarneau <jeremie.galarneau@efficios.com>
@@ -28,11 +26,8 @@
  */
 
 #include <stdbool.h>
-#include <babeltrace/babeltrace-internal.h>
-#include <babeltrace/graph/component.h>
-#include <babeltrace/graph/private-component.h>
-#include <babeltrace/graph/private-port.h>
-#include <babeltrace/ctf-ir/event.h>
+#include <babeltrace2/babeltrace-internal.h>
+#include <babeltrace2/babeltrace.h>
 
 enum pretty_default {
 	PRETTY_DEFAULT_UNSET,
@@ -48,8 +43,6 @@ enum pretty_color_option {
 
 struct pretty_options {
 	char *output_path;
-	char *debug_info_dir;
-	char *debug_info_target_prefix;
 
 	enum pretty_default name_default;
 	enum pretty_default field_default;
@@ -73,27 +66,28 @@ struct pretty_options {
 	bool clock_seconds;
 	bool clock_date;
 	bool clock_gmt;
-	bool debug_info_full_path;
 	enum pretty_color_option color;
 	bool verbose;
 };
 
 struct pretty_component {
 	struct pretty_options options;
-	struct bt_notification_iterator *input_iterator;
+	bt_self_component_port_input_message_iterator *iterator;
 	FILE *out, *err;
 	int depth;	/* nesting, used for tabulation alignment. */
 	bool start_line;
 	GString *string;
-	struct bt_value *plugin_opt_map;	/* Temporary parameter map. */
+	GString *tmp_string;
+	bt_value *plugin_opt_map; /* Temporary parameter map. */
 	bool use_colors;
-	bool error;
 
 	uint64_t last_cycles_timestamp;
 	uint64_t delta_cycles;
 
 	uint64_t last_real_timestamp;
 	uint64_t delta_real_timestamp;
+
+	bool negative_timestamp_warning_done;
 };
 
 enum stream_packet_context_quarks_enum {
@@ -106,28 +100,32 @@ enum stream_packet_context_quarks_enum {
 	STREAM_PACKET_CONTEXT_QUARKS_LEN, /* Always the last one of this enum. */
 };
 
+extern
 GQuark stream_packet_context_quarks[STREAM_PACKET_CONTEXT_QUARKS_LEN];
 
 BT_HIDDEN
-enum bt_component_status pretty_init(
-		struct bt_private_component *component,
-		struct bt_value *params,
+bt_self_component_status pretty_init(
+		bt_self_component_sink *component,
+		const bt_value *params,
 		void *init_method_data);
 
 BT_HIDDEN
-enum bt_component_status pretty_consume(struct bt_private_component *component);
+bt_self_component_status pretty_consume(
+		bt_self_component_sink *component);
+
+BT_HIDDEN
+bt_self_component_status pretty_graph_is_configured(
+		bt_self_component_sink *component);
 
 BT_HIDDEN
-void pretty_port_connected(
-		struct bt_private_component *component,
-		struct bt_private_port *self_port,
-		struct bt_port *other_port);
+void pretty_finalize(bt_self_component_sink *component);
 
 BT_HIDDEN
-void pretty_finalize(struct bt_private_component *component);
+int pretty_print_event(struct pretty_component *pretty,
+		const bt_message *event_msg);
 
 BT_HIDDEN
-enum bt_component_status pretty_print_event(struct pretty_component *pretty,
-		struct bt_notification *event_notif);
+int pretty_print_discarded_items(struct pretty_component *pretty,
+		const bt_message *msg);
 
 #endif /* BABELTRACE_PLUGIN_TEXT_PRETTY_PRETTY_H */