X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=include%2Fust%2Flttng-ust-abi.h;h=9c2a53dc2b2a69dcf6741b9b67f1bc5f6b853f46;hb=b61ce3b22024d5a0d09af5f221d1265b881d96d6;hp=ff76a710c6adac0c61ae0a230adca97525fb71f7;hpb=9f3fdbc68877e1f12b6cedb15ef76d9af9b48bac;p=lttng-ust.git

diff --git a/include/ust/lttng-ust-abi.h b/include/ust/lttng-ust-abi.h
index ff76a710..9c2a53dc 100644
--- a/include/ust/lttng-ust-abi.h
+++ b/include/ust/lttng-ust-abi.h
@@ -11,22 +11,28 @@
  * Dual LGPL v2.1/GPL v2 license.
  */
 
+#include <stdint.h>
+
 #define LTTNG_UST_SYM_NAME_LEN	128
 
+#define LTTNG_UST_COMM_VERSION_MAJOR		0
+#define LTTNG_UST_COMM_VERSION_MINOR		1
+
 enum lttng_ust_instrumentation {
 	LTTNG_UST_TRACEPOINT	= 0,
+	LTTNG_UST_PROBE		= 1,
+	LTTNG_UST_FUNCTION	= 2,
 };
 
-/*
- * LTTng consumer mode
- */
 enum lttng_ust_output {
-	LTTNG_UST_MMAP	= 0,
+	LTTNG_UST_MMAP		= 0,
 };
 
-/*
- * LTTng DebugFS ABI structures.
- */
+struct lttng_ust_tracer_version {
+	uint32_t version;
+	uint32_t patchlevel;
+	uint32_t sublevel;
+};
 
 struct lttng_ust_channel {
 	int overwrite;				/* 1: overwrite, 0: discard */
@@ -34,7 +40,21 @@ struct lttng_ust_channel {
 	uint64_t num_subbuf;
 	unsigned int switch_timer_interval;	/* usecs */
 	unsigned int read_timer_interval;	/* usecs */
-	enum lttng_ust_output output;		/* mmap */
+	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;
+};
+
+/*
+ * This structure is only used internally within UST. It is not per-se
+ * part of the communication between sessiond and UST.
+ */
+struct lttng_ust_stream {
+	int shm_fd;
+	int wait_fd;
+	uint64_t memory_map_size;
 };
 
 struct lttng_ust_event {
@@ -45,14 +65,11 @@ struct lttng_ust_event {
 	} u;
 };
 
-struct lttng_ust_tracer_version {
-	uint32_t version;
-	uint32_t patchlevel;
-	uint32_t sublevel;
-};
-
 enum lttng_ust_context_type {
 	LTTNG_UST_CONTEXT_VTID			= 0,
+	LTTNG_UST_CONTEXT_VPID			= 1,
+	LTTNG_UST_CONTEXT_PTHREAD_ID		= 2,
+	LTTNG_UST_CONTEXT_PROCNAME		= 3,
 };
 
 struct lttng_ust_context {
@@ -61,18 +78,43 @@ struct lttng_ust_context {
 	} u;
 };
 
+/*
+ * Tracer channel attributes.
+ */
+struct lttng_ust_channel_attr {
+	int overwrite;				/* 1: overwrite, 0: discard */
+	uint64_t subbuf_size;			/* bytes */
+	uint64_t num_subbuf;			/* power of 2 */
+	unsigned int switch_timer_interval;	/* usec */
+	unsigned int read_timer_interval;	/* usec */
+	enum lttng_ust_output output;		/* splice, mmap */
+};
+
+struct lttng_ust_object_data {
+	int handle;
+	int shm_fd;
+	int wait_fd;
+	uint64_t memory_map_size;
+};
+
 #define _UST_CMD(minor)				(minor)
 #define _UST_CMDR(minor, type)			(minor)
 #define _UST_CMDW(minor, type)			(minor)
 
+/* Handled by object descriptor */
+#define LTTNG_UST_RELEASE			_UST_CMD(0x1)
+
+/* Handled by object cmd */
+
 /* LTTng-UST commands */
 #define LTTNG_UST_SESSION			_UST_CMD(0x40)
 #define LTTNG_UST_TRACER_VERSION		\
 	_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 */
+/* Session FD commands */
 #define LTTNG_UST_METADATA			\
 	_UST_CMDW(0x50, struct lttng_ust_channel)
 #define LTTNG_UST_CHANNEL			\
@@ -80,17 +122,37 @@ struct lttng_ust_context {
 #define LTTNG_UST_SESSION_START			_UST_CMD(0x52)
 #define LTTNG_UST_SESSION_STOP			_UST_CMD(0x53)
 
-/* Channel FD ioctl */
+/* Channel FD commands */
 #define LTTNG_UST_STREAM			_UST_CMD(0x60)
 #define LTTNG_UST_EVENT			\
 	_UST_CMDW(0x61, struct lttng_ust_event)
 
-/* Event and Channel FD ioctl */
+/* Event and Channel FD commands */
 #define LTTNG_UST_CONTEXT			\
 	_UST_CMDW(0x70, struct lttng_ust_context)
+#define LTTNG_UST_FLUSH_BUFFER			\
+	_UST_CMD(0x71)
 
-/* Event, Channel and Session ioctl */
+/* Event, Channel and Session commands */
 #define LTTNG_UST_ENABLE			_UST_CMD(0x80)
 #define LTTNG_UST_DISABLE			_UST_CMD(0x81)
 
+#define LTTNG_UST_ROOT_HANDLE	0
+
+struct lttng_ust_obj;
+
+struct lttng_ust_objd_ops {
+	long (*cmd)(int objd, unsigned int cmd, unsigned long arg);
+	int (*release)(int objd);
+};
+
+/* Create root handle. Always ID 0. */
+int lttng_abi_create_root_handle(void);
+
+const struct lttng_ust_objd_ops *objd_ops(int id);
+int objd_unref(int id);
+
+void lttng_ust_abi_exit(void);
+void lttng_ust_events_exit(void);
+
 #endif /* _LTTNG_UST_ABI_H */