X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf-text%2Fctf-text.c;h=3ad9dfc04146053bbede4ed70e1540e65db38955;hp=83f0cf9c9ac1e8385e2ed29c2574ba0ab60a2e7e;hb=7e18eedf5333dbd6f1e0a8d873a7275dee1ed396;hpb=7d97fad984e6abfd809225a86983b12eab90b3bd

diff --git a/formats/ctf-text/ctf-text.c b/formats/ctf-text/ctf-text.c
index 83f0cf9c..3ad9dfc0 100644
--- a/formats/ctf-text/ctf-text.c
+++ b/formats/ctf-text/ctf-text.c
@@ -56,8 +56,26 @@ enum field_item {
 	ITEM_PAYLOAD,
 };
 
-struct trace_descriptor *ctf_text_open_trace(const char *collection_path,
-		const char *path, int flags,
+enum bt_loglevel {
+        BT_LOGLEVEL_EMERG                  = 0,
+        BT_LOGLEVEL_ALERT                  = 1,
+        BT_LOGLEVEL_CRIT                   = 2,
+        BT_LOGLEVEL_ERR                    = 3,
+        BT_LOGLEVEL_WARNING                = 4,
+        BT_LOGLEVEL_NOTICE                 = 5,
+        BT_LOGLEVEL_INFO                   = 6,
+        BT_LOGLEVEL_DEBUG_SYSTEM           = 7,
+        BT_LOGLEVEL_DEBUG_PROGRAM          = 8,
+        BT_LOGLEVEL_DEBUG_PROCESS          = 9,
+        BT_LOGLEVEL_DEBUG_MODULE           = 10,
+        BT_LOGLEVEL_DEBUG_UNIT             = 11,
+        BT_LOGLEVEL_DEBUG_FUNCTION         = 12,
+        BT_LOGLEVEL_DEBUG_LINE             = 13,
+        BT_LOGLEVEL_DEBUG                  = 14,
+};
+
+
+struct trace_descriptor *ctf_text_open_trace(const char *path, int flags,
 		void (*move_pos_slow)(struct ctf_stream_pos *pos, size_t offset,
 			int whence), FILE *metadata_fp);
 void ctf_text_close_trace(struct trace_descriptor *descriptor);
@@ -151,6 +169,47 @@ void set_field_names_print(struct ctf_text_stream_pos *pos, enum field_item item
 	}
 }
 
+static
+const char *print_loglevel(int value)
+{
+	switch (value) {
+	case -1:
+		return "";
+	case BT_LOGLEVEL_EMERG:
+		return "TRACE_EMERG";
+	case BT_LOGLEVEL_ALERT:
+		return "TRACE_ALERT";
+	case BT_LOGLEVEL_CRIT:
+		return "TRACE_CRIT";
+	case BT_LOGLEVEL_ERR:
+		return "TRACE_ERR";
+	case BT_LOGLEVEL_WARNING:
+		return "TRACE_WARNING";
+	case BT_LOGLEVEL_NOTICE:
+		return "TRACE_NOTICE";
+	case BT_LOGLEVEL_INFO:
+		return "TRACE_INFO";
+	case BT_LOGLEVEL_DEBUG_SYSTEM:
+		return "TRACE_DEBUG_SYSTEM";
+	case BT_LOGLEVEL_DEBUG_PROGRAM:
+		return "TRACE_DEBUG_PROGRAM";
+	case BT_LOGLEVEL_DEBUG_PROCESS:
+		return "TRACE_DEBUG_PROCESS";
+	case BT_LOGLEVEL_DEBUG_MODULE:
+		return "TRACE_DEBUG_MODULE";
+	case BT_LOGLEVEL_DEBUG_UNIT:
+		return "TRACE_DEBUG_UNIT";
+	case BT_LOGLEVEL_DEBUG_FUNCTION:
+		return "TRACE_DEBUG_FUNCTION";
+	case BT_LOGLEVEL_DEBUG_LINE:
+		return "TRACE_DEBUG_LINE";
+	case BT_LOGLEVEL_DEBUG:
+		return "TRACE_DEBUG";
+	default:
+		return "<<UNKNOWN>>";
+	}
+}
+
 static
 int ctf_text_write_event(struct stream_pos *ppos,
 			 struct ctf_stream *stream)
