X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=plugins%2Ftext%2Ftext.h;h=956527607b1ca6819e81f7859c39084a7590ead0;hb=b2e0c9076135f47110af2d96dfaee397c597bc90;hp=103dc07977d5be48e89d9a0f7b9494c973cd0c9e;hpb=c3c30b08de95f06de6ad2f12001bede5da3f7674;p=babeltrace.git

diff --git a/plugins/text/text.h b/plugins/text/text.h
index 103dc079..95652760 100644
--- a/plugins/text/text.h
+++ b/plugins/text/text.h
@@ -29,7 +29,7 @@
 
 #include <stdbool.h>
 #include <babeltrace/babeltrace-internal.h>
-#include <babeltrace/plugin/component.h>
+#include <babeltrace/graph/component.h>
 
 enum text_default {
 	TEXT_DEFAULT_UNSET,
@@ -37,6 +37,12 @@ enum text_default {
 	TEXT_DEFAULT_HIDE,
 };
 
+enum text_color_option {
+	TEXT_COLOR_OPT_NEVER,
+	TEXT_COLOR_OPT_AUTO,
+	TEXT_COLOR_OPT_ALWAYS,
+};
+
 struct text_options {
 	char *output_path;
 	char *debug_info_dir;
@@ -53,7 +59,6 @@ struct text_options {
 	bool print_delta_field;
 	bool print_loglevel_field;
 	bool print_emf_field;
-	bool print_callsite_field;
 	bool print_trace_field;
 	bool print_trace_domain_field;
 	bool print_trace_procname_field;
@@ -65,19 +70,40 @@ struct text_options {
 	bool clock_date;
 	bool clock_gmt;
 	bool debug_info_full_path;
+	enum text_color_option color;
+	bool verbose;
 };
 
 struct text_component {
 	struct text_options options;
+	struct bt_notification_iterator *input_iterator;
 	FILE *out, *err;
-	bool processed_first_event;
-	uint64_t last_real_timestamp;
+	bool processed_first_event; /* Should be per-iterator. */
 	int depth;	/* nesting, used for tabulation alignment. */
 	bool start_line;
 	GString *string;
 	struct bt_value *plugin_opt_map;	/* Temporary parameter map. */
+	bool use_colors;
+
+	uint64_t last_cycles_timestamp;
+	uint64_t delta_cycles;
+
+	uint64_t last_real_timestamp;
+	uint64_t delta_real_timestamp;
+};
+
+enum stream_packet_context_quarks_enum {
+	Q_TIMESTAMP_BEGIN,
+	Q_TIMESTAMP_END,
+	Q_EVENTS_DISCARDED,
+	Q_CONTENT_SIZE,
+	Q_PACKET_SIZE,
+	Q_PACKET_SEQ_NUM,
+	STREAM_PACKET_CONTEXT_QUARKS_LEN, /* Always the last one of this enum. */
 };
 
+GQuark stream_packet_context_quarks[STREAM_PACKET_CONTEXT_QUARKS_LEN];
+
 BT_HIDDEN
 enum bt_component_status text_print_event(struct text_component *text,
 		struct bt_ctf_event *event);