X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf-text%2Fctf-text.c;h=e4d7682c0ee27d0d6bac6381c52933f1a9911807;hp=b8673755255c037649255d46c5a36392cd51ec56;hb=41e82e008e6a49f5f9f9d3e7100dacd65676464b;hpb=b88d6e851b44935887cbeadac18d5d4572a0a041

diff --git a/formats/ctf-text/ctf-text.c b/formats/ctf-text/ctf-text.c
index b8673755..e4d7682c 100644
--- a/formats/ctf-text/ctf-text.c
+++ b/formats/ctf-text/ctf-text.c
@@ -34,9 +34,36 @@
 #include <unistd.h>
 #include <stdlib.h>
 
-int opt_field_names;
+#define NSEC_PER_SEC 1000000000ULL
 
-struct trace_descriptor *ctf_text_open_trace(const char *path, int flags,
+int opt_all_field_names,
+	opt_scope_field_names,
+	opt_header_field_names,
+	opt_context_field_names,
+	opt_payload_field_names,
+	opt_all_fields,
+	opt_trace_field,
+	opt_trace_domain_field,
+	opt_trace_procname_field,
+	opt_trace_vpid_field,
+	opt_loglevel_field,
+	opt_delta_field = 1,
+	opt_clock_raw,
+	opt_clock_seconds,
+	opt_clock_date,
+	opt_clock_gmt;
+
+uint64_t opt_clock_offset;
+
+enum field_item {
+	ITEM_SCOPE,
+	ITEM_HEADER,
+	ITEM_CONTEXT,
+	ITEM_PAYLOAD,
+};
+
+struct trace_descriptor *ctf_text_open_trace(const char *collection_path,
+		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);
@@ -96,6 +123,108 @@ int print_field(struct definition *definition)
 	return 1;
 }
 
+static
+void set_field_names_print(struct ctf_text_stream_pos *pos, enum field_item item)
+{
+	switch (item) {
+	case ITEM_SCOPE:
+		if (opt_all_field_names || opt_scope_field_names)
+			pos->print_names = 1;
+		else
+			pos->print_names = 0;
+		break;
+	case ITEM_HEADER:
+		if (opt_all_field_names || opt_header_field_names)
+			pos->print_names = 1;
+		else
+			pos->print_names = 0;
+		break;
+	case ITEM_CONTEXT:
+		if (opt_all_field_names || opt_context_field_names)
+			pos->print_names = 1;
+		else
+			pos->print_names = 0;
+		break;
+	case ITEM_PAYLOAD:
+		if (opt_all_field_names || opt_payload_field_names)
+			pos->print_names = 1;
+		else
+			pos->print_names = 0;
+
+		break;
+	default:
+		assert(0);
+	}
+}
+
+static
+void ctf_text_print_timestamp(struct ctf_text_stream_pos *pos,
+			struct ctf_stream *stream)
+{
+	uint64_t ts_sec = 0, ts_nsec;
+	struct ctf_trace *trace = stream->stream_class->trace;
+	struct trace_collection *tc = trace->collection;
+	struct ctf_clock *clock = tc->single_clock;
+
+	ts_nsec = stream->timestamp;
+
+	/* Add offsets */
+	if (!opt_clock_raw && clock) {
+		ts_sec += clock->offset_s;
+		ts_nsec += clock->offset;
+	}
+	ts_sec += opt_clock_offset;
+
+	ts_sec += ts_nsec / NSEC_PER_SEC;
+	ts_nsec = ts_nsec % NSEC_PER_SEC;
+
+	if (!opt_clock_seconds) {
+		struct tm tm;
+		time_t time_s = (time_t) ts_sec;
+
+		if (!opt_clock_gmt) {
+			struct tm *res;
+
+			res = localtime_r(&time_s, &tm);
+			if (!res) {
+				fprintf(stderr, "[warning] Unable to get localtime.\n");
+				goto seconds;
+			}
+		} else {
+			struct tm *res;
+
+			res = gmtime_r(&time_s, &tm);
+			if (!res) {
+				fprintf(stderr, "[warning] Unable to get gmtime.\n");
+				goto seconds;
+			}
+		}
+		if (opt_clock_date) {
+			char timestr[26];
+			size_t res;
+
+			/* Print date and time */
+			res = strftime(timestr, sizeof(timestr),
+				"%F ", &tm);
+			if (!res) {
+				fprintf(stderr, "[warning] Unable to print ascii time.\n");
+				goto seconds;
+			}
+			fprintf(pos->fp, "%s", timestr);
+		}
+		/* Print time in HH:MM:SS.ns */
+		fprintf(pos->fp, "%02d:%02d:%02d.%09" PRIu64,
+			tm.tm_hour, tm.tm_min, tm.tm_sec, ts_nsec);
+		goto end;
+	}
+seconds:
+	fprintf(pos->fp, "%3" PRIu64 ".%09" PRIu64,
+		ts_sec, ts_nsec);
+
+end:
+	return;
+}
+
 static
 int ctf_text_write_event(struct stream_pos *ppos,
 			 struct ctf_stream *stream)
