projects
/
lttng-ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 ae95af6b222b494a3bc3c7eb350b4e793eede7af..c03a4da177d44ecb5811186433ca0eb342d4efe6 100644
(file)
--- a/
include/lttng/ust-abi.h
+++ b/
include/lttng/ust-abi.h
@@
-20,7
+20,7
@@
#include <stdint.h>
#include <stdint.h>
-#define LTTNG_UST_SYM_NAME_LEN
128
+#define LTTNG_UST_SYM_NAME_LEN
256
#define LTTNG_UST_COMM_VERSION_MAJOR 0
#define LTTNG_UST_COMM_VERSION_MINOR 1
#define LTTNG_UST_COMM_VERSION_MAJOR 0
#define LTTNG_UST_COMM_VERSION_MINOR 1
@@
-29,7
+29,11
@@
enum lttng_ust_instrumentation {
LTTNG_UST_TRACEPOINT = 0,
LTTNG_UST_PROBE = 1,
LTTNG_UST_FUNCTION = 2,
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 {
};
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 */
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 {
struct lttng_ust_stream {
- int shm_fd;
- int wait_fd;
- uint64_t memory_map_size;
};
struct lttng_ust_event {
};
struct lttng_ust_event {
- char name[LTTNG_UST_SYM_NAME_LEN]; /* event name */
enum lttng_ust_instrumentation instrumentation;
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;
/* Per instrumentation type configuration */
union {
} u;
@@
-98,10
+95,10
@@
struct lttng_ust_channel_attr {
enum lttng_ust_output output; /* splice, mmap */
};
enum lttng_ust_output output; /* splice, mmap */
};
-struct lttng_ust_
loglevel
{
- char
provider[LTTNG_UST_SYM_NAME_LEN];
- char loglevel[LTTNG_UST_SYM_NAME_LEN];
- int64_t value;
+struct lttng_ust_
tracepoint_iter
{
+ char
name[LTTNG_UST_SYM_NAME_LEN]; /* provider:name */
+ char loglevel[LTTNG_UST_SYM_NAME_LEN];
/* loglevel */
+ int64_t
loglevel_
value;
};
struct lttng_ust_object_data {
};
struct lttng_ust_object_data {
@@
-111,6
+108,14
@@
struct lttng_ust_object_data {
uint64_t memory_map_size;
};
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)
#define _UST_CMD(minor) (minor)
#define _UST_CMDR(minor, type) (minor)
#define _UST_CMDW(minor, type) (minor)
@@
-127,7
+132,6
@@
struct lttng_ust_object_data {
#define LTTNG_UST_TRACEPOINT_LIST _UST_CMD(0x42)
#define LTTNG_UST_WAIT_QUIESCENT _UST_CMD(0x43)
#define LTTNG_UST_REGISTER_DONE _UST_CMD(0x44)
#define LTTNG_UST_TRACEPOINT_LIST _UST_CMD(0x42)
#define LTTNG_UST_WAIT_QUIESCENT _UST_CMD(0x43)
#define LTTNG_UST_REGISTER_DONE _UST_CMD(0x44)
-#define LTTNG_UST_LOGLEVEL_LIST _UST_CMD(0x45)
/* Session FD commands */
#define LTTNG_UST_METADATA \
/* Session FD commands */
#define LTTNG_UST_METADATA \
@@
-155,15
+159,26
@@
struct lttng_ust_object_data {
/* Tracepoint list commands */
#define LTTNG_UST_TRACEPOINT_LIST_GET _UST_CMD(0x90)
/* Tracepoint list commands */
#define LTTNG_UST_TRACEPOINT_LIST_GET _UST_CMD(0x90)
-/* Loglevel list commands */
-#define LTTNG_UST_LOGLEVEL_LIST_GET _UST_CMD(0xA0)
-
#define LTTNG_UST_ROOT_HANDLE 0
struct lttng_ust_obj;
#define LTTNG_UST_ROOT_HANDLE 0
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 {
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);
};
int (*release)(int objd);
};
This page took
0.025708 seconds
and
4
git commands to generate.