X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=include%2Fbabeltrace%2Fctf-ir%2Fmetadata.h;h=04e894512702fb110b7f900573c9524255d6f3a9;hp=85b0f2d5ef8637ff8a25d5efe50dcaa5b8f7719d;hb=1b8455b701df7ac196e35795b9ab8ef2d402058d;hpb=03798a93f959f6c694fe98f5647481947607c604

diff --git a/include/babeltrace/ctf-ir/metadata.h b/include/babeltrace/ctf-ir/metadata.h
index 85b0f2d5..04e89451 100644
--- a/include/babeltrace/ctf-ir/metadata.h
+++ b/include/babeltrace/ctf-ir/metadata.h
@@ -17,6 +17,14 @@
  *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
  */
 
 #include <babeltrace/types.h>
@@ -32,6 +40,7 @@ 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;
@@ -101,6 +110,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;		\
@@ -123,6 +166,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];
@@ -130,7 +174,7 @@ struct ctf_tracer_env {
 };
 
 struct ctf_trace {
-	struct trace_descriptor parent;
+	struct bt_trace_descriptor parent;
 	/* root scope */
 	struct declaration_scope *root_declaration_scope;
 
@@ -140,6 +184,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 */
@@ -189,7 +234,7 @@ struct ctf_trace {
 
 struct ctf_stream_declaration {
 	struct ctf_trace *trace;
-	/* parent is lexical scope conaining the stream scope */
+	/* parent is lexical scope containing the stream scope */
 	struct declaration_scope *declaration_scope;
 	/* innermost definition scope. to be used as parent of event. */
 	struct definition_scope *definition_scope;
@@ -226,7 +271,7 @@ struct ctf_stream_declaration {
 struct ctf_event_declaration {
 	/* stream mapped by stream_id */
 	struct ctf_stream_declaration *stream;
-	/* parent is lexical scope conaining the event scope */
+	/* parent is lexical scope containing the event scope */
 	struct declaration_scope *declaration_scope;
 
 	struct declaration_struct *context_decl;
@@ -236,12 +281,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;
 };