From e6918187568dbd01842d8d1d2c808ce16a894239 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 21 Apr 2024 13:54:28 +0200 Subject: Adding upstream version 18.2.2. Signed-off-by: Daniel Baumann --- src/compressor/zstd/CMakeLists.txt | 21 ++++++ src/compressor/zstd/CompressionPluginZstd.cc | 36 +++++++++ src/compressor/zstd/CompressionPluginZstd.h | 43 +++++++++++ src/compressor/zstd/ZstdCompressor.h | 107 +++++++++++++++++++++++++++ 4 files changed, 207 insertions(+) create mode 100644 src/compressor/zstd/CMakeLists.txt create mode 100644 src/compressor/zstd/CompressionPluginZstd.cc create mode 100644 src/compressor/zstd/CompressionPluginZstd.h create mode 100644 src/compressor/zstd/ZstdCompressor.h (limited to 'src/compressor/zstd') diff --git a/src/compressor/zstd/CMakeLists.txt b/src/compressor/zstd/CMakeLists.txt new file mode 100644 index 000000000..5a522840a --- /dev/null +++ b/src/compressor/zstd/CMakeLists.txt @@ -0,0 +1,21 @@ +# zstd + +option(WITH_SYSTEM_ZSTD "use prebuilt libzstd in system" OFF) + +if(WITH_SYSTEM_ZSTD) + find_package(Zstd 1.4.4 REQUIRED) +else() + include(BuildZstd) + build_Zstd() +endif() + +set(zstd_sources + CompressionPluginZstd.cc) + +add_library(ceph_zstd SHARED ${zstd_sources}) +target_link_libraries(ceph_zstd PRIVATE Zstd::Zstd $<$:ceph-common>) +set_target_properties(ceph_zstd PROPERTIES + VERSION 2.0.0 + SOVERSION 2 + INSTALL_RPATH "") +install(TARGETS ceph_zstd DESTINATION ${compressor_plugin_dir}) diff --git a/src/compressor/zstd/CompressionPluginZstd.cc b/src/compressor/zstd/CompressionPluginZstd.cc new file mode 100644 index 000000000..92aee7343 --- /dev/null +++ b/src/compressor/zstd/CompressionPluginZstd.cc @@ -0,0 +1,36 @@ +/* + * Ceph - scalable distributed file system + * + * Copyright (C) 2015 Mirantis, Inc. + * + * Author: Alyona Kiseleva + * + * 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; either + * version 2.1 of the License, or (at your option) any later version. + * + */ + +#include "acconfig.h" +#include "ceph_ver.h" +#include "common/ceph_context.h" +#include "CompressionPluginZstd.h" + +// ----------------------------------------------------------------------------- + +const char *__ceph_plugin_version() +{ + return CEPH_GIT_NICE_VER; +} + +// ----------------------------------------------------------------------------- + +int __ceph_plugin_init(CephContext *cct, + const std::string& type, + const std::string& name) +{ + auto instance = cct->get_plugin_registry(); + + return instance->add(type, name, new CompressionPluginZstd(cct)); +} diff --git a/src/compressor/zstd/CompressionPluginZstd.h b/src/compressor/zstd/CompressionPluginZstd.h new file mode 100644 index 000000000..632e7c6dc --- /dev/null +++ b/src/compressor/zstd/CompressionPluginZstd.h @@ -0,0 +1,43 @@ +/* + * Ceph - scalable distributed file system + * + * Copyright (C) 2015 Mirantis, Inc. + * + * Author: Alyona Kiseleva + * + * 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; either + * version 2.1 of the License, or (at your option) any later version. + * + */ + +#ifndef CEPH_COMPRESSION_PLUGIN_ZSTD_H +#define CEPH_COMPRESSION_PLUGIN_ZSTD_H + +// ----------------------------------------------------------------------------- +#include "ceph_ver.h" +#include "compressor/CompressionPlugin.h" +#include "ZstdCompressor.h" +// ----------------------------------------------------------------------------- + +class CompressionPluginZstd : public ceph::CompressionPlugin { + +public: + + explicit CompressionPluginZstd(CephContext* cct) : CompressionPlugin(cct) + {} + + int factory(CompressorRef *cs, + std::ostream *ss) override + { + if (compressor == 0) { + ZstdCompressor *interface = new ZstdCompressor(cct); + compressor = CompressorRef(interface); + } + *cs = compressor; + return 0; + } +}; + +#endif diff --git a/src/compressor/zstd/ZstdCompressor.h b/src/compressor/zstd/ZstdCompressor.h new file mode 100644 index 000000000..859bd6b57 --- /dev/null +++ b/src/compressor/zstd/ZstdCompressor.h @@ -0,0 +1,107 @@ +// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- +// vim: ts=8 sw=2 smarttab +/* + * Ceph - scalable distributed file system + * + * Copyright (C) 2015 Haomai Wang + * + * This is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1, as published by the Free Software + * Foundation. See file COPYING. + * + */ + +#ifndef CEPH_ZSTDCOMPRESSOR_H +#define CEPH_ZSTDCOMPRESSOR_H + +#define ZSTD_STATIC_LINKING_ONLY +#include "zstd/lib/zstd.h" + +#include "include/buffer.h" +#include "include/encoding.h" +#include "compressor/Compressor.h" + +class ZstdCompressor : public Compressor { + public: + ZstdCompressor(CephContext *cct) : Compressor(COMP_ALG_ZSTD, "zstd"), cct(cct) {} + + int compress(const ceph::buffer::list &src, ceph::buffer::list &dst, std::optional &compressor_message) override { + ZSTD_CStream *s = ZSTD_createCStream(); + ZSTD_initCStream_srcSize(s, cct->_conf->compressor_zstd_level, src.length()); + auto p = src.begin(); + size_t left = src.length(); + + size_t const out_max = ZSTD_compressBound(left); + ceph::buffer::ptr outptr = ceph::buffer::create_small_page_aligned(out_max); + ZSTD_outBuffer_s outbuf; + outbuf.dst = outptr.c_str(); + outbuf.size = outptr.length(); + outbuf.pos = 0; + + while (left) { + ceph_assert(!p.end()); + struct ZSTD_inBuffer_s inbuf; + inbuf.pos = 0; + inbuf.size = p.get_ptr_and_advance(left, (const char**)&inbuf.src); + left -= inbuf.size; + ZSTD_EndDirective const zed = (left==0) ? ZSTD_e_end : ZSTD_e_continue; + size_t r = ZSTD_compressStream2(s, &outbuf, &inbuf, zed); + if (ZSTD_isError(r)) { + return -EINVAL; + } + } + ceph_assert(p.end()); + + ZSTD_freeCStream(s); + + // prefix with decompressed length + ceph::encode((uint32_t)src.length(), dst); + dst.append(outptr, 0, outbuf.pos); + return 0; + } + + int decompress(const ceph::buffer::list &src, ceph::buffer::list &dst, std::optional compressor_message) override { + auto i = std::cbegin(src); + return decompress(i, src.length(), dst, compressor_message); + } + + int decompress(ceph::buffer::list::const_iterator &p, + size_t compressed_len, + ceph::buffer::list &dst, + std::optional compressor_message) override { + if (compressed_len < 4) { + return -1; + } + compressed_len -= 4; + uint32_t dst_len; + ceph::decode(dst_len, p); + + ceph::buffer::ptr dstptr(dst_len); + ZSTD_outBuffer_s outbuf; + outbuf.dst = dstptr.c_str(); + outbuf.size = dstptr.length(); + outbuf.pos = 0; + ZSTD_DStream *s = ZSTD_createDStream(); + ZSTD_initDStream(s); + while (compressed_len > 0) { + if (p.end()) { + return -1; + } + ZSTD_inBuffer_s inbuf; + inbuf.pos = 0; + inbuf.size = p.get_ptr_and_advance(compressed_len, + (const char**)&inbuf.src); + ZSTD_decompressStream(s, &outbuf, &inbuf); + compressed_len -= inbuf.size; + } + ZSTD_freeDStream(s); + + dst.append(dstptr, 0, outbuf.pos); + return 0; + } + private: + CephContext *const cct; +}; + +#endif -- cgit v1.2.3