Remove unused ringbuffer-abi.h public header

This header has always been unused. The consumer daemon interacts with
the ring buffer in lttng-ust is through liblttng-ust-ctl, and not
through an ioctl-style ABI.

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Change-Id: I24239a40a30c56fb68917a132f4f58b219ea3e4a

diff --git a/include/Makefile.am b/include/Makefile.am
index 5ef7c9e5f86325759f1ce51c0dc840afd08b37ee..042f9e00e663f2d5e94684d5d7de7b3d4f8313b6 100644 (file)
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -17,7 +17,6 @@ nobase_include_HEADERS = \
        lttng/ust-events.h \
        lttng/ust-ctl.h \
        lttng/ust-abi.h \
-       lttng/ringbuffer-abi.h \
        lttng/ust-tracer.h \
        lttng/ust-compiler.h \
        lttng/ust-fork.h \

diff --git a/include/lttng/ringbuffer-abi.h b/include/lttng/ringbuffer-abi.h
deleted file mode 100644 (file)
index 49042a9..0000000
--- a/include/lttng/ringbuffer-abi.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * SPDX-License-Identifier: MIT
- *
- * Copyright (C) 2005-2012 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
- *
- * Wait-free ring buffer ABI.
- */
-
-#ifndef _LTTNG_RING_BUFFER_ABI_H
-#define _LTTNG_RING_BUFFER_ABI_H
-
-#define _UST_CMD(minor)                                (minor)
-#define _UST_CMDR(minor, type)                 (minor)
-#define _UST_CMDW(minor, type)                 (minor)
-
-/*
- * Use RING_BUFFER_GET_NEXT_SUBBUF / RING_BUFFER_PUT_NEXT_SUBBUF to read and
- * consume sub-buffers sequentially.
- *
- * Reading sub-buffers without consuming them can be performed with:
- *
- * RING_BUFFER_SNAPSHOT
- * RING_BUFFER_SNAPSHOT_GET_CONSUMED
- * RING_BUFFER_SNAPSHOT_GET_PRODUCED
- *
- * to get the offset range to consume, and then by passing each sub-buffer
- * offset to RING_BUFFER_GET_SUBBUF, read the sub-buffer, and then release it
- * with RING_BUFFER_PUT_SUBBUF.
- *
- * Note that the "snapshot" API can be used to read the sub-buffer in reverse
- * order, which is useful for flight recorder snapshots.
- */
-
-/* Get a snapshot of the current ring buffer producer and consumer positions */
-#define RING_BUFFER_SNAPSHOT                   _UST_CMD(0x00)
-/* Get the consumer position (iteration start) */
-#define RING_BUFFER_SNAPSHOT_GET_CONSUMED      _UST_CMDR(0x01, unsigned long)
-/* Get the producer position (iteration end) */
-#define RING_BUFFER_SNAPSHOT_GET_PRODUCED      _UST_CMDR(0x02, unsigned long)
-/* Get exclusive read access to the specified sub-buffer position */
-#define RING_BUFFER_GET_SUBBUF                 _UST_CMDW(0x03, unsigned long)
-/* Release exclusive sub-buffer access */
-#define RING_BUFFER_PUT_SUBBUF                 _UST_CMD(0x04)
-
-/* Get exclusive read access to the next sub-buffer that can be read. */
-#define RING_BUFFER_GET_NEXT_SUBBUF            _UST_CMD(0x05)
-/* Release exclusive sub-buffer access, move consumer forward. */
-#define RING_BUFFER_PUT_NEXT_SUBBUF            _UST_CMD(0x06)
-/* returns the size of the current sub-buffer, without padding (for mmap). */
-#define RING_BUFFER_GET_SUBBUF_SIZE            _UST_CMDR(0x07, unsigned long)
-/* returns the size of the current sub-buffer, with padding (for splice). */
-#define RING_BUFFER_GET_PADDED_SUBBUF_SIZE     _UST_CMDR(0x08, unsigned long)
-/* returns the maximum size for sub-buffers. */
-#define RING_BUFFER_GET_MAX_SUBBUF_SIZE                _UST_CMDR(0x09, unsigned long)
-/* returns the length to mmap. */
-#define RING_BUFFER_GET_MMAP_LEN               _UST_CMDR(0x0A, unsigned long)
-/* returns the offset of the subbuffer belonging to the mmap reader. */
-#define RING_BUFFER_GET_MMAP_READ_OFFSET       _UST_CMDR(0x0B, unsigned long)
-/* flush the current sub-buffer */
-#define RING_BUFFER_FLUSH                      _UST_CMD(0x0C)
-
-#endif /* _LTTNG_RING_BUFFER_ABI_H */

diff --git a/src/common/ringbuffer/api.h b/src/common/ringbuffer/api.h
index ec4f52295bbc7332cdc33e9b476eef79d83c23c0..142615133de309d0d4eda5cf98459119dfa60e55 100644 (file)
--- a/src/common/ringbuffer/api.h
+++ b/src/common/ringbuffer/api.h
@@ -11,7 +11,6 @@
 
 #include "backend.h"
 #include "frontend.h"
-#include <lttng/ringbuffer-abi.h>
 
 /*
  * ring_buffer_frontend_api.h contains static inline functions that depend on