@@ -108,30 +237,32 @@ int ctf_text_write_event(struct stream_pos *ppos,
 	struct ctf_stream_event *event;
 	uint64_t id;
 	int ret;
+	int dom_print = 0;
 
 	id = stream->event_id;
 
 	if (id >= stream_class->events_by_id->len) {
-		fprintf(stdout, "[error] Event id %" PRIu64 " is outside range.\n", id);
+		fprintf(stderr, "[error] Event id %" PRIu64 " is outside range.\n", id);
 		return -EINVAL;
 	}
 	event = g_ptr_array_index(stream->events_by_id, id);
 	if (!event) {
-		fprintf(stdout, "[error] Event id %" PRIu64 " is unknown.\n", id);
+		fprintf(stderr, "[error] Event id %" PRIu64 " is unknown.\n", id);
 		return -EINVAL;
 	}
 	event_class = g_ptr_array_index(stream_class->events_by_id, id);
 	if (!event) {
-		fprintf(stdout, "[error] Event id %" PRIu64 " is unknown.\n", id);
+		fprintf(stderr, "[error] Event id %" PRIu64 " is unknown.\n", id);
 		return -EINVAL;
 	}
 
 	if (stream->has_timestamp) {
+		set_field_names_print(pos, ITEM_HEADER);
 		if (pos->print_names)
 			fprintf(pos->fp, "timestamp = ");
 		else
 			fprintf(pos->fp, "[");
-		fprintf(pos->fp, "%12" PRIu64, stream->timestamp);
+		ctf_text_print_timestamp(pos, stream);
 		if (!pos->print_names)
 			fprintf(pos->fp, "]");
 
@@ -140,6 +271,95 @@ int ctf_text_write_event(struct stream_pos *ppos,
 		else
 			fprintf(pos->fp, " ");
 	}
+	if ((opt_delta_field || opt_all_fields) && stream->has_timestamp) {
+		uint64_t delta, delta_sec, delta_nsec;
+
+		set_field_names_print(pos, ITEM_HEADER);
+		if (pos->print_names)
+			fprintf(pos->fp, "delta = ");
+		else
+			fprintf(pos->fp, "(");
+		if (pos->last_timestamp != -1ULL) {
+			delta = stream->timestamp - pos->last_timestamp;
+			delta_sec = delta / NSEC_PER_SEC;
+			delta_nsec = delta % NSEC_PER_SEC;
+			fprintf(pos->fp, "+%" PRIu64 ".%09" PRIu64,
+				delta_sec, delta_nsec);
+		} else {
+			fprintf(pos->fp, "+?.?????????");
+		}
+		if (!pos->print_names)
+			fprintf(pos->fp, ")");
+
+		if (pos->print_names)
+			fprintf(pos->fp, ", ");
+		else
+			fprintf(pos->fp, " ");
+		pos->last_timestamp = stream->timestamp;
+	}
+
+	if ((opt_trace_field || opt_all_fields) && stream_class->trace->path[0] != '\0') {
+		set_field_names_print(pos, ITEM_HEADER);
+		if (pos->print_names) {
+			fprintf(pos->fp, "trace = ");
+		}
+		fprintf(pos->fp, "%s", stream_class->trace->path);
+		if (pos->print_names)
+			fprintf(pos->fp, ", ");
+		else
+			fprintf(pos->fp, " ");
+	}
+	if ((opt_trace_domain_field && !opt_all_fields) && stream_class->trace->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);
+		if (pos->print_names)
+			fprintf(pos->fp, ", ");
+		dom_print = 1;
+	}
+	if ((opt_trace_procname_field && !opt_all_fields) && stream_class->trace->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);
+		if (pos->print_names)
+			fprintf(pos->fp, ", ");
+		dom_print = 1;
+	}
+	if ((opt_trace_vpid_field && !opt_all_fields) && stream_class->trace->vpid[0] != '\0') {
+		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);
+		if (pos->print_names)
+			fprintf(pos->fp, ", ");
+		dom_print = 1;
+	}
+	if ((opt_loglevel_field || opt_all_fields) && event_class->loglevel_identifier != 0) {
+		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);
+		if (pos->print_names)
+			fprintf(pos->fp, ", ");
+		dom_print = 1;
+	}
+	if (dom_print && !pos->print_names)
+		fprintf(pos->fp, " ");
+	set_field_names_print(pos, ITEM_HEADER);
 	if (pos->print_names)
 		fprintf(pos->fp, "name = ");
 	fprintf(pos->fp, "%s", g_quark_to_string(event_class->name));
