Update loglevel selection ABI

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

diff --git a/include/lttng/ust-abi.h b/include/lttng/ust-abi.h
index 8b8197731b10714543ca2948e386187f2bf36e70..c03a4da177d44ecb5811186433ca0eb342d4efe6 100644 (file)
--- a/include/lttng/ust-abi.h
+++ b/include/lttng/ust-abi.h
@@ -29,7 +29,11 @@ enum lttng_ust_instrumentation {
        LTTNG_UST_TRACEPOINT            = 0,
        LTTNG_UST_PROBE                 = 1,
        LTTNG_UST_FUNCTION              = 2,
-       LTTNG_UST_TRACEPOINT_LOGLEVEL   = 3,
+};
+
+enum lttng_ust_loglevel_type {
+       LTTNG_UST_LOGLEVEL              = 0,
+       LTTNG_UST_LOGLEVEL_ONLY         = 1,
 };
 
 enum lttng_ust_output {
@@ -49,25 +53,18 @@ 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;
 };
 
-/*
- * 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 {
-       char name[LTTNG_UST_SYM_NAME_LEN];      /* event name */
        enum lttng_ust_instrumentation instrumentation;
+       char name[LTTNG_UST_SYM_NAME_LEN];      /* event name */
+
+       enum lttng_ust_loglevel_type loglevel_type;
+       char loglevel[LTTNG_UST_SYM_NAME_LEN];  /* loglevel name */
+
        /* Per instrumentation type configuration */
        union {
        } u;
@@ -111,6 +108,14 @@ struct lttng_ust_object_data {
        uint64_t memory_map_size;
 };
 
+enum lttng_ust_calibrate_type {
+       LTTNG_UST_CALIBRATE_TRACEPOINT,
+};
+
+struct lttng_ust_calibrate {
+       enum lttng_ust_calibrate_type type;     /* type (input) */
+};
+
 #define _UST_CMD(minor)                                (minor)
 #define _UST_CMDR(minor, type)                 (minor)
 #define _UST_CMDW(minor, type)                 (minor)
@@ -158,8 +163,22 @@ struct lttng_ust_object_data {
 
 struct lttng_ust_obj;
 
+union ust_args {
+       struct {
+               int *shm_fd;
+               int *wait_fd;
+               uint64_t *memory_map_size;
+       } channel;
+       struct {
+               int *shm_fd;
+               int *wait_fd;
+               uint64_t *memory_map_size;
+       } stream;
+};
+
 struct lttng_ust_objd_ops {
-       long (*cmd)(int objd, unsigned int cmd, unsigned long arg);
+       long (*cmd)(int objd, unsigned int cmd, unsigned long arg,
+               union ust_args *args);
        int (*release)(int objd);
 };