Adding LTTng UST 2.0 ABI
authorDavid Goulet <david.goulet@polymtl.ca>
Tue, 23 Aug 2011 17:49:04 +0000 (13:49 -0400)
committerDavid Goulet <david.goulet@polymtl.ca>
Thu, 25 Aug 2011 21:21:17 +0000 (17:21 -0400)
Taken from the git head of UST.

Branch: lttng-ust-2.0
Commit id: 66c7df9e6c8b4e2ea609a7e3028346ada35ddaec

Signed-off-by: David Goulet <david.goulet@polymtl.ca>
include/Makefile.am
include/lttng-sessiond-comm.h
include/lttng-share.h
include/lttng-ust.h [new file with mode: 0644]
ltt-sessiond/main.c

index 44d6672f0c1c1835e079bdb5c52a44b37966d87e..bf2bf01368580d00b9517619c73c93d422a72496 100644 (file)
@@ -1,4 +1,4 @@
 lttnginclude_HEADERS = lttng/lttng.h lttng/lttng-kconsumerd.h
 
 noinst_HEADERS = lttngerr.h lttng-kernel.h ltt-kconsumerd.h lttng-share.h \
-                                lttng-sessiond-comm.h
+                                lttng-sessiond-comm.h lttng-ust.h
index 019f92ec51d6ec62a7e610cb40a3a32fea3f4429..33af994a5d3fb0799413a0985c0415b1aba4498c 100644 (file)
@@ -28,6 +28,7 @@
 
 #include <limits.h>
 #include <lttng/lttng.h>
+#include <lttng-ust.h>
 
 #define LTTNG_RUNDIR                        "/var/run/lttng"
 
@@ -40,8 +41,8 @@
 /* Queue size of listen(2) */
 #define MAX_LISTEN 10
 
-/* Get the error code index from 0 since
- * LTTCOMM_OK start at 1000
+/*
+ * Get the error code index from 0 since LTTCOMM_OK start at 1000
  */
 #define LTTCOMM_ERR_INDEX(code) (code - LTTCOMM_OK)
 
@@ -202,6 +203,34 @@ struct lttcomm_kconsumerd_msg {
        enum lttng_event_output output; /* use splice or mmap to consume this fd */
 };
 
+/*
+ * Data structure for the commands sent from sessiond to UST.
+ */
+struct lttcomm_ust_msg {
+       uint32_t cmd_type;    /* enum lttcomm_ust_command */
+       uint32_t handle;
+       uint32_t cmd;
+       union {
+               struct lttng_ust_tracer_version version;
+               struct lttng_ust_channel channel;
+               struct lttng_ust_event event;
+               struct lttng_ust_context context;
+       } u;
+};
+
+/*
+ * Data structure for the response from UST to the session daemon.
+ * cmd_type is sent back in the reply for validation.
+ */
+struct lttcomm_ust_reply {
+       uint32_t handle;
+       uint32_t cmd;
+       uint32_t ret_code;      /* enum lttcomm_return_code */
+       uint32_t ret_val;       /* return value */
+       union {
+       } u;
+};
+
 extern int lttcomm_create_unix_sock(const char *pathname);
 extern int lttcomm_connect_unix_sock(const char *pathname);
 extern int lttcomm_accept_unix_sock(int sock);
index 4172c0a2f6b33ae6810395f4b1ea833066f12e3f..38598bcea2de5b02b8868a45a3a4cce0bcd8a43f 100644 (file)
 #define _LTTNG_SHARE_H
 
 /* Default channel attributes */
-#define DEFAULT_CHANNEL_NAME                   "channel0"
-#define DEFAULT_CHANNEL_OVERWRITE              0       /* usec */
+#define DEFAULT_CHANNEL_NAME            "channel0"
+#define DEFAULT_CHANNEL_OVERWRITE       0       /* usec */
 /* DEFAULT_CHANNEL_SUBBUF_SIZE must always be a power of 2 */
-#define DEFAULT_CHANNEL_SUBBUF_SIZE            4096    /* bytes */
+#define DEFAULT_CHANNEL_SUBBUF_SIZE     4096    /* bytes */
 /* DEFAULT_CHANNEL_SUBBUF_NUM must always be a power of 2 */
-#define DEFAULT_CHANNEL_SUBBUF_NUM             8
-#define DEFAULT_CHANNEL_SWITCH_TIMER           0       /* usec */
+#define DEFAULT_CHANNEL_SUBBUF_NUM      8
+#define DEFAULT_CHANNEL_SWITCH_TIMER    0       /* usec */
 #define DEFAULT_CHANNEL_READ_TIMER             200     /* usec */
-#define DEFAULT_CHANNEL_OUTPUT                 LTTNG_EVENT_MMAP
+#define DEFAULT_CHANNEL_OUTPUT          LTTNG_EVENT_MMAP
 
