X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Ffunction.c;h=a580f396d1820e06ea532fa7689b130d423448d3;hb=98c99981e0ebe7f716bea2e4d95434d159103fcd;hp=c62e25c49416486503c84b85252507c446b5ac55;hpb=3d88ffa13ef86218ab0244e8e6490f4038cc193b;p=m6w6%2Flibmemcached diff --git a/tests/function.c b/tests/function.c index c62e25c4..a580f396 100644 --- a/tests/function.c +++ b/tests/function.c @@ -800,16 +800,16 @@ static test_return_t bad_key_test(memcached_st *memc) } #define READ_THROUGH_VALUE "set for me" -static memcached_return_t read_through_trigger(memcached_st *memc __attribute__((unused)), - char *key __attribute__((unused)), - size_t key_length __attribute__((unused)), - memcached_result_st *result) +static memcached_return_t read_through_trigger(memcached_st *memc __attribute__((unused)), + char *key __attribute__((unused)), + size_t key_length __attribute__((unused)), + memcached_result_st *result) { return memcached_result_set_value(result, READ_THROUGH_VALUE, strlen(READ_THROUGH_VALUE)); } -static test_return_t read_through(memcached_st *memc) +static test_return_t read_through(memcached_st *memc) { memcached_return_t rc; const char *key= "foo"; @@ -822,8 +822,8 @@ static test_return_t read_through(memcached_st *memc) &string_length, &flags, &rc); test_truth(rc == MEMCACHED_NOTFOUND); - test_truth(string_length == 0); - test_truth(!string); + test_false(string_length); + test_false(string); rc= memcached_callback_set(memc, MEMCACHED_CALLBACK_GET_FAILURE, *(void **)&cb); @@ -834,7 +834,7 @@ static test_return_t read_through(memcached_st *memc) test_truth(rc == MEMCACHED_SUCCESS); test_truth(string_length == strlen(READ_THROUGH_VALUE)); - test_truth(!strcmp(READ_THROUGH_VALUE, string)); + test_strcmp(READ_THROUGH_VALUE, string); free(string); string= memcached_get(memc, key, strlen(key), @@ -885,8 +885,8 @@ static test_return_t get_test(memcached_st *memc) &string_length, &flags, &rc); test_truth(rc == MEMCACHED_NOTFOUND); - test_truth(string_length == 0); - test_truth(!string); + test_false(string_length); + test_false(string); return TEST_SUCCESS; } @@ -1158,8 +1158,8 @@ static test_return_t stats_servername_test(memcached_st *memc) memcached_return_t rc; memcached_stat_st memc_stat; rc= memcached_stat_servername(&memc_stat, NULL, - memc->hosts[0].hostname, - memc->hosts[0].port); + memc->hosts[0].hostname, + memc->hosts[0].port); return TEST_SUCCESS; } @@ -1664,7 +1664,6 @@ static test_return_t get_stats_keys(memcached_st *memc) test_truth(rc == MEMCACHED_SUCCESS); for (ptr= stat_list; *ptr; ptr++) test_truth(*ptr); - fflush(stdout); free(stat_list); @@ -3554,26 +3553,65 @@ static test_return_t pre_replication_noblock(memcached_st *memc) static void my_free(memcached_st *ptr __attribute__((unused)), void *mem) { +#ifdef HARD_MALLOC_TESTS + void *real_ptr= (mem == NULL) ? mem : (void*)((caddr_t)mem - 8); + free(real_ptr); +#else free(mem); +#endif } static void *my_malloc(memcached_st *ptr __attribute__((unused)), const size_t size) { +#ifdef HARD_MALLOC_TESTS + void *ret= malloc(size + 8); + if (ret != NULL) + { + ret= (void*)((caddr_t)ret + 8); + } +#else void *ret= malloc(size); +#endif + if (ret != NULL) + { memset(ret, 0xff, size); + } return ret; } static void *my_realloc(memcached_st *ptr __attribute__((unused)), void *mem, const size_t size) { +#ifdef HARD_MALLOC_TESTS + void *real_ptr= (mem == NULL) ? NULL : (void*)((caddr_t)mem - 8); + void *nmem= realloc(real_ptr, size + 8); + + void *ret= NULL; + if (nmem != NULL) + { + ret= (void*)((caddr_t)nmem + 8); + } + + return ret; +#else return realloc(mem, size); +#endif } static void *my_calloc(memcached_st *ptr __attribute__((unused)), size_t nelem, const size_t size) { +#ifdef HARD_MALLOC_TESTS + void *mem= my_malloc(ptr, nelem * size); + if (mem) + { + memset(mem, 0, nelem * size); + } + + return mem; +#else return calloc(nelem, size); +#endif } static test_return_t set_prefix(memcached_st *memc) @@ -3718,7 +3756,27 @@ static test_return_t set_memory_alloc(memcached_st *memc) return TEST_SUCCESS; } -static test_return_t enable_consistent(memcached_st *memc) +static test_return_t enable_consistent_crc(memcached_st *memc) +{ + test_return_t rc; + memcached_server_distribution_t value= MEMCACHED_DISTRIBUTION_CONSISTENT; + memcached_hash_t hash; + memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_DISTRIBUTION, value); + if ((rc= pre_crc(memc)) != TEST_SUCCESS) + return rc; + + value= (memcached_server_distribution_t)memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_DISTRIBUTION); + test_truth(value == MEMCACHED_DISTRIBUTION_CONSISTENT); + + hash= (memcached_hash_t)memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_HASH); + + if (hash != MEMCACHED_HASH_CRC) + return TEST_SKIPPED; + + return TEST_SUCCESS; +} + +static test_return_t enable_consistent_hsieh(memcached_st *memc) { test_return_t rc; memcached_server_distribution_t value= MEMCACHED_DISTRIBUTION_CONSISTENT; @@ -5703,7 +5761,8 @@ collection_st collection[] ={ {"unix_socket_nodelay", (test_callback_fn)pre_nodelay, 0, tests}, {"poll_timeout", (test_callback_fn)poll_timeout, 0, tests}, {"gets", (test_callback_fn)enable_cas, 0, tests}, - {"consistent", (test_callback_fn)enable_consistent, 0, tests}, + {"consistent_crc", (test_callback_fn)enable_consistent_crc, 0, tests}, + {"consistent_hsieh", (test_callback_fn)enable_consistent_hsieh, 0, tests}, #ifdef MEMCACHED_ENABLE_DEPRECATED {"deprecated_memory_allocators", (test_callback_fn)deprecated_set_memory_alloc, 0, tests}, #endif @@ -5718,7 +5777,7 @@ collection_st collection[] ={ {"generate", 0, 0, generate_tests}, {"generate_hsieh", (test_callback_fn)pre_hsieh, 0, generate_tests}, {"generate_ketama", (test_callback_fn)pre_behavior_ketama, 0, generate_tests}, - {"generate_hsieh_consistent", (test_callback_fn)enable_consistent, 0, generate_tests}, + {"generate_hsieh_consistent", (test_callback_fn)enable_consistent_hsieh, 0, generate_tests}, {"generate_md5", (test_callback_fn)pre_md5, 0, generate_tests}, {"generate_murmur", (test_callback_fn)pre_murmur, 0, generate_tests}, {"generate_jenkins", (test_callback_fn)pre_jenkins, 0, generate_tests},