Changeset 5e26f1d

Timestamp:

03/12/10 13:48:43 (11 years ago)

Author:

Perry Lorier <perry@…>

Branches:

4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, getfragoff, help, libtrace4, master, ndag_format, pfring, rc-4.0.1, rc-4.0.2, rc-4.0.3, rc-4.0.4, ringdecrementfix, ringperformance, ringtimestampfixes

Children:

b4fd5bc

Parents:

aa0c5c5

Message:

Add support for lzo write compression

Files:

• configure.in (modified) (3 diffs)
• lib/Makefile.am (modified) (2 diffs)
• lib/iow-lzo.c (added)
• lib/wandio.h (modified) (2 diffs)

configure.in

@@ -272 +272 @@
 AC_CHECK_LIB(z, deflate)
 AC_CHECK_LIB(bz2, BZ2_bzDecompressInit)
+AC_CHECK_LIB(lzo2, lzo1x_1_compress)
 AC_CHECK_LIB(pthread, pthread_create)
 AC_SEARCH_LIBS(mvprintw, ncurses, [], [ AC_MSG_ERROR([NCurses library not available]) ])
@@ -282 +283 @@
 AM_CONDITIONAL([HAVE_ZLIB], [test "$ac_cv_lib_z_deflate" = yes])
 AM_CONDITIONAL([HAVE_BZLIB], [test "$ac_cv_lib_bz2_BZ2_bzDecompressInit" = yes])
+AM_CONDITIONAL([HAVE_LZO], [test "$ac_cv_lib_lzo2_lzo1x_1_compress" = yes])
 AM_CONDITIONAL([HAVE_NETPACKET_PACKET_H], [test "$libtrace_netpacket_packet_h" = true])
 AM_CONDITIONAL([HAVE_LIBGDC], [test "$ac_cv_header_gdc_h" = yes])
@@ -318 +320 @@
 reportopt "Compiled with compressed trace (zlib) support" $ac_cv_lib_z_deflate
 reportopt "Compiled with compressed trace (bz2) support" $ac_cv_lib_bz2_BZ2_bzDecompressInit
+reportopt "Compiled with compressed trace (lzo write only) support" $ac_cv_lib_lzo2_lzo1x_1_compress
 if test x"$libtrace_dag" = xtrue; then
         if test "$libtrace_dag_version" = 24; then

lib/Makefile.am

@@ -27 +27 @@
 endif
 
+if HAVE_LZO
+LIBTRACEIO_LZO=iow-lzo.c
+else
+LIBTRACEIO_LZO=
+endif
+
 if HAVE_DAG
 if DAG2_4
@@ -48 +54 @@
                 protocols_transport.c protocols.h \
                 $(DAGSOURCE) format_erf.h \
-                $(LIBTRACEIO_ZLIB) $(LIBTRACEIO_BZLIB) ior-peek.c ior-stdio.c ior-thread.c \
+                $(LIBTRACEIO_ZLIB) $(LIBTRACEIO_BZLIB) $(LIBTRACEIO_LZO) \
+                ior-peek.c ior-stdio.c ior-thread.c \
                 iow-stdio.c iow-thread.c wandio.c \
                 wandio.h

lib/wandio.h

@@ -162 +162 @@
         /** Bzip compression */
         WANDIO_COMPRESS_BZ2     = 2,
+        /** LZO compression */
+        WANDIO_COMPRESS_LZO     = 3,
         /** All supported methods - used as a bitmask */
         WANDIO_COMPRESS_MASK    = 7
@@ -182 +184 @@
 iow_t *zlib_wopen(iow_t *child, int compress_level);
 iow_t *bz_wopen(iow_t *child, int compress_level);
+iow_t *lzo_wopen(iow_t *child, int compress_level);
 iow_t *thread_wopen(iow_t *child);
 iow_t *stdio_wopen(const char *filename);