-#define DEFAULT_METADATA_SUBBUF_SIZE           4096
-#define DEFAULT_METADATA_SUBBUF_NUM            2
+#define DEFAULT_METADATA_SUBBUF_SIZE    4096
+#define DEFAULT_METADATA_SUBBUF_NUM     2
 
 /* Kernel has different defaults */
 
 /* DEFAULT_KERNEL_CHANNEL_SUBBUF_SIZE must always be a power of 2 */
-#define DEFAULT_KERNEL_CHANNEL_SUBBUF_SIZE     262144    /* bytes */
+#define DEFAULT_KERNEL_CHANNEL_SUBBUF_SIZE  262144    /* bytes */
 /* DEFAULT_KERNEL_CHANNEL_SUBBUF_NUM must always be a power of 2 */
-#define DEFAULT_KERNEL_CHANNEL_SUBBUF_NUM      4
+#define DEFAULT_KERNEL_CHANNEL_SUBBUF_NUM   4
 /* See lttng-kernel.h enum lttng_kernel_output for channel output */
-#define DEFAULT_KERNEL_CHANNEL_OUTPUT          LTTNG_EVENT_SPLICE
-
-/*
- * lttng user-space instrumentation type
- */
-enum lttng_ust_instrumentation {
-       LTTNG_UST_TRACEPOINT,
-       LTTNG_UST_MARKER,
-};
+#define DEFAULT_KERNEL_CHANNEL_OUTPUT       LTTNG_EVENT_SPLICE
 
 #endif /* _LTTNG_SHARE_H */
diff --git a/include/lttng-ust.h b/include/lttng-ust.h
new file mode 100644 (file)
index 0000000..4a4564e
--- /dev/null
@@ -0,0 +1,101 @@
+#ifndef _LTTNG_UST_H
+#define _LTTNG_UST_H
+
+/*
+ * Taken from the lttng-ust-abi.h in the UST 2.0 git tree
+ *
+ * Copyright 2010-2011 (c) - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ *
+ * LTTng-UST ABI header
+ *
+ * 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,
+};
+
+enum lttng_ust_output {
+       LTTNG_UST_MMAP          = 0,
+};
+
+struct lttng_ust_tracer_version {
+       uint32_t version;
+       uint32_t patchlevel;
+       uint32_t sublevel;
+};
+
+struct lttng_ust_channel {
+       int overwrite;                          /* 1: overwrite, 0: discard */
+       uint64_t subbuf_size;                   /* in bytes */
+       uint64_t num_subbuf;
+       unsigned int switch_timer_interval;     /* usecs */
+       unsigned int read_timer_interval;       /* usecs */
+       enum lttng_ust_output output;           /* output mode */
+};
+
+struct lttng_ust_event {
+       char name[LTTNG_UST_SYM_NAME_LEN];      /* event name */
+       enum lttng_ust_instrumentation instrumentation;
+       /* Per instrumentation type configuration */
+       union {
+       } u;
+};
+
+enum lttng_ust_context_type {
+       LTTNG_UST_CONTEXT_VTID      = 0,
+};
+
+struct lttng_ust_context {
+       enum lttng_ust_context_type ctx;
+       union {
+       } u;
+};
+
+#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)
+
+/* Session FD ioctl */
+#define LTTNG_UST_METADATA             \
+       _UST_CMDW(0x50, struct lttng_ust_channel)
+#define LTTNG_UST_CHANNEL              \
+       _UST_CMDW(0x51, struct lttng_ust_channel)
+#define LTTNG_UST_SESSION_START        _UST_CMD(0x52)
+#define LTTNG_UST_SESSION_STOP         _UST_CMD(0x53)
+
+/* Channel FD ioctl */
+#define LTTNG_UST_STREAM               _UST_CMD(0x60)
+#define LTTNG_UST_EVENT                \
+       _UST_CMDW(0x61, struct lttng_ust_event)
+
+/* Event and Channel FD ioctl */
+#define LTTNG_UST_CONTEXT              \
+       _UST_CMDW(0x70, struct lttng_ust_context)
+
+/* Event, Channel and Session ioctl */
+#define LTTNG_UST_ENABLE               _UST_CMD(0x80)
+#define LTTNG_UST_DISABLE              _UST_CMD(0x81)
+
+#endif /* _LTTNG_UST_H */
index dd9f221de58b9d53c111f2729d50c9317af00e2d..66ea028dc4a0e5b30c5c86f81506485cb4a30f82 100644 (file)
@@ -41,7 +41,6 @@
 #include <lttng/lttng-kconsumerd.h>
 #include <lttngerr.h>
 
-#include "context.h"
 #include "kernel-ctl.h"
 #include "ltt-sessiond.h"
 #include "traceable-app.h"
This page took 0.039058 seconds and 4 git commands to generate.