X-Git-Url: http://git.liburcu.org/?p=lttng-modules.git;a=blobdiff_plain;f=lttng-abi.h;h=9d345f4a7c841fe683e5872ee2eb6eeb958a176d;hp=db66bf375b74663e30f1b91809746a0bc76147b2;hb=436f640717bab63240d9a624846d947e150a2cee;hpb=3aed4dca825a63757a3c95b9d41019660f83e02d diff --git a/lttng-abi.h b/lttng-abi.h index db66bf37..9d345f4a 100644 --- a/lttng-abi.h +++ b/lttng-abi.h @@ -17,9 +17,11 @@ * should be increased when an incompatible ABI change is done. */ #define LTTNG_MODULES_ABI_MAJOR_VERSION 2 -#define LTTNG_MODULES_ABI_MINOR_VERSION 3 +#define LTTNG_MODULES_ABI_MINOR_VERSION 4 #define LTTNG_KERNEL_SYM_NAME_LEN 256 +#define LTTNG_KERNEL_SESSION_NAME_LEN 256 +#define LTTNG_KERNEL_SESSION_CREATION_TIME_ISO8601_LEN 26 enum lttng_kernel_instrumentation { LTTNG_KERNEL_TRACEPOINT = 0, @@ -119,6 +121,14 @@ struct lttng_kernel_tracer_abi_version { uint32_t minor; } __attribute__((packed)); +struct lttng_kernel_session_name { + char name[LTTNG_KERNEL_SESSION_NAME_LEN]; +} __attribute__((packed)); + +struct lttng_kernel_session_creation_time { + char iso8601[LTTNG_KERNEL_SESSION_CREATION_TIME_ISO8601_LEN]; +} __attribute__((packed)); + enum lttng_kernel_calibrate_type { LTTNG_KERNEL_CALIBRATE_KRETPROBE, }; @@ -151,6 +161,25 @@ enum lttng_kernel_context_type { LTTNG_KERNEL_CONTEXT_MIGRATABLE = 15, LTTNG_KERNEL_CONTEXT_CALLSTACK_KERNEL = 16, LTTNG_KERNEL_CONTEXT_CALLSTACK_USER = 17, + LTTNG_KERNEL_CONTEXT_CGROUP_NS = 18, + LTTNG_KERNEL_CONTEXT_IPC_NS = 19, + LTTNG_KERNEL_CONTEXT_MNT_NS = 20, + LTTNG_KERNEL_CONTEXT_NET_NS = 21, + LTTNG_KERNEL_CONTEXT_PID_NS = 22, + LTTNG_KERNEL_CONTEXT_USER_NS = 23, + LTTNG_KERNEL_CONTEXT_UTS_NS = 24, + LTTNG_KERNEL_CONTEXT_UID = 25, + LTTNG_KERNEL_CONTEXT_EUID = 26, + LTTNG_KERNEL_CONTEXT_SUID = 27, + LTTNG_KERNEL_CONTEXT_GID = 28, + LTTNG_KERNEL_CONTEXT_EGID = 29, + LTTNG_KERNEL_CONTEXT_SGID = 30, + LTTNG_KERNEL_CONTEXT_VUID = 31, + LTTNG_KERNEL_CONTEXT_VEUID = 32, + LTTNG_KERNEL_CONTEXT_VSUID = 33, + LTTNG_KERNEL_CONTEXT_VGID = 34, + LTTNG_KERNEL_CONTEXT_VEGID = 35, + LTTNG_KERNEL_CONTEXT_VSGID = 36, }; struct lttng_kernel_perf_counter_ctx { @@ -180,6 +209,7 @@ struct lttng_kernel_filter_bytecode { } __attribute__((packed)); /* LTTng file descriptor ioctl */ +/* lttng-abi-old.h reserve 0x40, 0x41, 0x42, 0x43, and 0x44. */ #define LTTNG_KERNEL_SESSION _IO(0xF6, 0x45) #define LTTNG_KERNEL_TRACER_VERSION \ _IOR(0xF6, 0x46, struct lttng_kernel_tracer_version) @@ -192,6 +222,7 @@ struct lttng_kernel_filter_bytecode { _IOR(0xF6, 0x4B, struct lttng_kernel_tracer_abi_version) /* Session FD ioctl */ +/* lttng-abi-old.h reserve 0x50, 0x51, 0x52, and 0x53. */ #define LTTNG_KERNEL_METADATA \ _IOW(0xF6, 0x54, struct lttng_kernel_channel) #define LTTNG_KERNEL_CHANNEL \ @@ -209,10 +240,16 @@ struct lttng_kernel_filter_bytecode { */ #define LTTNG_KERNEL_SESSION_LIST_TRACKER_PIDS _IO(0xF6, 0x58) #define LTTNG_KERNEL_SESSION_METADATA_REGEN _IO(0xF6, 0x59) -/* 0x5A and 0x5B are reserved for a future ABI-breaking cleanup. */ + +/* lttng-abi-old.h reserve 0x5A and 0x5B. */ #define LTTNG_KERNEL_SESSION_STATEDUMP _IO(0xF6, 0x5C) +#define LTTNG_KERNEL_SESSION_SET_NAME \ + _IOR(0xF6, 0x5D, struct lttng_kernel_session_name) +#define LTTNG_KERNEL_SESSION_SET_CREATION_TIME \ + _IOR(0xF6, 0x5E, struct lttng_kernel_session_creation_time) /* Channel FD ioctl */ +/* lttng-abi-old.h reserve 0x60 and 0x61. */ #define LTTNG_KERNEL_STREAM _IO(0xF6, 0x62) #define LTTNG_KERNEL_EVENT \ _IOW(0xF6, 0x63, struct lttng_kernel_event) @@ -220,10 +257,12 @@ struct lttng_kernel_filter_bytecode { _IOWR(0xF6, 0x64, struct lttng_kernel_syscall_mask) /* Event and Channel FD ioctl */ +/* lttng-abi-old.h reserve 0x70. */ #define LTTNG_KERNEL_CONTEXT \ _IOW(0xF6, 0x71, struct lttng_kernel_context) /* Event, Channel and Session ioctl */ +/* lttng-abi-old.h reserve 0x80 and 0x81. */ #define LTTNG_KERNEL_ENABLE _IO(0xF6, 0x82) #define LTTNG_KERNEL_DISABLE _IO(0xF6, 0x83) @@ -231,24 +270,30 @@ struct lttng_kernel_filter_bytecode { #define LTTNG_KERNEL_FILTER _IO(0xF6, 0x90) #define LTTNG_KERNEL_ADD_CALLSITE _IO(0xF6, 0x91) -/* LTTng-specific ioctls for the lib ringbuffer */ +/* + * LTTng-specific ioctls for the lib ringbuffer. + * + * Operations applying to the current sub-buffer need to occur between + * a get/put or get_next/put_next ioctl pair. + */ + /* returns the timestamp begin of the current sub-buffer */ #define LTTNG_RING_BUFFER_GET_TIMESTAMP_BEGIN _IOR(0xF6, 0x20, uint64_t) /* returns the timestamp end of the current sub-buffer */ #define LTTNG_RING_BUFFER_GET_TIMESTAMP_END _IOR(0xF6, 0x21, uint64_t) -/* returns the number of events discarded */ +/* returns the number of events discarded of the current sub-buffer */ #define LTTNG_RING_BUFFER_GET_EVENTS_DISCARDED _IOR(0xF6, 0x22, uint64_t) -/* returns the packet payload size */ +/* returns the packet payload size of the current sub-buffer */ #define LTTNG_RING_BUFFER_GET_CONTENT_SIZE _IOR(0xF6, 0x23, uint64_t) -/* returns the actual packet size */ +/* returns the packet size of the current sub-buffer*/ #define LTTNG_RING_BUFFER_GET_PACKET_SIZE _IOR(0xF6, 0x24, uint64_t) -/* returns the stream id */ +/* returns the stream id (invariant for the stream) */ #define LTTNG_RING_BUFFER_GET_STREAM_ID _IOR(0xF6, 0x25, uint64_t) -/* returns the current timestamp */ +/* returns the current timestamp as perceived from the tracer */ #define LTTNG_RING_BUFFER_GET_CURRENT_TIMESTAMP _IOR(0xF6, 0x26, uint64_t) -/* returns the packet sequence number */ +/* returns the packet sequence number of the current sub-buffer */ #define LTTNG_RING_BUFFER_GET_SEQ_NUM _IOR(0xF6, 0x27, uint64_t) -/* returns the stream instance id */ +/* returns the stream instance id (invariant for the stream) */ #define LTTNG_RING_BUFFER_INSTANCE_ID _IOR(0xF6, 0x28, uint64_t) #ifdef CONFIG_COMPAT @@ -258,25 +303,25 @@ struct lttng_kernel_filter_bytecode { /* returns the timestamp end of the current sub-buffer */ #define LTTNG_RING_BUFFER_COMPAT_GET_TIMESTAMP_END \ LTTNG_RING_BUFFER_GET_TIMESTAMP_END -/* returns the number of events discarded */ +/* returns the number of events discarded of the current sub-buffer */ #define LTTNG_RING_BUFFER_COMPAT_GET_EVENTS_DISCARDED \ LTTNG_RING_BUFFER_GET_EVENTS_DISCARDED -/* returns the packet payload size */ +/* returns the packet payload size of the current sub-buffer */ #define LTTNG_RING_BUFFER_COMPAT_GET_CONTENT_SIZE \ LTTNG_RING_BUFFER_GET_CONTENT_SIZE -/* returns the actual packet size */ +/* returns the packet size of the current sub-buffer */ #define LTTNG_RING_BUFFER_COMPAT_GET_PACKET_SIZE \ LTTNG_RING_BUFFER_GET_PACKET_SIZE -/* returns the stream id */ +/* returns the stream id (invariant for the stream) */ #define LTTNG_RING_BUFFER_COMPAT_GET_STREAM_ID \ LTTNG_RING_BUFFER_GET_STREAM_ID -/* returns the current timestamp */ +/* returns the current timestamp as perceived from the tracer */ #define LTTNG_RING_BUFFER_COMPAT_GET_CURRENT_TIMESTAMP \ LTTNG_RING_BUFFER_GET_CURRENT_TIMESTAMP -/* returns the packet sequence number */ +/* returns the packet sequence number of the current sub-buffer */ #define LTTNG_RING_BUFFER_COMPAT_GET_SEQ_NUM \ LTTNG_RING_BUFFER_GET_SEQ_NUM -/* returns the stream instance id */ +/* returns the stream instance id (invariant for the stream) */ #define LTTNG_RING_BUFFER_COMPAT_INSTANCE_ID \ LTTNG_RING_BUFFER_INSTANCE_ID #endif /* CONFIG_COMPAT */