X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf-text%2Fctf-text.c;h=a4316e8fd6d0fccf37f03fa021c2bd3a1380f5b9;hp=81dbb3eb159ef0b423ea09696c086726ce5272f7;hb=c716f83b53677d5f2e6a15463408f464006eafb7;hpb=5b80ddfb8dfa4db544efddcd8acaed1228f87daa

diff --git a/formats/ctf-text/ctf-text.c b/formats/ctf-text/ctf-text.c
index 81dbb3eb..a4316e8f 100644
--- a/formats/ctf-text/ctf-text.c
+++ b/formats/ctf-text/ctf-text.c
@@ -22,8 +22,8 @@
 #include <babeltrace/ctf-text/types.h>
 #include <babeltrace/ctf/metadata.h>
 #include <babeltrace/babeltrace-internal.h>
+#include <babeltrace/ctf/events-internal.h>
 #include <inttypes.h>
-#include <uuid/uuid.h>
 #include <sys/mman.h>
 #include <errno.h>
 #include <sys/types.h>
@@ -56,8 +56,27 @@ enum field_item {
 	ITEM_PAYLOAD,
 };
 
+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,
+		void (*packet_seek)(struct stream_pos *pos, size_t index,
 			int whence), FILE *metadata_fp);
 void ctf_text_close_trace(struct trace_descriptor *descriptor);
 
@@ -151,15 +170,56 @@ void set_field_names_print(struct ctf_text_stream_pos *pos, enum field_item item
 }
 
 static
-int ctf_text_write_event(struct stream_pos *ppos,
-			 struct ctf_stream *stream)
+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)
+			 
 {
 	struct ctf_text_stream_pos *pos =
 		container_of(ppos, struct ctf_text_stream_pos, parent);
-	struct ctf_stream_class *stream_class = stream->stream_class;
+	struct ctf_stream_declaration *stream_class = stream->stream_class;
 	int field_nr_saved;
 	struct ctf_event *event_class;
-	struct ctf_stream_event *event;
+	struct ctf_event_definition *event;
 	uint64_t id;
 	int ret;
 	int dom_print = 0;
@@ -288,7 +348,8 @@ int ctf_text_write_event(struct stream_pos *ppos,
 		} else if (dom_print) {
 			fprintf(pos->fp, ":");
 		}
-		fprintf(pos->fp, "(%d)",
+		fprintf(pos->fp, "%s (%d)",
+			print_loglevel(event_class->loglevel),
 			event_class->loglevel);
 		if (pos->print_names)
 			fprintf(pos->fp, ", ");
@@ -387,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;
 
@@ -397,7 +459,7 @@ error:
 
 
 struct trace_descriptor *ctf_text_open_trace(const char *path, int flags,
-		void (*move_pos_slow)(struct ctf_stream_pos *pos, size_t offset,
+		void (*packet_seek)(struct stream_pos *pos, size_t index,
 			int whence), FILE *metadata_fp)
 {
 	struct ctf_text_stream_pos *pos;