@@ -248,50 +307,50 @@ int ctf_text_write_event(struct stream_pos *ppos,
 		else
 			fprintf(pos->fp, " ");
 	}
-	if ((opt_trace_domain_field && !opt_all_fields) && stream_class->trace->domain[0] != '\0') {
+	if ((opt_trace_domain_field && !opt_all_fields) && stream_class->trace->env.domain[0] != '\0') {
 		set_field_names_print(pos, ITEM_HEADER);
 		if (pos->print_names) {
 			fprintf(pos->fp, "trace:domain = ");
 		}
-		fprintf(pos->fp, "%s", stream_class->trace->domain);
+		fprintf(pos->fp, "%s", stream_class->trace->env.domain);
 		if (pos->print_names)
 			fprintf(pos->fp, ", ");
 		dom_print = 1;
 	}
-	if ((opt_trace_procname_field && !opt_all_fields) && stream_class->trace->procname[0] != '\0') {
+	if ((opt_trace_procname_field && !opt_all_fields) && stream_class->trace->env.procname[0] != '\0') {
 		set_field_names_print(pos, ITEM_HEADER);
 		if (pos->print_names) {
 			fprintf(pos->fp, "trace:procname = ");
 		} else if (dom_print) {
 			fprintf(pos->fp, ":");
 		}
-		fprintf(pos->fp, "%s", stream_class->trace->procname);
+		fprintf(pos->fp, "%s", stream_class->trace->env.procname);
 		if (pos->print_names)
 			fprintf(pos->fp, ", ");
 		dom_print = 1;
 	}
-	if ((opt_trace_vpid_field && !opt_all_fields) && stream_class->trace->vpid[0] != '\0') {
+	if ((opt_trace_vpid_field && !opt_all_fields) && stream_class->trace->env.vpid != -1) {
 		set_field_names_print(pos, ITEM_HEADER);
 		if (pos->print_names) {
 			fprintf(pos->fp, "trace:vpid = ");
 		} else if (dom_print) {
 			fprintf(pos->fp, ":");
 		}
-		fprintf(pos->fp, "%s", stream_class->trace->vpid);
+		fprintf(pos->fp, "%d", stream_class->trace->env.vpid);
 		if (pos->print_names)
 			fprintf(pos->fp, ", ");
 		dom_print = 1;
 	}
-	if ((opt_loglevel_field || opt_all_fields) && event_class->loglevel_identifier != 0) {
+	if ((opt_loglevel_field || opt_all_fields) && event_class->loglevel != -1) {
 		set_field_names_print(pos, ITEM_HEADER);
 		if (pos->print_names) {
 			fprintf(pos->fp, "loglevel = ");
 		} else if (dom_print) {
 			fprintf(pos->fp, ":");
 		}
-		fprintf(pos->fp, "%s (%lld)",
-			g_quark_to_string(event_class->loglevel_identifier),
-			(long long) event_class->loglevel_value);
+		fprintf(pos->fp, "%s (%d)",
+			print_loglevel(event_class->loglevel),
+			event_class->loglevel);
 		if (pos->print_names)
 			fprintf(pos->fp, ", ");
 		dom_print = 1;
@@ -389,6 +448,7 @@ int ctf_text_write_event(struct stream_pos *ppos,
 	/* newline */
 	fprintf(pos->fp, "\n");
 	pos->field_nr = 0;
+	stream->consumed = 1;
 
 	return 0;
 
@@ -398,8 +458,7 @@ error:
 }
 
 
-struct trace_descriptor *ctf_text_open_trace(const char *collection_path,
-		const char *path, int flags,
+struct trace_descriptor *ctf_text_open_trace(const char *path, int flags,
 		void (*move_pos_slow)(struct ctf_stream_pos *pos, size_t offset,
 			int whence), FILE *metadata_fp)
 {