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

diff --git a/include/ust/lttng-ust-abi.h b/include/ust/lttng-ust-abi.h
index 73eb61f3..9c2a53dc 100644
--- a/include/ust/lttng-ust-abi.h
+++ b/include/ust/lttng-ust-abi.h
@@ -41,6 +41,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;
 };
 
 /*
@@ -63,6 +67,9 @@ struct lttng_ust_event {
 
 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 {
@@ -71,6 +78,25 @@ 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)
@@ -104,6 +130,8 @@ struct lttng_ust_context {
 /* 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 commands */
 #define LTTNG_UST_ENABLE			_UST_CMD(0x80)
@@ -111,9 +139,9 @@ struct lttng_ust_context {
 
 #define LTTNG_UST_ROOT_HANDLE	0
 
-struct obj;
+struct lttng_ust_obj;
 
-struct objd_ops {
+struct lttng_ust_objd_ops {
 	long (*cmd)(int objd, unsigned int cmd, unsigned long arg);
 	int (*release)(int objd);
 };
@@ -121,10 +149,10 @@ struct objd_ops {
 /* Create root handle. Always ID 0. */
 int lttng_abi_create_root_handle(void);
 
-const struct objd_ops *objd_ops(int id);
+const struct lttng_ust_objd_ops *objd_ops(int id);
 int objd_unref(int id);
 
 void lttng_ust_abi_exit(void);
-void ltt_events_exit(void);
+void lttng_ust_events_exit(void);
 
 #endif /* _LTTNG_UST_ABI_H */