From ea26da0be7f4776d894874d68e468586b3be0efa Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Wed, 6 Aug 2014 16:54:53 +0200 Subject: util/FifoBuffer: rename to StaticFifoBuffer --- src/event/BufferedSocket.hxx | 4 +- src/input/TextInputStream.hxx | 4 +- src/util/FifoBuffer.hxx | 132 ------------------------------------------ src/util/StaticFifoBuffer.hxx | 132 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 136 insertions(+), 136 deletions(-) delete mode 100644 src/util/FifoBuffer.hxx create mode 100644 src/util/StaticFifoBuffer.hxx (limited to 'src') diff --git a/src/event/BufferedSocket.hxx b/src/event/BufferedSocket.hxx index 1c9b44e46..b1882de2f 100644 --- a/src/event/BufferedSocket.hxx +++ b/src/event/BufferedSocket.hxx @@ -22,7 +22,7 @@ #include "check.h" #include "SocketMonitor.hxx" -#include "util/FifoBuffer.hxx" +#include "util/StaticFifoBuffer.hxx" #include #include @@ -34,7 +34,7 @@ class EventLoop; * A #SocketMonitor specialization that adds an input buffer. */ class BufferedSocket : protected SocketMonitor { - FifoBuffer input; + StaticFifoBuffer input; public: BufferedSocket(int _fd, EventLoop &_loop) diff --git a/src/input/TextInputStream.hxx b/src/input/TextInputStream.hxx index c67423da1..873ecdbda 100644 --- a/src/input/TextInputStream.hxx +++ b/src/input/TextInputStream.hxx @@ -20,7 +20,7 @@ #ifndef MPD_TEXT_INPUT_STREAM_HXX #define MPD_TEXT_INPUT_STREAM_HXX -#include "util/FifoBuffer.hxx" +#include "util/StaticFifoBuffer.hxx" #include @@ -28,7 +28,7 @@ class InputStream; class TextInputStream { InputStream &is; - FifoBuffer buffer; + StaticFifoBuffer buffer; public: /** diff --git a/src/util/FifoBuffer.hxx b/src/util/FifoBuffer.hxx deleted file mode 100644 index 75d2d2ef2..000000000 --- a/src/util/FifoBuffer.hxx +++ /dev/null @@ -1,132 +0,0 @@ -/* - * Copyright (C) 2003-2010 Max Kellermann - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, - * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED - * OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef FIFO_BUFFER_HPP -#define FIFO_BUFFER_HPP - -#include "WritableBuffer.hxx" - -#include -#include - -#include -#include - -/** - * A first-in-first-out buffer: you can append data at the end, and - * read data from the beginning. This class automatically shifts the - * buffer as needed. It is not thread safe. - */ -template -class FifoBuffer { -public: - typedef size_t size_type; - -public: - typedef WritableBuffer Range; - -protected: - size_type head, tail; - T data[size]; - -public: - constexpr - FifoBuffer():head(0), tail(0) {} - -protected: - void Shift() { - if (head == 0) - return; - - assert(head <= size); - assert(tail <= size); - assert(tail >= head); - - std::move(data + head, data + tail, data); - - tail -= head; - head = 0; - } - -public: - void Clear() { - head = tail = 0; - } - - bool IsEmpty() const { - return head == tail; - } - - bool IsFull() const { - return head == 0 && tail == size; - } - - /** - * Prepares writing. Returns a buffer range which may be written. - * When you are finished, call append(). - */ - Range Write() { - Shift(); - return Range(data + tail, size - tail); - } - - /** - * Expands the tail of the buffer, after data has been written to - * the buffer returned by write(). - */ - void Append(size_type n) { - assert(tail <= size); - assert(n <= size); - assert(tail + n <= size); - - tail += n; - } - - /** - * Return a buffer range which may be read. The buffer pointer is - * writable, to allow modifications while parsing. - */ - Range Read() { - return Range(data + head, tail - head); - } - - /** - * Marks a chunk as consumed. - */ - void Consume(size_type n) { - assert(tail <= size); - assert(head <= tail); - assert(n <= tail); - assert(head + n <= tail); - - head += n; - } -}; - -#endif diff --git a/src/util/StaticFifoBuffer.hxx b/src/util/StaticFifoBuffer.hxx new file mode 100644 index 000000000..81d03e43f --- /dev/null +++ b/src/util/StaticFifoBuffer.hxx @@ -0,0 +1,132 @@ +/* + * Copyright (C) 2003-2014 Max Kellermann + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef STATIC_FIFO_BUFFER_HPP +#define STATIC_FIFO_BUFFER_HPP + +#include "WritableBuffer.hxx" + +#include +#include + +#include +#include + +/** + * A first-in-first-out buffer: you can append data at the end, and + * read data from the beginning. This class automatically shifts the + * buffer as needed. It is not thread safe. + */ +template +class StaticFifoBuffer { +public: + typedef size_t size_type; + +public: + typedef WritableBuffer Range; + +protected: + size_type head, tail; + T data[size]; + +public: + constexpr + StaticFifoBuffer():head(0), tail(0) {} + +protected: + void Shift() { + if (head == 0) + return; + + assert(head <= size); + assert(tail <= size); + assert(tail >= head); + + std::move(data + head, data + tail, data); + + tail -= head; + head = 0; + } + +public: + void Clear() { + head = tail = 0; + } + + bool IsEmpty() const { + return head == tail; + } + + bool IsFull() const { + return head == 0 && tail == size; + } + + /** + * Prepares writing. Returns a buffer range which may be written. + * When you are finished, call append(). + */ + Range Write() { + Shift(); + return Range(data + tail, size - tail); + } + + /** + * Expands the tail of the buffer, after data has been written to + * the buffer returned by write(). + */ + void Append(size_type n) { + assert(tail <= size); + assert(n <= size); + assert(tail + n <= size); + + tail += n; + } + + /** + * Return a buffer range which may be read. The buffer pointer is + * writable, to allow modifications while parsing. + */ + Range Read() { + return Range(data + head, tail - head); + } + + /** + * Marks a chunk as consumed. + */ + void Consume(size_type n) { + assert(tail <= size); + assert(head <= tail); + assert(n <= tail); + assert(head + n <= tail); + + head += n; + } +}; + +#endif -- cgit v1.2.3