Add procname context

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

diff --git a/include/ust/lttng-ust-abi.h b/include/ust/lttng-ust-abi.h
index f8ba13e56182c0cedec175016d52bc3b4eb8a37c..303493eeb4e1404ea4241b7054c9f138813ab475 100644 (file)
--- a/include/ust/lttng-ust-abi.h
+++ b/include/ust/lttng-ust-abi.h
@@ -15,20 +15,24 @@
 
 #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 */
@@ -36,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 {
@@ -47,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 {
@@ -67,14 +82,20 @@ struct lttng_ust_context {
 #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                      \
@@ -82,17 +103,35 @@ 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)
 
-/* 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 obj;
+
+struct 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 objd_ops *objd_ops(int id);
+int objd_unref(int id);
+
+void lttng_ust_abi_exit(void);
+void ltt_events_exit(void);
+
 #endif /* _LTTNG_UST_ABI_H */