summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/common/config_opts.h3
-rw-r--r--src/compressor/CMakeLists.txt4
-rw-r--r--src/compressor/Makefile.am1
-rw-r--r--src/compressor/zlib/CMakeLists.txt14
-rw-r--r--src/compressor/zlib/CompressionPluginZlib.cc59
-rw-r--r--src/compressor/zlib/CompressionZlib.cc152
-rw-r--r--src/compressor/zlib/CompressionZlib.h45
-rw-r--r--src/compressor/zlib/Makefile.am21
8 files changed, 297 insertions, 2 deletions
diff --git a/src/common/config_opts.h b/src/common/config_opts.h
index 9107b220e4b..06834223cbe 100644
--- a/src/common/config_opts.h
+++ b/src/common/config_opts.h
@@ -583,7 +583,8 @@ OPTION(osd_pool_default_min_size, OPT_INT, 0) // 0 means no specific default; c
OPTION(osd_pool_default_pg_num, OPT_INT, 8) // number of PGs for new pools. Configure in global or mon section of ceph.conf
OPTION(osd_pool_default_pgp_num, OPT_INT, 8) // number of PGs for placement purposes. Should be equal to pg_num
OPTION(osd_compression_plugins, OPT_STR,
- "snappy"
+ "zlib"
+ " snappy"
) // list of compression plugins
OPTION(osd_pool_default_erasure_code_profile,
OPT_STR,
diff --git a/src/compressor/CMakeLists.txt b/src/compressor/CMakeLists.txt
index 8b41d230269..fcdf8a345c2 100644
--- a/src/compressor/CMakeLists.txt
+++ b/src/compressor/CMakeLists.txt
@@ -3,8 +3,10 @@
set(compressorlibdir ${LIBRARY_OUTPUT_PATH}/compressor)
add_subdirectory(snappy)
+add_subdirectory(zlib)
add_library(compressor_objs OBJECT Compressor.cc)
add_custom_target(compressor_plugins DEPENDS
- ceph_snappy)
+ ceph_snappy
+ ceph_zlib)
diff --git a/src/compressor/Makefile.am b/src/compressor/Makefile.am
index 47a069fd041..9deda3c482b 100644
--- a/src/compressor/Makefile.am
+++ b/src/compressor/Makefile.am
@@ -1,6 +1,7 @@
compressorlibdir = $(pkglibdir)/compressor
compressorlib_LTLIBRARIES =
+include compressor/zlib/Makefile.am
include compressor/snappy/Makefile.am
libcompressor_la_SOURCES = \
diff --git a/src/compressor/zlib/CMakeLists.txt b/src/compressor/zlib/CMakeLists.txt
new file mode 100644
index 00000000000..cacf3077a59
--- /dev/null
+++ b/src/compressor/zlib/CMakeLists.txt
@@ -0,0 +1,14 @@
+# zlib
+
+set(zlib_sources
+ CompressionPluginZlib.cc
+ CompressionZlib.cc
+ $<TARGET_OBJECTS:compressor_objs>
+)
+
+add_library(ceph_zlib SHARED ${zlib_sources})
+add_dependencies(ceph_zlib ${CMAKE_SOURCE_DIR}/src/ceph_ver.h)
+target_link_libraries(ceph_zlib ${EXTRALIBS})
+set_target_properties(ceph_zlib PROPERTIES VERSION 2.14.0 SOVERSION 2)
+set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -lz")
+install(TARGETS ceph_zlib DESTINATION lib/compressor)
diff --git a/src/compressor/zlib/CompressionPluginZlib.cc b/src/compressor/zlib/CompressionPluginZlib.cc
new file mode 100644
index 00000000000..d303d7fce18
--- /dev/null
+++ b/src/compressor/zlib/CompressionPluginZlib.cc
@@ -0,0 +1,59 @@
+/*
+ * Ceph - scalable distributed file system
+ *
+ * Copyright (C) 2015 Mirantis, Inc.
+ *
+ * Author: Alyona Kiseleva <akiselyova@mirantis.com>
+ *
+ * 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 "ceph_ver.h"
+#include "compressor/CompressionPlugin.h"
+#include "CompressionZlib.h"
+#include "common/debug.h"
+
+#define dout_subsys ceph_subsys_mon
+// -----------------------------------------------------------------------------
+
+class CompressionPluginZlib : public CompressionPlugin {
+public:
+
+ CompressionPluginZlib(CephContext *cct) : CompressionPlugin(cct)
+ {}
+
+ virtual int factory(CompressorRef *cs,
+ ostream *ss)
+ {
+ if (compressor == 0) {
+ CompressionZlib *interface = new CompressionZlib();
+ compressor = CompressorRef(interface);
+ }
+ *cs = compressor;
+ return 0;
+ }
+};
+
+// -----------------------------------------------------------------------------
+
+const char *__ceph_plugin_version()
+{
+ return CEPH_GIT_NICE_VER;
+}
+
+// -----------------------------------------------------------------------------
+
+int __ceph_plugin_init(CephContext *cct,
+ const std::string& type,
+ const std::string& name)
+{
+ PluginRegistry *instance = cct->get_plugin_registry();
+
+ return instance->add(type, name, new CompressionPluginZlib(cct));
+}
diff --git a/src/compressor/zlib/CompressionZlib.cc b/src/compressor/zlib/CompressionZlib.cc
new file mode 100644
index 00000000000..fd03bdc2a3f
--- /dev/null
+++ b/src/compressor/zlib/CompressionZlib.cc
@@ -0,0 +1,152 @@
+/*
+ * Ceph - scalable distributed file system
+ *
+ * Copyright (C) 2015 Mirantis, Inc.
+ *
+ * Author: Alyona Kiseleva <akiselyova@mirantis.com>
+ *
+ * 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 "common/debug.h"
+#include "CompressionZlib.h"
+#include "osd/osd_types.h"
+// -----------------------------------------------------------------------------
+
+#include <zlib.h>
+
+// -----------------------------------------------------------------------------
+#define dout_subsys ceph_subsys_compressor
+#undef dout_prefix
+#define dout_prefix _prefix(_dout)
+// -----------------------------------------------------------------------------
+
+// -----------------------------------------------------------------------------
+
+static ostream&
+_prefix(std::ostream* _dout)
+{
+ return *_dout << "CompressionZlib: ";
+}
+// -----------------------------------------------------------------------------
+
+const long unsigned int max_len = 2048;
+
+const char* CompressionZlib::get_method_name()
+{
+ return "zlib";
+}
+
+int CompressionZlib::compress(const bufferlist &in, bufferlist &out)
+{
+ int ret, flush;
+ unsigned have;
+ z_stream strm;
+ unsigned char* c_in;
+ int level = 5;
+
+ /* allocate deflate state */
+ strm.zalloc = Z_NULL;
+ strm.zfree = Z_NULL;
+ strm.opaque = Z_NULL;
+ ret = deflateInit(&strm, level);
+ if (ret != Z_OK) {
+ dout(1) << "Compression init error: init return "
+ << ret << " instead of Z_OK" << dendl;
+ return -1;
+ }
+
+ unsigned char c_out [max_len];
+
+ for (std::list<buffer::ptr>::const_iterator i = in.buffers().begin();
+ i != in.buffers().end();) {
+
+ c_in = (unsigned char*) (*i).c_str();
+ long unsigned int len = (*i).length();
+ ++i;
+
+ strm.avail_in = len;
+ flush = i != in.buffers().end() ? Z_NO_FLUSH : Z_FINISH;
+
+ strm.next_in = c_in;
+
+ do {
+ strm.avail_out = max_len;
+ strm.next_out = c_out;
+ ret = deflate(&strm, flush); /* no bad return value */
+ if (ret == Z_STREAM_ERROR) {
+ dout(1) << "Compression error: compress return Z_STREAM_ERROR("
+ << ret << ")" << dendl;
+ deflateEnd(&strm);
+ return -1;
+ }
+ have = max_len - strm.avail_out;
+ out.append((char*)c_out, have);
+ } while (strm.avail_out == 0);
+ if (strm.avail_in != 0) {
+ dout(10) << "Compression error: unused input" << dendl;
+ deflateEnd(&strm);
+ return -1;
+ }
+ }
+
+ deflateEnd(&strm);
+ return 0;
+}
+
+int CompressionZlib::decompress(const bufferlist &in, bufferlist &out)
+{
+ int ret;
+ unsigned have;
+ z_stream strm;
+ unsigned char* c_in;
+
+ /* allocate inflate state */
+ strm.zalloc = Z_NULL;
+ strm.zfree = Z_NULL;
+ strm.opaque = Z_NULL;
+ strm.avail_in = 0;
+ strm.next_in = Z_NULL;
+ ret = inflateInit(&strm);
+ if (ret != Z_OK) {
+ dout(1) << "Decompression init error: init return "
+ << ret << " instead of Z_OK" << dendl;
+ return -1;
+ }
+
+ unsigned char c_out[max_len];
+
+ for (std::list<buffer::ptr>::const_iterator i = in.buffers().begin();
+ i != in.buffers().end(); ++i) {
+
+ c_in = (unsigned char*) (*i).c_str();
+ long unsigned int len = (*i).length();
+
+ strm.avail_in = len;
+ strm.next_in = c_in;
+
+ do {
+ strm.avail_out = max_len;
+ strm.next_out = c_out;
+ ret = inflate(&strm, Z_NO_FLUSH);
+ if (ret != Z_OK && ret != Z_STREAM_END) {
+ dout(1) << "Decompression error: decompress return "
+ << ret << dendl;
+ inflateEnd(&strm);
+ return -1;
+ }
+ have = max_len - strm.avail_out;
+ out.append((char*)c_out, have);
+ } while (strm.avail_out == 0);
+
+ }
+
+ /* clean up and return */
+ (void)inflateEnd(&strm);
+ return 0;
+}
diff --git a/src/compressor/zlib/CompressionZlib.h b/src/compressor/zlib/CompressionZlib.h
new file mode 100644
index 00000000000..8974107fe66
--- /dev/null
+++ b/src/compressor/zlib/CompressionZlib.h
@@ -0,0 +1,45 @@
+/*
+ * Ceph - scalable distributed file system
+ *
+ * Copyright (C) 2015 Mirantis, Inc.
+ *
+ * Author: Alyona Kiseleva <akiselyova@mirantis.com>
+ *
+ * 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_ZLIB_H
+#define CEPH_COMPRESSION_ZLIB_H
+
+// -----------------------------------------------------------------------------
+#include "compressor/Compressor.h"
+// -----------------------------------------------------------------------------
+#include <list>
+// -----------------------------------------------------------------------------
+
+class CompressionZlib : public Compressor {
+ const char version = '1';
+public:
+
+ CompressionZlib()
+ {
+ }
+
+ virtual
+ ~CompressionZlib()
+ {
+ }
+
+ virtual int compress(const bufferlist &in, bufferlist &out);
+ virtual int decompress(const bufferlist &in, bufferlist &out);
+ virtual const char* get_method_name();
+
+ };
+
+
+#endif
diff --git a/src/compressor/zlib/Makefile.am b/src/compressor/zlib/Makefile.am
new file mode 100644
index 00000000000..250f3962201
--- /dev/null
+++ b/src/compressor/zlib/Makefile.am
@@ -0,0 +1,21 @@
+# zlib plugin
+noinst_HEADERS += \
+ compressor/zlib/CompressionZlib.h
+
+zlib_sources = \
+ compressor/Compressor.cc \
+ compressor/zlib/CompressionPluginZlib.cc \
+ compressor/zlib/CompressionZlib.cc
+
+compressor/zlib/CompressionPluginZlib.cc: ./ceph_ver.h
+
+libceph_zlib_la_SOURCES = ${zlib_sources}
+libceph_zlib_la_CFLAGS = ${AM_CFLAGS}
+libceph_zlib_la_CXXFLAGS= ${AM_CXXFLAGS}
+libceph_zlib_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS)
+libceph_zlib_la_LDFLAGS = ${AM_LDFLAGS} -lz -version-info 2:0:0
+if LINUX
+libceph_zlib_la_LDFLAGS += -export-symbols-regex '.*__compressor_.*'
+endif
+
+compressorlib_LTLIBRARIES += libceph_zlib.la
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-23 18:37:57 +0100