@@ -7,6 +7,13 @@ ldir:=$(src)/lib/trace-cmd
DEFAULT_TARGET = $(LIBTRACECMD_STATIC)
+pound := \#
+ZLIB_INSTALLED := $(shell if (printf "$(pound)include <zlib.h>\n void main(){deflateInit(NULL, Z_BEST_COMPRESSION);}" | $(CC) -o /dev/null -x c - -lz >/dev/null 2>&1) ; then echo 1; else echo 0 ; fi)
+ifeq ($(ZLIB_INSTALLED), 1)
+CFLAGS += -DHAVE_ZLIB
+$(info Have zlib compression support)
+endif
+
OBJS =
OBJS += trace-hash.o
OBJS += trace-hooks.o
@@ -26,6 +33,9 @@ OBJS += trace-timesync-ptp.o
OBJS += trace-timesync-kvm.o
endif
OBJS += trace-compress.o
+ifeq ($(ZLIB_INSTALLED), 1)
+OBJS += trace-compress-zlib.o
+endif
# Additional util objects
OBJS += trace-blk-hack.o
@@ -30,6 +30,11 @@ void tracecmd_fatal(const char *fmt, ...);
#endif
#endif
+#ifdef HAVE_ZLIB
+int tracecmd_zlib_init(void);
+void tracecmd_zlib_free(void);
+#endif
+
int tracecmd_compress_init(void);
void tracecmd_compress_free(void);
new file mode 100644
@@ -0,0 +1,172 @@
+// SPDX-License-Identifier: LGPL-2.1
+/*
+ * Copyright (C) 2021, VMware, Tzvetomir Stoyanov tz.stoyanov@gmail.com>
+ *
+ */
+#include <stdlib.h>
+#include <dlfcn.h>
+#include <zlib.h>
+#include <errno.h>
+
+#include "trace-cmd-private.h"
+
+#define __ZLIB_NAME "zlib"
+#define __ZLIB_WEIGTH 10
+#define __ZLIB_FILE "libz.so"
+#define ZLIB_FUNC_COMPRESS "compress2"
+#define ZLIB_FUNC_DECOMOPRESS "uncompress"
+#define ZLIB_FUNC_SIZE "compressBound"
+#define ZLIB_FUNC_VERSION "zlibVersion"
+
+static void *zlib_handle;
+static int (*_lib_compress)(unsigned char *out, unsigned long *out_bytes,
+ unsigned char *in, unsigned long in_bytes, int level);
+static int (*_libz_decompress)(unsigned char *out, unsigned long *out_bytes,
+ unsigned char *in, unsigned long in_bytes);
+static unsigned long (*_libz_compress_bound)(unsigned long in_bytes);
+static const char *(*_libz_version)(void);
+
+static int zlib_compress(char *in, unsigned int in_bytes,
+ char *out, unsigned int *out_bytes)
+{
+ unsigned long out_size = *out_bytes;
+ int ret;
+
+ if (!_lib_compress)
+ return -1;
+
+ ret = _lib_compress((unsigned char *)out, &out_size,
+ (unsigned char *)in, (unsigned long)in_bytes, Z_BEST_COMPRESSION);
+ *out_bytes = out_size;
+ errno = 0;
+ switch (ret) {
+ case Z_OK:
+ return 0;
+ case Z_BUF_ERROR:
+ errno = -ENOBUFS;
+ break;
+ case Z_MEM_ERROR:
+ errno = -ENOMEM;
+ break;
+ case Z_STREAM_ERROR:
+ errno = -EINVAL;
+ break;
+ default:
+ errno = -EFAULT;
+ break;
+ }
+
+ return -1;
+}
+
+static int zlib_decompress(char *in, unsigned int in_bytes,
+ char *out, unsigned int *out_bytes)
+{
+ unsigned long out_size = *out_bytes;
+ int ret;
+
+ if (!_libz_decompress)
+ return -1;
+
+ ret = _libz_decompress((unsigned char *)out, &out_size,
+ (unsigned char *)in, (unsigned long)in_bytes);
+ *out_bytes = out_size;
+ errno = 0;
+ switch (ret) {
+ case Z_OK:
+ return 0;
+ case Z_BUF_ERROR:
+ errno = -ENOBUFS;
+ break;
+ case Z_MEM_ERROR:
+ errno = -ENOMEM;
+ break;
+ case Z_DATA_ERROR:
+ errno = -EINVAL;
+ break;
+ default:
+ errno = -EFAULT;
+ break;
+ }
+
+ return -1;
+}
+
+static unsigned int zlib_compress_bound(unsigned int in_bytes)
+{
+ if (!_libz_compress_bound)
+ return 0;
+ return _libz_compress_bound(in_bytes);
+}
+
+static bool zlib_is_supported(const char *name, const char *version)
+{
+ const char *zver;
+
+ if (!name)
+ return false;
+ if (strlen(name) != strlen(__ZLIB_NAME) || strcmp(name, __ZLIB_NAME))
+ return false;
+
+ if (!version)
+ return true;
+
+ if (!_libz_version)
+ return false;
+ zver = _libz_version();
+ if (!zver)
+ return false;
+
+ /* Compare the major version number */
+ if (atoi(version) <= atoi(zver))
+ return true;
+
+ return false;
+}
+
+int tracecmd_zlib_init(void)
+{
+ if (zlib_handle)
+ return 0;
+
+ zlib_handle = dlopen(__ZLIB_FILE, RTLD_NOW | RTLD_GLOBAL);
+ if (!zlib_handle)
+ return -1;
+ _lib_compress = dlsym(zlib_handle, ZLIB_FUNC_COMPRESS);
+ if (!_lib_compress)
+ goto error;
+ _libz_decompress = dlsym(zlib_handle, ZLIB_FUNC_DECOMOPRESS);
+ if (!_libz_decompress)
+ goto error;
+ _libz_compress_bound = dlsym(zlib_handle, ZLIB_FUNC_SIZE);
+ if (!_libz_compress_bound)
+ goto error;
+ _libz_version = dlsym(zlib_handle, ZLIB_FUNC_VERSION);
+ if (!_libz_version)
+ goto error;
+
+ return tracecmd_compress_proto_register(__ZLIB_NAME, _libz_version(), __ZLIB_WEIGTH,
+ zlib_compress, zlib_decompress,
+ zlib_compress_bound, zlib_is_supported);
+
+error:
+ _lib_compress = NULL;
+ _libz_decompress = NULL;
+ _libz_version = NULL;
+ dlclose(zlib_handle);
+ zlib_handle = NULL;
+ return -1;
+}
+
+void tracecmd_zlib_free(void)
+{
+ _lib_compress = NULL;
+ _libz_decompress = NULL;
+ _libz_version = NULL;
+
+ if (zlib_handle) {
+ dlclose(zlib_handle);
+ zlib_handle = NULL;
+ }
+
+}
@@ -38,8 +38,10 @@ int tracecmd_compress_init(void)
gettimeofday(&time, NULL);
srand((time.tv_sec * 1000) + (time.tv_usec / 1000));
-/* toDo: add here initialization of compression protocols */
-
+#ifdef HAVE_ZLIB
+ if (!tracecmd_zlib_init())
+ count++;
+#endif
if (!count)
tracecmd_warning("No compression support available");
If libz is available, use that library to provide compression support for the trace file compression. The library is detected runtime. Signed-off-by: Tzvetomir Stoyanov (VMware) <tz.stoyanov@gmail.com> --- lib/trace-cmd/Makefile | 10 ++ lib/trace-cmd/include/trace-cmd-local.h | 5 + lib/trace-cmd/trace-compress-zlib.c | 172 ++++++++++++++++++++++++ lib/trace-cmd/trace-compress.c | 6 +- 4 files changed, 191 insertions(+), 2 deletions(-) create mode 100644 lib/trace-cmd/trace-compress-zlib.c