Change padding type from array to fixed-width integer

[lttng-tools.git] / include / lttng / event.h

diff --git a/include/lttng/event.h b/include/lttng/event.h
index f1d8e6581252d3c03165e469ada60c1b47b21125..a97f8ffaaf915f2077aadb4a0724019699a98c0c 100644 (file)
--- 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,50 @@ 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;
 
-       char padding[LTTNG_EVENT_PADDING1];
+       /* Offset 284 */
+       char padding[4];
 
+       /* Offset 288 */
+       union {
+               uint64_t padding;
+               void *ptr;
+       } extended;
+
+       /* Offset 296 */
        /* Per event type configuration */
        union {
                struct lttng_event_probe_attr probe;
@@ -251,6 +295,37 @@ struct lttng_event_field {
 extern int lttng_list_events(struct lttng_handle *handle,
                const char *channel_name, struct lttng_event **events);
 
+/*
+ * Get the filter string of a specific LTTng event.
+ *
+ * If the call is successful, then the filter string's address is put
+ * in *filter_string. If the event has no filter string, *filter_string
+ * is set to NULL. The caller does NOT own *filter_string.
+ *
+ * Returns 0 on success, or a negative LTTng error code on error.
+ */
+extern int lttng_event_get_filter_string(struct lttng_event *event,
+               const char **filter_string);
+
+/*
+ * Get the number of exclusion names of a specific LTTng event.
+ *
+ * Returns the number of exclusion names on success, or a negative
+ * LTTng error code on error.
+ */
+extern int lttng_event_get_exclusion_name_count(struct lttng_event *event);
+
+/*
+ * Get an LTTng event's exclusion name at a given index.
+ *
+ * If the call is successful, then the exclusion name string's address
+ * is put in *exclusion_name. The caller does NOT own *exclusion_name.
+ *
+ * Returns 0 on success, or a negative LTTng error code on error.
+ */
+extern int lttng_event_get_exclusion_name(struct lttng_event *event,
+               size_t index, const char **exclusion_name);
+
 /*
  * List the available tracepoints of a specific lttng domain.
  *