From acf32be842d654770fadb4f7a799ac9fd260860f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=A1clav=20=C5=A0milauer?= Date: Fri, 8 Nov 2019 15:29:20 +0100 Subject: [PATCH] Add ringbuffer sink (requires boost::circular_buffer) Ringbuffer sink keeps user-given number of most recent log messages in memory and returns them upon request (using the ringbuffer_sink::last method). This can be useful for e.g. remote debugging of a running app. --- include/spdlog/sinks/ringbuffer_sink-inl.h | 48 +++++++++++++++++ include/spdlog/sinks/ringbuffer_sink.h | 60 ++++++++++++++++++++++ 2 files changed, 108 insertions(+) create mode 100644 include/spdlog/sinks/ringbuffer_sink-inl.h create mode 100644 include/spdlog/sinks/ringbuffer_sink.h diff --git a/include/spdlog/sinks/ringbuffer_sink-inl.h b/include/spdlog/sinks/ringbuffer_sink-inl.h new file mode 100644 index 00000000..413fb57b --- /dev/null +++ b/include/spdlog/sinks/ringbuffer_sink-inl.h @@ -0,0 +1,48 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#ifndef SPDLOG_HEADER_ONLY +#include "spdlog/sinks/ringbuffer_sink.h" +#endif + +#include "spdlog/common.h" +#include "spdlog/details/os.h" + +#include + +namespace spdlog { +namespace sinks { + +template +SPDLOG_INLINE ringbuffer_sink::ringbuffer_sink(size_t buf_size) +{ + buf.set_capacity(buf_size); +} + +template +SPDLOG_INLINE void ringbuffer_sink::sink_it_(const details::log_msg &msg) +{ + memory_buf_t formatted; + base_sink::formatter_->format(msg, formatted); + buf.push_front(fmt::to_string(formatted)); +} + +template +SPDLOG_INLINE std::vector ringbuffer_sink::last(size_t lim) +{ + std::lock_guard lock(base_sink::mutex_); + std::vector ret; + ret.reserve(lim); + size_t num=0; + for(const std::string& msg: buf){ + num++; + ret.push_back(msg); + if(lim>0 && num==lim) break; + } + return ret; +} + +} // namespace sinks +} // namespace spdlog diff --git a/include/spdlog/sinks/ringbuffer_sink.h b/include/spdlog/sinks/ringbuffer_sink.h new file mode 100644 index 00000000..35b5e86b --- /dev/null +++ b/include/spdlog/sinks/ringbuffer_sink.h @@ -0,0 +1,60 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#include "spdlog/details/null_mutex.h" +#include "spdlog/sinks/base_sink.h" +#include "spdlog/details/synchronous_factory.h" + +#include +#include +#include + +#include + +namespace spdlog { +namespace sinks { +/* + * Ring buffer sink + */ +template +class ringbuffer_sink final : public base_sink +{ +public: + explicit ringbuffer_sink(size_t buf_size); + std::vector last(size_t lim=0); + +protected: + void sink_it_(const details::log_msg &msg) override; + void flush_() override {}; + +private: + boost::circular_buffer buf; +}; + +using ringbuffer_sink_mt = ringbuffer_sink; +using ringbuffer_sink_st = ringbuffer_sink; + +} // namespace sinks + +// +// factory functions +// +template +inline std::shared_ptr basic_logger_mt(const std::string &logger_name, size_t buf_size) +{ + return Factory::template create(logger_name, buf_size); +} + +template +inline std::shared_ptr basic_logger_st(const std::string &logger_name, size_t buf_size) +{ + return Factory::template create(logger_name, buf_size); +} + +} // namespace spdlog + +#ifdef SPDLOG_HEADER_ONLY +#include "ringbuffer_sink-inl.h" +#endif