X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=include%2Flttng-ust.h;h=b7143f871ba1510d94191e412ffe6b95ad82ccd4;hb=94484837e95ecc39adfd75748ecab3b973a991d6;hp=4a4564e6d5afcbc4b6d55ef016593f36862f25bb;hpb=3817e7df7aa29d8f52f1a4909b4fa6b660494323;p=lttng-tools.git

diff --git a/include/lttng-ust.h b/include/lttng-ust.h
index 4a4564e6d..b7143f871 100644
--- 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,10 @@
 
 #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
 
 enum lttng_ust_instrumentation {
 	LTTNG_UST_TRACEPOINT    = 0,
@@ -41,6 +42,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 {
@@ -76,6 +81,7 @@ struct lttng_ust_context {
 	_UST_CMDR(0x41, struct lttng_ust_tracer_version)
 #define LTTNG_UST_TRACEPOINT_LIST       _UST_CMD(0x42)
 #define LTTNG_UST_WAIT_QUIESCENT        _UST_CMD(0x43)
+#define LTTNG_UST_REGISTER_DONE         _UST_CMD(0x44)
 
 /* Session FD ioctl */
 #define LTTNG_UST_METADATA             \
@@ -98,4 +104,6 @@ struct lttng_ust_context {
 #define LTTNG_UST_ENABLE               _UST_CMD(0x80)
 #define LTTNG_UST_DISABLE              _UST_CMD(0x81)
 
+#define LTTNG_UST_ROOT_HANDLE          0
+
 #endif /* _LTTNG_UST_H */