X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=include%2Fbabeltrace%2Fctf-ir%2Fmetadata.h;h=e5c3240c5e039d1620cb240d6d38a034c3772b27;hp=c18749f708906b84f6b01dde9f193d38322edec5;hb=b448902b7c2d8fa734e0d5cb1e6acbb009db97e4;hpb=e003ab503def7b0db6c130cccbc03685adb32bbb

diff --git a/include/babeltrace/ctf-ir/metadata.h b/include/babeltrace/ctf-ir/metadata.h
index c18749f7..e5c3240c 100644
--- a/include/babeltrace/ctf-ir/metadata.h
+++ b/include/babeltrace/ctf-ir/metadata.h
@@ -32,14 +32,15 @@ struct ctf_trace;
 struct ctf_stream_declaration;
 struct ctf_event_declaration;
 struct ctf_clock;
+struct ctf_callsite;
 
 struct ctf_stream_definition {
 	struct ctf_stream_declaration *stream_class;
-	uint64_t timestamp;			/* Current timestamp, in ns */
+	uint64_t real_timestamp;		/* Current timestamp, in ns */
+	uint64_t cycles_timestamp;		/* Current timestamp, in cycles */
 	uint64_t event_id;			/* Current event ID */
 	int has_timestamp;
 	uint64_t stream_id;
-	int consumed;				/* Last packet used by caller */
 
 	struct definition_struct *trace_packet_header;
 	struct definition_struct *stream_packet_context;
@@ -52,9 +53,11 @@ struct ctf_stream_definition {
 	struct ctf_clock *current_clock;
 
 	/* Event discarded information */
-	uint32_t events_discarded;
-	uint64_t prev_timestamp;	/* Last event */
-	uint64_t prev_timestamp_end;	/* End-of-packet timestamp */
+	uint64_t events_discarded;
+	uint64_t prev_real_timestamp;		/* Start-of-last-packet timestamp in ns */
+	uint64_t prev_real_timestamp_end;	/* End-of-last-packet timestamp in ns */
+	uint64_t prev_cycles_timestamp;		/* Start-of-last-packet timestamp in cycles */
+	uint64_t prev_cycles_timestamp_end;	/* End-of-last-packet timestamp in cycles */
 };
 
 struct ctf_event_definition {
@@ -99,6 +102,40 @@ struct ctf_clock {
 	} field_mask;
 };
 
+#define CTF_CALLSITE_SET_FIELD(ctf_callsite, field)			\
+	do {								\
+		(ctf_callsite)->field_mask |= CTF_CALLSITE_ ## field;	\
+	} while (0)
+
+#define CTF_CALLSITE_FIELD_IS_SET(ctf_callsite, field)			\
+		((ctf_callsite)->field_mask & CTF_CALLSITE_ ## field)
+
+#define CTF_CALLSITE_GET_FIELD(ctf_callsite, field)			\
+	({								\
+		assert(CTF_CALLSITE_FIELD_IS_SET(ctf_callsite, field));	\
+		(ctf_callsite)->(field);				\
+	})
+
+struct ctf_callsite {
+	GQuark name;		/* event name associated with callsite */
+	char *func;
+	char *file;
+	uint64_t line;
+	uint64_t ip;
+	struct bt_list_head node;
+	enum {					/* Fields populated mask */
+		CTF_CALLSITE_name	=	(1U << 0),
+		CTF_CALLSITE_func	=	(1U << 1),
+		CTF_CALLSITE_file	=	(1U << 2),
+		CTF_CALLSITE_line	=	(1U << 3),
+		CTF_CALLSITE_ip		=	(1U << 4),
+	} field_mask;
+};
+
+struct ctf_callsite_dups {
+	struct bt_list_head head;
+};
+
 #define CTF_TRACE_SET_FIELD(ctf_trace, field)				\
 	do {								\
 		(ctf_trace)->field_mask |= CTF_TRACE_ ## field;		\
@@ -121,6 +158,7 @@ struct ctf_tracer_env {
 
 	/* All strings below: "" if unset. */
 	char procname[TRACER_ENV_LEN];
+	char hostname[TRACER_ENV_LEN];
 	char domain[TRACER_ENV_LEN];
 	char sysname[TRACER_ENV_LEN];
 	char release[TRACER_ENV_LEN];
@@ -138,6 +176,7 @@ struct ctf_trace {
 	GPtrArray *streams;			/* Array of struct ctf_stream_declaration pointers */
 	struct ctf_stream_definition *metadata;
 	GHashTable *clocks;
+	GHashTable *callsites;
 	struct ctf_clock *single_clock;		/* currently supports only one clock */
 	struct trace_collection *collection;	/* Container of this trace */
 	GPtrArray *event_declarations;		/* Array of all the struct bt_ctf_event_decl */
@@ -234,12 +273,14 @@ struct ctf_event_declaration {
 	uint64_t id;		/* Numeric identifier within the stream */
 	uint64_t stream_id;
 	int loglevel;
+	GQuark model_emf_uri;
 
 	enum {					/* Fields populated mask */
 		CTF_EVENT_name	=		(1 << 0),
 		CTF_EVENT_id 	= 		(1 << 1),
 		CTF_EVENT_stream_id = 		(1 << 2),
 		CTF_EVENT_loglevel =		(1 << 4),
+		CTF_EVENT_model_emf_uri =	(1 << 5),
 	} field_mask;
 };