@@ -152,10 +372,12 @@ int ctf_text_write_event(struct stream_pos *ppos,
 	if (stream->stream_packet_context) {
 		if (pos->field_nr++ != 0)
 			fprintf(pos->fp, ",");
+		set_field_names_print(pos, ITEM_SCOPE);
 		if (pos->print_names)
 			fprintf(pos->fp, " stream.packet.context =");
 		field_nr_saved = pos->field_nr;
 		pos->field_nr = 0;
+		set_field_names_print(pos, ITEM_CONTEXT);
 		ret = generic_rw(ppos, &stream->stream_packet_context->p);
 		if (ret)
 			goto error;
@@ -166,10 +388,12 @@ int ctf_text_write_event(struct stream_pos *ppos,
 	if (babeltrace_verbose && stream->stream_event_header) {
 		if (pos->field_nr++ != 0)
 			fprintf(pos->fp, ",");
+		set_field_names_print(pos, ITEM_SCOPE);
 		if (pos->print_names)
 			fprintf(pos->fp, " stream.event.header =");
 		field_nr_saved = pos->field_nr;
 		pos->field_nr = 0;
+		set_field_names_print(pos, ITEM_CONTEXT);
 		ret = generic_rw(ppos, &stream->stream_event_header->p);
 		if (ret)
 			goto error;
@@ -180,10 +404,12 @@ int ctf_text_write_event(struct stream_pos *ppos,
 	if (stream->stream_event_context) {
 		if (pos->field_nr++ != 0)
 			fprintf(pos->fp, ",");
+		set_field_names_print(pos, ITEM_SCOPE);
 		if (pos->print_names)
 			fprintf(pos->fp, " stream.event.context =");
 		field_nr_saved = pos->field_nr;
 		pos->field_nr = 0;
+		set_field_names_print(pos, ITEM_CONTEXT);
 		ret = generic_rw(ppos, &stream->stream_event_context->p);
 		if (ret)
 			goto error;
@@ -194,10 +420,12 @@ int ctf_text_write_event(struct stream_pos *ppos,
 	if (event->event_context) {
 		if (pos->field_nr++ != 0)
 			fprintf(pos->fp, ",");
+		set_field_names_print(pos, ITEM_SCOPE);
 		if (pos->print_names)
 			fprintf(pos->fp, " event.context =");
 		field_nr_saved = pos->field_nr;
 		pos->field_nr = 0;
+		set_field_names_print(pos, ITEM_CONTEXT);
 		ret = generic_rw(ppos, &event->event_context->p);
 		if (ret)
 			goto error;
@@ -208,10 +436,12 @@ int ctf_text_write_event(struct stream_pos *ppos,
 	if (event->event_fields) {
 		if (pos->field_nr++ != 0)
 			fprintf(pos->fp, ",");
+		set_field_names_print(pos, ITEM_SCOPE);
 		if (pos->print_names)
 			fprintf(pos->fp, " event.fields =");
 		field_nr_saved = pos->field_nr;
 		pos->field_nr = 0;
+		set_field_names_print(pos, ITEM_PAYLOAD);
 		ret = generic_rw(ppos, &event->event_fields->p);
 		if (ret)
 			goto error;
@@ -224,12 +454,13 @@ int ctf_text_write_event(struct stream_pos *ppos,
 	return 0;
 
 error:
-	fprintf(stdout, "[error] Unexpected end of stream. Either the trace data stream is corrupted or metadata description does not match data layout.\n");
+	fprintf(stderr, "[error] Unexpected end of stream. Either the trace data stream is corrupted or metadata description does not match data layout.\n");
 	return ret;
 }
 
 
-struct trace_descriptor *ctf_text_open_trace(const char *path, int flags,
+struct trace_descriptor *ctf_text_open_trace(const char *collection_path,
+		const char *path, int flags,
 		void (*move_pos_slow)(struct ctf_stream_pos *pos, size_t offset,
 			int whence), FILE *metadata_fp)
 {
@@ -238,6 +469,7 @@ struct trace_descriptor *ctf_text_open_trace(const char *path, int flags,
 
 	pos = g_new0(struct ctf_text_stream_pos, 1);
 
+	pos->last_timestamp = -1ULL;
 	switch (flags & O_ACCMODE) {
 	case O_RDWR:
 		if (!path)
@@ -249,11 +481,11 @@ struct trace_descriptor *ctf_text_open_trace(const char *path, int flags,
 		pos->fp = fp;
 		pos->parent.rw_table = write_dispatch_table;
 		pos->parent.event_cb = ctf_text_write_event;
-		pos->print_names = opt_field_names;
+		pos->print_names = 0;
 		break;
 	case O_RDONLY:
 	default:
-		fprintf(stdout, "[error] Incorrect open flags.\n");
+		fprintf(stderr, "[error] Incorrect open flags.\n");
 		goto error;
 	}