summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjyrki <jyrki@google.com>2017-05-09 07:41:36 -0700
committerVictor Costan <pwnall@chromium.org>2017-06-05 13:54:10 -0700
commit83179dd8be390bb904882e34143d44551f475be0 (patch)
tree14ed14aaf16770e6ba869840e1f651c6ca5fc36d
parentc8131680d018bad83a0b0b2e2f6e49a37593c550 (diff)
downloadsnappy-83179dd8be390bb904882e34143d44551f475be0.tar.gz
snappy-83179dd8be390bb904882e34143d44551f475be0.tar.bz2
snappy-83179dd8be390bb904882e34143d44551f475be0.zip
Remove quicklz and lzf support in benchmarks.
-rw-r--r--CMakeLists.txt2
-rw-r--r--cmake/config.h.in6
-rw-r--r--configure.ac2
-rw-r--r--snappy_unittest.cc88
4 files changed, 2 insertions, 96 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index aff7eb1..fff48cc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -49,9 +49,7 @@ ENDIF (NOT HAVE_STDDEF_H)
CHECK_LIBRARY_EXISTS(z zlibVersion "" HAVE_LIBZ)
CHECK_LIBRARY_EXISTS(lzo2 lzo1x_1_15_compress "" HAVE_LIBLZO2)
-CHECK_LIBRARY_EXISTS(lzf lzf_compress "" HAVE_LIBLZF)
CHECK_LIBRARY_EXISTS(fastlz fastlz_compress "" HAVE_LIBFASTLZ)
-CHECK_LIBRARY_EXISTS(quicklz qlz_compress "" HAVE_LIBQUICKLZ)
CHECK_CXX_SOURCE_COMPILES("int main(void) { return __builtin_expect(0, 1); }"
HAVE_BUILTIN_EXPECT)
diff --git a/cmake/config.h.in b/cmake/config.h.in
index 757d031..29fad3c 100644
--- a/cmake/config.h.in
+++ b/cmake/config.h.in
@@ -25,15 +25,9 @@
/* Define to 1 if you have the `fastlz' library (-lfastlz). */
#cmakedefine HAVE_LIBFASTLZ ${HAVE_LIBFASTLZ}
-/* Define to 1 if you have the `lzf' library (-llzf). */
-#cmakedefine HAVE_LIBLZF ${HAVE_LIBLZF}
-
/* Define to 1 if you have the `lzo2' library (-llzo2). */
#cmakedefine HAVE_LIBLZO2 ${HAVE_LIBLZO2}
-/* Define to 1 if you have the `quicklz' library (-lquicklz). */
-#cmakedefine HAVE_LIBQUICKLZ ${HAVE_LIBQUICKLZ}
-
/* Define to 1 if you have the `z' library (-lz). */
#cmakedefine HAVE_LIBZ ${HAVE_LIBZ}
diff --git a/configure.ac b/configure.ac
index cffda8b..0fea21c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -97,9 +97,7 @@ AC_DEFUN([CHECK_EXT_COMPRESSION_LIB], [
])
CHECK_EXT_COMPRESSION_LIB([z], [zlibVersion])
CHECK_EXT_COMPRESSION_LIB([lzo2], [lzo1x_1_15_compress])
-CHECK_EXT_COMPRESSION_LIB([lzf], [lzf_compress])
CHECK_EXT_COMPRESSION_LIB([fastlz], [fastlz_compress])
-CHECK_EXT_COMPRESSION_LIB([quicklz], [qlz_compress])
AC_SUBST([UNITTEST_LIBS])
# These are used by snappy-stubs-public.h.in.
diff --git a/snappy_unittest.cc b/snappy_unittest.cc
index 32d766e..798572a 100644
--- a/snappy_unittest.cc
+++ b/snappy_unittest.cc
@@ -51,11 +51,6 @@ DEFINE_bool(zlib, false,
"Run zlib compression (http://www.zlib.net)");
DEFINE_bool(lzo, false,
"Run LZO compression (http://www.oberhumer.com/opensource/lzo/)");
-DEFINE_bool(quicklz, false,
- "Run quickLZ compression (http://www.quicklz.com/)");
-DEFINE_bool(liblzf, false,
- "Run libLZF compression "
- "(http://www.goof.com/pcg/marc/liblzf.html)");
DEFINE_bool(fastlz, false,
"Run FastLZ compression (http://www.fastlz.org/");
DEFINE_bool(snappy, true, "Run snappy compression");
@@ -123,11 +118,11 @@ typedef string DataEndingAtUnreadablePage;
#endif
enum CompressorType {
- ZLIB, LZO, LIBLZF, QUICKLZ, FASTLZ, SNAPPY
+ ZLIB, LZO, FASTLZ, SNAPPY
};
const char* names[] = {
- "ZLIB", "LZO", "LIBLZF", "QUICKLZ", "FASTLZ", "SNAPPY"
+ "ZLIB", "LZO", "FASTLZ", "SNAPPY"
};
static size_t MinimumRequiredOutputSpace(size_t input_size,
@@ -143,16 +138,6 @@ static size_t MinimumRequiredOutputSpace(size_t input_size,
return input_size + input_size/64 + 16 + 3;
#endif // LZO_VERSION
-#ifdef LZF_VERSION
- case LIBLZF:
- return input_size;
-#endif // LZF_VERSION
-
-#ifdef QLZ_VERSION_MAJOR
- case QUICKLZ:
- return input_size + 36000; // 36000 is used for scratch.
-#endif // QLZ_VERSION_MAJOR
-
#ifdef FASTLZ_VERSION
case FASTLZ:
return max(static_cast<int>(ceil(input_size * 1.05)), 66);
@@ -217,42 +202,6 @@ static bool Compress(const char* input, size_t input_size, CompressorType comp,
}
#endif // LZO_VERSION
-#ifdef LZF_VERSION
- case LIBLZF: {
- int destlen = lzf_compress(input,
- input_size,
- string_as_array(compressed),
- input_size);
- if (destlen == 0) {
- // lzf *can* cause lots of blowup when compressing, so they
- // recommend to limit outsize to insize, and just not compress
- // if it's bigger. Ideally, we'd just swap input and output.
- compressed->assign(input, input_size);
- destlen = input_size;
- }
- if (!compressed_is_preallocated) {
- compressed->resize(destlen);
- }
- break;
- }
-#endif // LZF_VERSION
-
-#ifdef QLZ_VERSION_MAJOR
- case QUICKLZ: {
- qlz_state_compress *state_compress = new qlz_state_compress;
- int destlen = qlz_compress(input,
- string_as_array(compressed),
- input_size,
- state_compress);
- delete state_compress;
- CHECK_NE(0, destlen);
- if (!compressed_is_preallocated) {
- compressed->resize(destlen);
- }
- break;
- }
-#endif // QLZ_VERSION_MAJOR
-
#ifdef FASTLZ_VERSION
case FASTLZ: {
// Use level 1 compression since we mostly care about speed.
@@ -323,37 +272,6 @@ static bool Uncompress(const string& compressed, CompressorType comp,
}
#endif // LZO_VERSION
-#ifdef LZF_VERSION
- case LIBLZF: {
- output->resize(size);
- int destlen = lzf_decompress(compressed.data(),
- compressed.size(),
- string_as_array(output),
- output->size());
- if (destlen == 0) {
- // This error probably means we had decided not to compress,
- // and thus have stored input in output directly.
- output->assign(compressed.data(), compressed.size());
- destlen = compressed.size();
- }
- CHECK_EQ(destlen, size);
- break;
- }
-#endif // LZF_VERSION
-
-#ifdef QLZ_VERSION_MAJOR
- case QUICKLZ: {
- output->resize(size);
- qlz_state_decompress *state_decompress = new qlz_state_decompress;
- int destlen = qlz_decompress(compressed.data(),
- string_as_array(output),
- state_decompress);
- delete state_decompress;
- CHECK_EQ(destlen, size);
- break;
- }
-#endif // QLZ_VERSION_MAJOR
-
#ifdef FASTLZ_VERSION
case FASTLZ: {
output->resize(size);
@@ -1313,8 +1231,6 @@ static void MeasureFile(const char* fname) {
int repeats = (FLAGS_bytes + len) / (len + 1);
if (FLAGS_zlib) Measure(input, len, ZLIB, repeats, 1024<<10);
if (FLAGS_lzo) Measure(input, len, LZO, repeats, 1024<<10);
- if (FLAGS_liblzf) Measure(input, len, LIBLZF, repeats, 1024<<10);
- if (FLAGS_quicklz) Measure(input, len, QUICKLZ, repeats, 1024<<10);
if (FLAGS_fastlz) Measure(input, len, FASTLZ, repeats, 1024<<10);
if (FLAGS_snappy) Measure(input, len, SNAPPY, repeats, 4096<<10);