I added a new packet libmemcached. A client library for memcached. Signed-off-by: George McCollister <[email protected]> --- .../0001-make-murmur-hash-optional.patch | 322 ++++++++++++++++++++ ...K-remove-check-for-.git-to-prevent-errors.patch | 38 +++ patches/libmemcached-0.44/autogen.sh | 1 + patches/libmemcached-0.44/series | 2 + rules/libmemcached.in | 36 +++ rules/libmemcached.make | 79 +++++ 6 files changed, 478 insertions(+), 0 deletions(-) create mode 100644 patches/libmemcached-0.44/0001-make-murmur-hash-optional.patch create mode 100644 patches/libmemcached-0.44/0002-HACK-remove-check-for-.git-to-prevent-errors.patch create mode 120000 patches/libmemcached-0.44/autogen.sh create mode 100644 patches/libmemcached-0.44/series create mode 100644 rules/libmemcached.in create mode 100644 rules/libmemcached.make
diff --git a/patches/libmemcached-0.44/0001-make-murmur-hash-optional.patch b/patches/libmemcached-0.44/0001-make-murmur-hash-optional.patch new file mode 100644 index 0000000..d14e71e --- /dev/null +++ b/patches/libmemcached-0.44/0001-make-murmur-hash-optional.patch @@ -0,0 +1,322 @@ +From d9997af782614323dc0393fe17b43d196534e9dd Mon Sep 17 00:00:00 2001 +From: George McCollister <[email protected]> +Date: Fri, 19 Nov 2010 13:31:03 -0600 +Subject: [PATCH] make murmur hash optional + +The murmur hash function may not work correctly on ARM processors and +doesn't produce the same results on big and little endian machines. +This patch allows it to be disabled by passing --disable-murmur_hash to +configure. + +This patch was submitted upstream here: +https://bugs.launchpad.net/libmemcached/+bug/677609 + +Signed-off-by: George McCollister <[email protected]> +--- + configure.ac | 1 + + libhashkit/algorithm.c | 2 ++ + libhashkit/algorithm.h | 4 ++++ + libhashkit/digest.c | 4 ++++ + libhashkit/function.c | 6 ++++++ + libhashkit/include.am | 5 ++++- + m4/hsieh.m4 | 2 +- + m4/murmur.m4 | 18 ++++++++++++++++++ + tests/hash_results.h | 4 ++++ + tests/hashkit_functions.c | 12 ++++++++++++ + tests/mem_functions.c | 26 +++++++++++++++++++++++++- + 11 files changed, 81 insertions(+), 3 deletions(-) + create mode 100644 m4/murmur.m4 + +diff --git a/configure.ac b/configure.ac +index 379466d..6c996e2 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -101,6 +101,7 @@ DETECT_BYTEORDER + ENABLE_UTILLIB + SETSOCKOPT_SANITY + ENABLE_HSIEH_HASH ++ENABLE_MURMUR_HASH + PROTOCOL_BINARY_TEST + WITH_MEMCACHED + ENABLE_DEPRECATED +diff --git a/libhashkit/algorithm.c b/libhashkit/algorithm.c +index e8f859e..0f0f9f0 100644 +--- a/libhashkit/algorithm.c ++++ b/libhashkit/algorithm.c +@@ -45,10 +45,12 @@ uint32_t libhashkit_hsieh(const char *key, size_t key_length) + } + #endif + ++#ifdef HAVE_MURMUR_HASH + uint32_t libhashkit_murmur(const char *key, size_t key_length) + { + return hashkit_murmur(key, key_length, NULL); + } ++#endif + + uint32_t libhashkit_jenkins(const char *key, size_t key_length) + { +diff --git a/libhashkit/algorithm.h b/libhashkit/algorithm.h +index 40ab98a..052575c 100644 +--- a/libhashkit/algorithm.h ++++ b/libhashkit/algorithm.h +@@ -41,8 +41,10 @@ HASHKIT_API + uint32_t libhashkit_hsieh(const char *key, size_t key_length); + #endif + ++#ifdef HAVE_MURMUR_HASH + HASHKIT_API + uint32_t libhashkit_murmur(const char *key, size_t key_length); ++#endif + + HASHKIT_API + uint32_t libhashkit_jenkins(const char *key, size_t key_length); +@@ -73,8 +75,10 @@ HASHKIT_LOCAL + uint32_t hashkit_hsieh(const char *key, size_t key_length, void *context); + #endif + ++#ifdef HAVE_MURMUR_HASH + HASHKIT_LOCAL + uint32_t hashkit_murmur(const char *key, size_t key_length, void *context); ++#endif + + HASHKIT_LOCAL + uint32_t hashkit_jenkins(const char *key, size_t key_length, void *context); +diff --git a/libhashkit/digest.c b/libhashkit/digest.c +index bca6b5b..4ff6de2 100644 +--- a/libhashkit/digest.c ++++ b/libhashkit/digest.c +@@ -38,7 +38,11 @@ uint32_t libhashkit_digest(const char *key, size_t key_length, hashkit_hash_algo + return 1; + #endif + case HASHKIT_HASH_MURMUR: ++#ifdef HAVE_MURMUR_HASH + return libhashkit_murmur(key, key_length); ++#else ++ return 1; ++#endif + case HASHKIT_HASH_JENKINS: + return libhashkit_jenkins(key, key_length); + case HASHKIT_HASH_CUSTOM: +diff --git a/libhashkit/function.c b/libhashkit/function.c +index 25c929b..2e68b58 100644 +--- a/libhashkit/function.c ++++ b/libhashkit/function.c +@@ -41,8 +41,12 @@ static hashkit_return_t _set_function(struct hashkit_function_st *self, hashkit_ + return HASHKIT_FAILURE; + #endif + case HASHKIT_HASH_MURMUR: ++#ifdef HAVE_MURMUR_HASH + self->function= hashkit_murmur; + break; ++#else ++ return HASHKIT_FAILURE; ++#endif + case HASHKIT_HASH_JENKINS: + self->function= hashkit_jenkins; + break; +@@ -126,10 +130,12 @@ static hashkit_hash_algorithm_t get_function_type(const hashkit_hash_fn function + return HASHKIT_HASH_HSIEH; + } + #endif ++#ifdef HAVE_MURMUR_HASH + else if (function == hashkit_murmur) + { + return HASHKIT_HASH_MURMUR; + } ++#endif + else if (function == hashkit_jenkins) + { + return HASHKIT_HASH_JENKINS; +diff --git a/libhashkit/include.am b/libhashkit/include.am +index e800d79..f0adcdc 100644 +--- a/libhashkit/include.am ++++ b/libhashkit/include.am +@@ -40,7 +40,6 @@ libhashkit_libhashkit_la_SOURCES= \ + libhashkit/jenkins.c \ + libhashkit/ketama.c \ + libhashkit/md5.c \ +- libhashkit/murmur.c \ + libhashkit/one_at_a_time.c \ + libhashkit/strerror.c + +@@ -48,6 +47,10 @@ if INCLUDE_HSIEH_SRC + libhashkit_libhashkit_la_SOURCES+= libhashkit/hsieh.c + endif + ++if INCLUDE_MURMUR_SRC ++libhashkit_libhashkit_la_SOURCES+= libhashkit/murmur.c ++endif ++ + libhashkit_libhashkit_la_CFLAGS= \ + ${AM_CFLAGS} \ + -DBUILDING_HASHKIT +diff --git a/m4/hsieh.m4 b/m4/hsieh.m4 +index b057bfd..c4f3df0 100644 +--- a/m4/hsieh.m4 ++++ b/m4/hsieh.m4 +@@ -4,7 +4,7 @@ dnl --------------------------------------------------------------------------- + AC_DEFUN([ENABLE_HSIEH_HASH], + [AC_ARG_ENABLE([hsieh_hash], + [AS_HELP_STRING([--enable-hsieh_hash], +- [build with support for hsieh hashing. @<:default=off@:>@])], ++ [build with support for hsieh hashing. @<:@default=off@:>@])], + [ac_cv_enable_hsieh_hash=yes], + [ac_cv_enable_hsieh_hash=no]) + +diff --git a/m4/murmur.m4 b/m4/murmur.m4 +new file mode 100644 +index 0000000..ecdcf3a +--- /dev/null ++++ b/m4/murmur.m4 +@@ -0,0 +1,18 @@ ++dnl --------------------------------------------------------------------------- ++dnl Macro: ENABLE_MURMUR_HASH ++dnl --------------------------------------------------------------------------- ++AC_DEFUN([ENABLE_MURMUR_HASH], ++ [AC_ARG_ENABLE([murmur_hash], ++ [AS_HELP_STRING([--disable-murmur_hash], ++ [build with support for murmur hashing. @<:@default=on@:>@])], ++ [ac_cv_enable_murmur_hash=no], ++ [ac_cv_enable_murmur_hash=yes]) ++ ++ AS_IF([test "$ac_cv_enable_murmur_hash" = "yes"], ++ [AC_DEFINE([HAVE_MURMUR_HASH], [1], [Enables murmur hashing support])]) ++ ++ AM_CONDITIONAL([INCLUDE_MURMUR_SRC], [test "$ac_cv_enable_murmur_hash" = "yes"]) ++]) ++dnl --------------------------------------------------------------------------- ++dnl End Macro: ENABLE_MURMUR_HASH ++dnl --------------------------------------------------------------------------- +diff --git a/tests/hash_results.h b/tests/hash_results.h +index 26f1ed8..c05053a 100644 +--- a/tests/hash_results.h ++++ b/tests/hash_results.h +@@ -105,6 +105,7 @@ static uint32_t hsieh_values[]= { 3738850110U, 3636226060U, 3821074029U, 3489929 + static uint32_t hsieh_values[]= { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 }; + #endif + ++#ifdef HAVE_MURMUR_HASH + static uint32_t murmur_values[]= { 4142305122U, 734504955U, 3802834688U, 4076891445U, + 387802650U, 560515427U, 3274673488U, 3150339524U, + 1527441970U, 2728642900U, 3613992239U, 2938419259U, +@@ -112,6 +113,9 @@ static uint32_t murmur_values[]= { 4142305122U, 734504955U, 3802834688U, 407689 + 264013145U, 3995512858U, 2400956718U, 2346666219U, + 926327338U, 442757446U, 1770805201U, 560483147U, + 3902279934U }; ++#else ++static uint32_t murmur_values[]= { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 }; ++#endif + + static uint32_t jenkins_values[]= { 1442444624U, 4253821186U, 1885058256U, 2120131735U, + 3261968576U, 3515188778U, 4232909173U, 4288625128U, +diff --git a/tests/hashkit_functions.c b/tests/hashkit_functions.c +index 46f5393..d1f846e 100644 +--- a/tests/hashkit_functions.c ++++ b/tests/hashkit_functions.c +@@ -251,6 +251,7 @@ static test_return_t hsieh_run (hashkit_st *hashk __attribute__((unused))) + static test_return_t murmur_run (hashkit_st *hashk __attribute__((unused))) + { + #ifdef WORDS_BIGENDIAN ++ (void)murmur_values; + return TEST_SKIPPED; + #else + uint32_t x; +@@ -260,7 +261,11 @@ static test_return_t murmur_run (hashkit_st *hashk __attribute__((unused))) + { + uint32_t hash_val; + ++#ifdef HAVE_MURMUR_HASH + hash_val= libhashkit_murmur(*ptr, strlen(*ptr)); ++#else ++ hash_val= 1; ++#endif + assert(murmur_values[x] == hash_val); + } + +@@ -319,8 +324,15 @@ static test_return_t hashkit_set_function_test(hashkit_st *hashk) + rc= hashkit_set_function(hashk, algo); + + /* Hsieh is disabled most of the time for patent issues */ ++#ifndef HAVE_HSIEH_HASH + if (rc == HASHKIT_FAILURE && algo == HASHKIT_HASH_HSIEH) + continue; ++#endif ++ ++#ifndef HAVE_MURMUR_HASH ++ if (rc == HASHKIT_FAILURE && algo == HASHKIT_HASH_MURMUR) ++ continue; ++#endif + + if (rc == HASHKIT_FAILURE && algo == HASHKIT_HASH_CUSTOM) + continue; +diff --git a/tests/mem_functions.c b/tests/mem_functions.c +index 06c414a..f6631a6 100644 +--- a/tests/mem_functions.c ++++ b/tests/mem_functions.c +@@ -3622,9 +3622,13 @@ static test_return_t pre_nonblock_binary(memcached_st *memc) + + static test_return_t pre_murmur(memcached_st *memc) + { ++#ifdef HAVE_MURMUR_HASH + memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_HASH, (uint64_t)MEMCACHED_HASH_MURMUR); +- + return TEST_SUCCESS; ++#else ++ (void) memc; ++ return TEST_SKIPPED; ++#endif + } + + static test_return_t pre_jenkins(memcached_st *memc) +@@ -4760,6 +4764,19 @@ static test_return_t hsieh_avaibility_test (memcached_st *memc) + return TEST_SUCCESS; + } + ++static test_return_t murmur_avaibility_test (memcached_st *memc) ++{ ++ memcached_return_t expected_rc= MEMCACHED_FAILURE; ++#ifdef HAVE_MURMUR_HASH ++ expected_rc= MEMCACHED_SUCCESS; ++#endif ++ memcached_return_t rc= memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_HASH, ++ (uint64_t)MEMCACHED_HASH_MURMUR); ++ test_true(rc == expected_rc); ++ ++ return TEST_SUCCESS; ++} ++ + static test_return_t one_at_a_time_run (memcached_st *memc __attribute__((unused))) + { + uint32_t x; +@@ -4892,6 +4909,7 @@ static test_return_t hsieh_run (memcached_st *memc __attribute__((unused))) + static test_return_t murmur_run (memcached_st *memc __attribute__((unused))) + { + #ifdef WORDS_BIGENDIAN ++ (void)murmur_values; + return TEST_SKIPPED; + #else + uint32_t x; +@@ -6320,6 +6338,11 @@ test_st hsieh_availability[] ={ + {0, 0, (test_callback_fn)0} + }; + ++test_st murmur_availability[] ={ ++ {"murmur_avaibility_test", 0, (test_callback_fn)murmur_avaibility_test}, ++ {0, 0, (test_callback_fn)0} ++}; ++ + #if 0 + test_st hash_sanity[] ={ + {"hash sanity", 0, (test_callback_fn)hash_sanity_test}, +@@ -6361,6 +6384,7 @@ collection_st collection[] ={ + {"hash_sanity", 0, 0, hash_sanity}, + #endif + {"hsieh_availability", 0, 0, hsieh_availability}, ++ {"murmur_availability", 0, 0, murmur_availability}, + {"block", 0, 0, tests}, + {"binary", (test_callback_fn)pre_binary, 0, tests}, + {"nonblock", (test_callback_fn)pre_nonblock, 0, tests}, +-- +1.6.4.2 + diff --git a/patches/libmemcached-0.44/0002-HACK-remove-check-for-.git-to-prevent-errors.patch b/patches/libmemcached-0.44/0002-HACK-remove-check-for-.git-to-prevent-errors.patch new file mode 100644 index 0000000..281b1b4 --- /dev/null +++ b/patches/libmemcached-0.44/0002-HACK-remove-check-for-.git-to-prevent-errors.patch @@ -0,0 +1,38 @@ +From 6c31950db7b22f6b55d175814297eeb0bf753a79 Mon Sep 17 00:00:00 2001 +From: George McCollister <[email protected]> +Date: Fri, 19 Nov 2010 13:38:53 -0600 +Subject: [PATCH 2/2] HACK remove check for .git to prevent errors + +If they see .git they force warnings as errors. Since ptxdist can apply +patches with git sometimes .git will be detected and on ARM, alignment +warnings will generate errors. I ran tests and the warnings on io.c:776 +and io.c:792 don't appear to indicate a real alignment issue on ARM +processors. This hack of a patch removes the check for the .git directory so +warnings as errors will not be forced. + +Signed-off-by: George McCollister <[email protected]> +--- + m4/pandora_vc_build.m4 | 7 +------ + 1 files changed, 1 insertions(+), 6 deletions(-) + +diff --git a/m4/pandora_vc_build.m4 b/m4/pandora_vc_build.m4 +index c1a8fba..df596f6 100644 +--- a/m4/pandora_vc_build.m4 ++++ b/m4/pandora_vc_build.m4 +@@ -27,12 +27,7 @@ AC_DEFUN([PANDORA_TEST_VC_DIR],[ + pandora_building_from_hg=no + fi + +- if test -d ".git" ; then +- pandora_building_from_git=yes +- pandora_building_from_vc=yes +- else +- pandora_building_from_git=no +- fi ++ pandora_building_from_git=no + ]) + + AC_DEFUN([PANDORA_BUILDING_FROM_VC],[ +-- +1.6.4.2 + diff --git a/patches/libmemcached-0.44/autogen.sh b/patches/libmemcached-0.44/autogen.sh new file mode 120000 index 0000000..9f8a4cb --- /dev/null +++ b/patches/libmemcached-0.44/autogen.sh @@ -0,0 +1 @@ +../autogen.sh \ No newline at end of file diff --git a/patches/libmemcached-0.44/series b/patches/libmemcached-0.44/series new file mode 100644 index 0000000..8d055ca --- /dev/null +++ b/patches/libmemcached-0.44/series @@ -0,0 +1,2 @@ +0001-make-murmur-hash-optional.patch +0002-HACK-remove-check-for-.git-to-prevent-errors.patch diff --git a/rules/libmemcached.in b/rules/libmemcached.in new file mode 100644 index 0000000..fa12ba6 --- /dev/null +++ b/rules/libmemcached.in @@ -0,0 +1,36 @@ +## SECTION=system_libraries + +menuconfig LIBMEMCACHED + tristate + prompt "libmemcached" + help + libmemcached is a C client library for interfacing to a memcached + server. It has been designed to be light on memory usage, thread + safe and to provide full access to server side methods. It also + implements several command line tools: memcat, memflush, memrm, + memstat, and memslap (for load generation). The library has been + designed to allow for different hashing methods on keys, + partitioning by keys, and to use consistent hashing for + distribution. + You can find more information here: http://tangent.org/552/libmemcached.html + + config LIBMEMCACHED_LIBHASHKIT + depends on LIBMEMCACHED + bool + prompt "install libhashkit" + help + If selected libhashkit will be included in the package. + + config LIBMEMCACHED_LIBMEMCACHEDUTIL + depends on LIBMEMCACHED + bool + prompt "install libmemcachedutil" + help + If selected libmemcachedutil will be included in the package. + + config LIBMEMCACHED_LIBMEMCACHEDPROTOCOL + depends on LIBMEMCACHED + bool + prompt "install libmemcachedprotocol" + help + If selected libmemcachedprotocol will be included in the package. diff --git a/rules/libmemcached.make b/rules/libmemcached.make new file mode 100644 index 0000000..0b9103d --- /dev/null +++ b/rules/libmemcached.make @@ -0,0 +1,79 @@ +# -*-makefile-*- +# +# Copyright (C) 2010 by NovaTech-LLC +# +# See CREDITS for details about who has contributed to this project. +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +PACKAGES-$(PTXCONF_LIBMEMCACHED) += libmemcached + +# +# Paths and names +# +LIBMEMCACHED_VERSION := 0.44 +LIBMEMCACHED := libmemcached-$(LIBMEMCACHED_VERSION) +LIBMEMCACHED_SUFFIX := tar.gz +LIBMEMCACHED_URL := http://launchpad.net/libmemcached/1.0/$(LIBMEMCACHED_VERSION)/+download/$(LIBMEMCACHED).$(LIBMEMCACHED_SUFFIX) +LIBMEMCACHED_SOURCE := $(SRCDIR)/$(LIBMEMCACHED).$(LIBMEMCACHED_SUFFIX) +LIBMEMCACHED_DIR := $(BUILDDIR)/$(LIBMEMCACHED) + +# ---------------------------------------------------------------------------- +# Prepare +# ---------------------------------------------------------------------------- + +LIBMEMCACHED_ENV := \ + $(CROSS_ENV) + +#We have libevent but disable it so clients/memslap doesn't build. +#It fails to link because __sync_fetch_and_sub_4 is missing. +LIBMEMCACHED_ENV += ac_cv_libevent=no + +# +# autoconf +# +LIBMEMCACHED_AUTOCONF := \ + $(CROSS_AUTOCONF_USR) \ + --without-memcached \ + --without-docs \ + --disable-libevent \ + --disable-libinnodb \ + --disable-sasl \ + --disable-murmur_hash +# ---------------------------------------------------------------------------- +# Target-Install +# ---------------------------------------------------------------------------- + +$(STATEDIR)/libmemcached.targetinstall: + @$(call targetinfo) + + @$(call install_init, libmemcached) + @$(call install_fixup, libmemcached, PRIORITY, optional) + @$(call install_fixup, libmemcached, SECTION, base) + @$(call install_fixup, libmemcached, AUTHOR, "NovaTech-LLC") + @$(call install_fixup, libmemcached, DESCRIPTION, missing) + + @$(call install_lib, libmemcached, 0, 0, 0644, libmemcached) + +ifdef PTXCONF_LIBMEMCACHED_LIBHASHKIT + @$(call install_lib, libmemcached, 0, 0, 0644, libhashkit) +endif + +ifdef PTXCONF_LIBMEMCACHED_LIBMEMCACHEDUTIL + @$(call install_lib, libmemcached, 0, 0, 0644, libmemcachedutil) +endif + +ifdef PTXCONF_LIBMEMCACHED_LIBMEMCACHEDPROTOCOL + @$(call install_lib, libmemcached, 0, 0, 0644, libmemcachedprotocol) +endif + + @$(call install_finish,libmemcached) + + @$(call touch) + +# vim: syntax=make -- 1.6.4.2 -- ptxdist mailing list [email protected]
