X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=include%2Flttng%2Fevent.h;h=c90107cb383a3355867877ec9847edef5463968c;hp=f1d8e6581252d3c03165e469ada60c1b47b21125;hb=fe9ecacb78271cd2c1cea39cbd4bf1a4d4e2c345;hpb=834978fd9e2392f20867351ca99bf7bdf31b4f56

diff --git a/include/lttng/event.h b/include/lttng/event.h
index f1d8e6581..c90107cb3 100644
--- a/include/lttng/event.h
+++ b/include/lttng/event.h
@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2014 - David Goulet <dgoulet@efficios.com>
+ * Copyright (C) 2016 - Jérémie Galarneau <jeremie.galarneau@efficios.com>
  *
  * This library is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License, version 2.1 only,
@@ -98,6 +99,19 @@ enum lttng_loglevel_log4j {
 	LTTNG_LOGLEVEL_LOG4J_ALL              = INT32_MIN,
 };
 
+/*
+ * Available loglevels for the Python domain. Those are an exact map from the
+ * Level class.
+ */
+enum lttng_loglevel_python {
+	LTTNG_LOGLEVEL_PYTHON_CRITICAL        = 50,
+	LTTNG_LOGLEVEL_PYTHON_ERROR           = 40,
+	LTTNG_LOGLEVEL_PYTHON_WARNING         = 30,
+	LTTNG_LOGLEVEL_PYTHON_INFO            = 20,
+	LTTNG_LOGLEVEL_PYTHON_DEBUG           = 10,
+	LTTNG_LOGLEVEL_PYTHON_NOTSET          = 0,
+};
+
 /*
  * LTTng consumer mode
  */
@@ -108,21 +122,22 @@ enum lttng_event_output {
 
 /* Event context possible type */
 enum lttng_event_context_type {
-	LTTNG_EVENT_CONTEXT_PID               = 0,
-	LTTNG_EVENT_CONTEXT_PERF_COUNTER      = 1,	/* Backward compat. */
-	LTTNG_EVENT_CONTEXT_PROCNAME          = 2,
-	LTTNG_EVENT_CONTEXT_PRIO              = 3,
-	LTTNG_EVENT_CONTEXT_NICE              = 4,
-	LTTNG_EVENT_CONTEXT_VPID              = 5,
-	LTTNG_EVENT_CONTEXT_TID               = 6,
-	LTTNG_EVENT_CONTEXT_VTID              = 7,
-	LTTNG_EVENT_CONTEXT_PPID              = 8,
-	LTTNG_EVENT_CONTEXT_VPPID             = 9,
-	LTTNG_EVENT_CONTEXT_PTHREAD_ID        = 10,
-	LTTNG_EVENT_CONTEXT_HOSTNAME          = 11,
-	LTTNG_EVENT_CONTEXT_IP                = 12,
-	LTTNG_EVENT_CONTEXT_PERF_CPU_COUNTER  = 13,
+	LTTNG_EVENT_CONTEXT_PID			= 0,
+	LTTNG_EVENT_CONTEXT_PERF_COUNTER	= 1,	/* Backward compat. */
+	LTTNG_EVENT_CONTEXT_PROCNAME		= 2,
+	LTTNG_EVENT_CONTEXT_PRIO		= 3,
+	LTTNG_EVENT_CONTEXT_NICE		= 4,
+	LTTNG_EVENT_CONTEXT_VPID		= 5,
+	LTTNG_EVENT_CONTEXT_TID			= 6,
+	LTTNG_EVENT_CONTEXT_VTID		= 7,
+	LTTNG_EVENT_CONTEXT_PPID		= 8,
+	LTTNG_EVENT_CONTEXT_VPPID		= 9,
+	LTTNG_EVENT_CONTEXT_PTHREAD_ID		= 10,
+	LTTNG_EVENT_CONTEXT_HOSTNAME		= 11,
+	LTTNG_EVENT_CONTEXT_IP			= 12,
+	LTTNG_EVENT_CONTEXT_PERF_CPU_COUNTER	= 13,
 	LTTNG_EVENT_CONTEXT_PERF_THREAD_COUNTER = 14,
+	LTTNG_EVENT_CONTEXT_APP_CONTEXT		= 15,
 };
 
 enum lttng_event_field_type {
@@ -165,6 +180,10 @@ struct lttng_event_context {
 
 	union {
 		struct lttng_event_perf_counter_ctx perf_counter;
+		struct {
+			char *provider_name;
+			char *ctx_name;
+		} app_ctx;
 		char padding[LTTNG_EVENT_CONTEXT_PADDING2];
 	} u;
 };
@@ -203,25 +222,44 @@ struct lttng_event_function_attr {
  *
  * The structures should be initialized to zero before use.
  */
-#define LTTNG_EVENT_PADDING1               10
+#define LTTNG_EVENT_PADDING1               12
 #define LTTNG_EVENT_PADDING2               LTTNG_SYMBOL_NAME_LEN + 32
 struct lttng_event {
+	/* Offset 0 */
 	enum lttng_event_type type;
+
+	/* Offset 4 */
 	char name[LTTNG_SYMBOL_NAME_LEN];
 
+	/* Offset 260 */
 	enum lttng_loglevel_type loglevel_type;
+
+	/* Offset 264 */
 	int loglevel;
 
+	/* Offset 268 */
 	int32_t enabled;	/* Does not apply: -1 */
+
+	/* Offset 272 */
 	pid_t pid;
+
+	/* Offset 276 */
 	unsigned char filter;	/* filter enabled ? */
+
+	/* Offset 277 */
 	unsigned char exclusion; /* exclusions added ? */
 
+	/* Offset 278 */
+	char padding2[2];
+
+	/* Offset 280 */
 	/* Event flag, from 2.6 and above. */
 	enum lttng_event_flag flags;
 
+	/* Offset 284 */
 	char padding[LTTNG_EVENT_PADDING1];
 
+	/* Offset 296 */
 	/* Per event type configuration */
 	union {
 		struct lttng_event_probe_attr probe;