Update UST ABI and add UST some error message

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

diff --git a/include/lttng-ust.h b/include/lttng-ust.h
index 284b24cbc13907b37d5b1604e907e0043f6f2b6a..b61c320d5fa5db27aad9dc54bdb74f4be041154f 100644 (file)
--- a/include/lttng-ust.h
+++ b/include/lttng-ust.h
@@ -4,7 +4,8 @@
 /*
  * Taken from the lttng-ust-abi.h in the UST 2.0 git tree
  *
- * Copyright 2010-2011 (c) - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Copyright 2010-2011 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Copyright 2011 - David Goulet <david.goulet@polymtl.ca>
  *
  * LTTng-UST ABI header
  *
@@ -13,10 +14,13 @@
 
 #include <stdint.h>
 
-#define LTTNG_UST_SYM_NAME_LEN 128
+#define LTTNG_UST_SYM_NAME_LEN         128
 
-#define LTTNG_UST_COMM_VERSION_MAJOR 0
-#define LTTNG_UST_COMM_VERSION_MINOR 1
+#define LTTNG_UST_COMM_VERSION_MAJOR   0
+#define LTTNG_UST_COMM_VERSION_MINOR   1
+
+/* See lttng-ust.h enum lttng_ust_output */
+#define DEFAULT_UST_CHANNEL_OUTPUT     LTTNG_UST_MMAP
 
 enum lttng_ust_instrumentation {
        LTTNG_UST_TRACEPOINT    = 0,
@@ -41,6 +45,10 @@ struct lttng_ust_channel {
        unsigned int switch_timer_interval;     /* usecs */
        unsigned int read_timer_interval;       /* usecs */
        enum lttng_ust_output output;           /* output mode */
+       /* The following fields are used internally within UST. */
+       int shm_fd;
+       int wait_fd;
+       uint64_t memory_map_size;
 };
 
 struct lttng_ust_event {