X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=lttng-abi.h;h=c292de01bb2192a520c616894862c56b7c3fd2cc;hb=6bb4326c067161532e0e6f3a0deec2d28b4595e8;hp=9b9a2323b66f20f26eb498027f0e507728e5cc2b;hpb=fe40f016c667f247b8e81c318cafa173de745fdd;p=lttng-modules.git diff --git a/lttng-abi.h b/lttng-abi.h index 9b9a2323..c292de01 100644 --- a/lttng-abi.h +++ b/lttng-abi.h @@ -1,28 +1,15 @@ -#ifndef _LTTNG_ABI_H -#define _LTTNG_ABI_H - -/* +/* SPDX-License-Identifier: (GPL-2.0 or LGPL-2.1) + * * lttng-abi.h * * LTTng ABI header * * Copyright (C) 2010-2012 Mathieu Desnoyers - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; only - * version 2.1 of the License. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef _LTTNG_ABI_H +#define _LTTNG_ABI_H + #include /* @@ -30,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 1 +#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, @@ -41,6 +30,7 @@ enum lttng_kernel_instrumentation { LTTNG_KERNEL_KRETPROBE = 3, LTTNG_KERNEL_NOOP = 4, /* not hooked */ LTTNG_KERNEL_SYSCALL = 5, + LTTNG_KERNEL_UPROBE = 6, }; /* @@ -86,6 +76,20 @@ struct lttng_kernel_function_tracer { char symbol_name[LTTNG_KERNEL_SYM_NAME_LEN]; } __attribute__((packed)); +struct lttng_kernel_uprobe { + int fd; +} __attribute__((packed)); + +struct lttng_kernel_event_callsite_uprobe { + uint64_t offset; +} __attribute__((packed)); + +struct lttng_kernel_event_callsite { + union { + struct lttng_kernel_event_callsite_uprobe uprobe; + } u; +} __attribute__((packed)); + /* * For syscall tracing, name = "*" means "enable all". */ @@ -101,6 +105,7 @@ struct lttng_kernel_event { struct lttng_kernel_kretprobe kretprobe; struct lttng_kernel_kprobe kprobe; struct lttng_kernel_function_tracer ftrace; + struct lttng_kernel_uprobe uprobe; char padding[LTTNG_KERNEL_EVENT_PADDING2]; } u; } __attribute__((packed)); @@ -116,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, }; @@ -146,6 +159,8 @@ enum lttng_kernel_context_type { LTTNG_KERNEL_CONTEXT_PREEMPTIBLE = 13, LTTNG_KERNEL_CONTEXT_NEED_RESCHEDULE = 14, LTTNG_KERNEL_CONTEXT_MIGRATABLE = 15, + LTTNG_KERNEL_CONTEXT_CALLSTACK_KERNEL = 16, + LTTNG_KERNEL_CONTEXT_CALLSTACK_USER = 17, }; struct lttng_kernel_perf_counter_ctx { @@ -205,6 +220,13 @@ 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. */ +#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 */ #define LTTNG_KERNEL_STREAM _IO(0xF6, 0x62) #define LTTNG_KERNEL_EVENT \ @@ -222,25 +244,32 @@ struct lttng_kernel_filter_bytecode { /* Event FD ioctl */ #define LTTNG_KERNEL_FILTER _IO(0xF6, 0x90) +#define LTTNG_KERNEL_ADD_CALLSITE _IO(0xF6, 0x91) + +/* + * 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. + */ -/* LTTng-specific ioctls for the lib ringbuffer */ /* 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 @@ -250,25 +279,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 */