X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=plugins%2Ftext%2Ftext.h;h=3816fb1999facb69737eef091f2d739b8d9b577d;hb=ad96d93646ede91f93d3630b7e6d655f0edf1b3b;hp=5ae994e2ca48d6215cc2c34195dc86f8f1b9bec2;hpb=af9a82ebc462fbc376143d656ca184cfd31ebdc7;p=babeltrace.git

diff --git a/plugins/text/text.h b/plugins/text/text.h
index 5ae994e2..3816fb19 100644
--- a/plugins/text/text.h
+++ b/plugins/text/text.h
@@ -29,47 +29,66 @@
 
 #include <stdbool.h>
 #include <babeltrace/babeltrace-internal.h>
-#include <babeltrace/plugin/component.h>
+#include <babeltrace/component/component.h>
 
-enum loglevel {
-        LOGLEVEL_EMERG                  = 0,
-        LOGLEVEL_ALERT                  = 1,
-        LOGLEVEL_CRIT                   = 2,
-        LOGLEVEL_ERR                    = 3,
-        LOGLEVEL_WARNING                = 4,
-        LOGLEVEL_NOTICE                 = 5,
-        LOGLEVEL_INFO                   = 6,
-        LOGLEVEL_DEBUG_SYSTEM           = 7,
-        LOGLEVEL_DEBUG_PROGRAM          = 8,
-        LOGLEVEL_DEBUG_PROCESS          = 9,
-        LOGLEVEL_DEBUG_MODULE           = 10,
-        LOGLEVEL_DEBUG_UNIT             = 11,
-        LOGLEVEL_DEBUG_FUNCTION         = 12,
-        LOGLEVEL_DEBUG_LINE             = 13,
-        LOGLEVEL_DEBUG                  = 14,
+enum text_default {
+	TEXT_DEFAULT_UNSET,
+	TEXT_DEFAULT_SHOW,
+	TEXT_DEFAULT_HIDE,
+};
+
+enum text_color_option {
+	TEXT_COLOR_OPT_NEVER,
+	TEXT_COLOR_OPT_AUTO,
+	TEXT_COLOR_OPT_ALWAYS,
 };
 
 struct text_options {
-	bool print_scope_field_names : 1;
-	bool print_header_field_names : 1;
-	bool print_context_field_names : 1;
-	bool print_payload_field_names : 1;
-	bool print_delta_field : 1;
-	bool print_loglevel_field : 1;
-	bool print_trace_field : 1;
-	bool print_trace_domain_field : 1;
-	bool print_trace_procname_field : 1;
-	bool print_trace_vpid_field : 1;
-	bool print_trace_hostname_field : 1;
-	bool print_timestamp_cycles : 1;
-	bool no_size_limit : 1;
+	char *output_path;
+	char *debug_info_dir;
+	char *debug_info_target_prefix;
+
+	enum text_default name_default;
+	enum text_default field_default;
+
+	bool print_scope_field_names;
+	bool print_header_field_names;
+	bool print_context_field_names;
+	bool print_payload_field_names;
+
+	bool print_delta_field;
+	bool print_loglevel_field;
+	bool print_emf_field;
+	bool print_trace_field;
+	bool print_trace_domain_field;
+	bool print_trace_procname_field;
+	bool print_trace_vpid_field;
+	bool print_trace_hostname_field;
+
+	bool print_timestamp_cycles;
+	bool clock_seconds;
+	bool clock_date;
+	bool clock_gmt;
+	bool debug_info_full_path;
+
+	enum text_color_option color;
 };
 
 struct text_component {
 	struct text_options options;
 	FILE *out, *err;
-	bool processed_first_event;
+	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;
 };
 
 BT_HIDDEN