X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;ds=sidebyside;f=tests%2Ffunction.c;h=86a255ba326a3bd956fa6b839e7dd27399b45bcb;hb=276c3db8d1dc8e14949df2b408960a803bea5d53;hp=182aa8c35bce03f86f12fe71b5e38767d354e797;hpb=d76b611a9173f8ea494b6287d768fdce39159958;p=awesomized%2Flibmemcached

diff --git a/tests/function.c b/tests/function.c
index 182aa8c3..86a255ba 100644
--- a/tests/function.c
+++ b/tests/function.c
@@ -1,6 +1,8 @@
 /*
   Sample test application.
 */
+#include "libmemcached/common.h"
+
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -11,8 +13,8 @@
 #include <unistd.h>
 #include <time.h>
 #include "server.h"
-#include "../clients/generator.h"
-#include "../clients/execute.h"
+#include "clients/generator.h"
+#include "clients/execute.h"
 
 #ifndef INT64_MAX
 #define INT64_MAX LONG_MAX
@@ -24,6 +26,11 @@
 
 #include "test.h"
 
+#ifdef HAVE_LIBMEMCACHEDUTIL
+#include <pthread.h>
+#include "libmemcached/memcached_util.h"
+#endif
+
 #define GLOBAL_COUNT 10000
 #define GLOBAL2_COUNT 100
 #define SERVERS_TO_CREATE 5
@@ -217,6 +224,7 @@ static test_return  clone_test(memcached_st *memc)
     assert(clone->hash_continuum == memc->hash_continuum);
     assert(clone->io_bytes_watermark == memc->io_bytes_watermark);
     assert(clone->io_msg_watermark == memc->io_msg_watermark);
+    assert(clone->io_key_prefetch == memc->io_key_prefetch);
     assert(clone->on_cleanup == memc->on_cleanup);
     assert(clone->on_clone == memc->on_clone);
     assert(clone->poll_timeout == memc->poll_timeout);
@@ -740,6 +748,7 @@ static test_return  read_through(memcached_st *memc)
   char *string;
   size_t string_length;
   uint32_t flags;
+  memcached_trigger_key cb= (memcached_trigger_key)read_through_trigger;
 
   string= memcached_get(memc, key, strlen(key),
                         &string_length, &flags, &rc);
@@ -748,7 +757,8 @@ static test_return  read_through(memcached_st *memc)
   assert(string_length ==  0);
   assert(!string);
 
-  rc= memcached_callback_set(memc, MEMCACHED_CALLBACK_GET_FAILURE, (void *)read_through_trigger);
+  rc= memcached_callback_set(memc, MEMCACHED_CALLBACK_GET_FAILURE,
+                             *(void **)&cb);
   assert(rc == MEMCACHED_SUCCESS);
 
   string= memcached_get(memc, key, strlen(key),
@@ -784,9 +794,9 @@ static test_return  delete_through(memcached_st *memc)
   memcached_trigger_delete_key callback;
   memcached_return rc;
 
-  callback= delete_trigger;
+  callback= (memcached_trigger_delete_key)delete_trigger;
 
-  rc= memcached_callback_set(memc, MEMCACHED_CALLBACK_DELETE_TRIGGER, (void*)callback);
+  rc= memcached_callback_set(memc, MEMCACHED_CALLBACK_DELETE_TRIGGER, *(void**)&callback);
   assert(rc == MEMCACHED_SUCCESS);
 
   return 0;
@@ -1452,24 +1462,31 @@ static test_return  callback_test(memcached_st *memc)
 
   /* Test Clone Callback */
   {
-    memcached_clone_func temp_function;
+    memcached_clone_func clone_cb= (memcached_clone_func)clone_test_callback;
+    void *clone_cb_ptr= *(void **)&clone_cb;
+    void *temp_function= NULL;
     memcached_return rc;
 
-    rc= memcached_callback_set(memc, MEMCACHED_CALLBACK_CLONE_FUNCTION, (void*)clone_test_callback);
+    rc= memcached_callback_set(memc, MEMCACHED_CALLBACK_CLONE_FUNCTION,
+                               clone_cb_ptr);
     assert(rc == MEMCACHED_SUCCESS);
-    temp_function= (memcached_clone_func)memcached_callback_get(memc, MEMCACHED_CALLBACK_CLONE_FUNCTION, &rc);
-    assert(temp_function == clone_test_callback);
+    temp_function= memcached_callback_get(memc, MEMCACHED_CALLBACK_CLONE_FUNCTION, &rc);
+    assert(temp_function == clone_cb_ptr);
   }
 
   /* Test Cleanup Callback */
   {
-    memcached_cleanup_func temp_function;
+    memcached_cleanup_func cleanup_cb=
+      (memcached_cleanup_func)cleanup_test_callback;
+    void *cleanup_cb_ptr= *(void **)&cleanup_cb;
+    void *temp_function= NULL;
     memcached_return rc;
 
-    rc= memcached_callback_set(memc, MEMCACHED_CALLBACK_CLONE_FUNCTION, (void*)cleanup_test_callback);
+    rc= memcached_callback_set(memc, MEMCACHED_CALLBACK_CLONE_FUNCTION,
+                               cleanup_cb_ptr);
     assert(rc == MEMCACHED_SUCCESS);
-    temp_function= (memcached_cleanup_func)memcached_callback_get(memc, MEMCACHED_CALLBACK_CLONE_FUNCTION, &rc);
-    assert(temp_function == cleanup_test_callback);
+    temp_function= memcached_callback_get(memc, MEMCACHED_CALLBACK_CLONE_FUNCTION, &rc);
+    assert(temp_function == cleanup_cb_ptr);
   }
 
   return 0;
@@ -2020,9 +2037,10 @@ static test_return  user_supplied_bug10(memcached_st *memc)
   {
     rc= memcached_set(mclone, key, key_len,value, value_length, 0, 0);
 
-    assert(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_WRITE_FAILURE || rc == MEMCACHED_BUFFERED);
+    assert(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_WRITE_FAILURE || 
+           rc == MEMCACHED_BUFFERED || rc == MEMCACHED_TIMEOUT);
 
-    if (rc == MEMCACHED_WRITE_FAILURE)
+    if (rc == MEMCACHED_WRITE_FAILURE || rc == MEMCACHED_TIMEOUT)
       x--;
   }
 
@@ -2295,7 +2313,7 @@ static test_return  user_supplied_bug17(memcached_st *memc)
   From Andrei on IRC
 */
 
-test_return user_supplied_bug19(memcached_st *memc)
+static test_return user_supplied_bug19(memcached_st *memc)
 {
   memcached_st *m;
   memcached_server_st *s;
@@ -2316,7 +2334,7 @@ test_return user_supplied_bug19(memcached_st *memc)
 }
 
 /* CAS test from Andei */
-test_return user_supplied_bug20(memcached_st *memc)
+static test_return user_supplied_bug20(memcached_st *memc)
 {
   memcached_return status;
   memcached_result_st *result, result_obj;
@@ -2348,7 +2366,7 @@ test_return user_supplied_bug20(memcached_st *memc)
 }
 
 #include "ketama_test_cases.h"
-test_return user_supplied_bug18(memcached_st *trash)
+static test_return user_supplied_bug18(memcached_st *trash)
 {
   memcached_return rc;
   int value;
@@ -2407,8 +2425,10 @@ test_return user_supplied_bug18(memcached_st *trash)
   return 0;
 }
 
-test_return auto_eject_hosts(memcached_st *trash)
+static test_return auto_eject_hosts(memcached_st *trash)
 {
+  (void) trash;
+
   memcached_return rc;
   memcached_st *memc= memcached_create(NULL);
   assert(memc);
@@ -2537,7 +2557,7 @@ static test_return  string_alloc_with_size_toobig(memcached_st *memc)
 {
   memcached_string_st *string;
 
-  string= memcached_string_create(memc, NULL, INT64_MAX);
+  string= memcached_string_create(memc, NULL, SIZE_MAX);
   assert(string == NULL);
 
   return 0;
@@ -2584,7 +2604,7 @@ static test_return  string_alloc_append_toobig(memcached_st *memc)
     rc= memcached_string_append(string, buffer, SMALL_STRING_LEN);
     assert(rc == MEMCACHED_SUCCESS);
   }
-  rc= memcached_string_append(string, buffer, INT64_MAX);
+  rc= memcached_string_append(string, buffer, SIZE_MAX);
   assert(rc == MEMCACHED_MEMORY_ALLOCATION_FAILURE);
   memcached_string_free(string);
 
@@ -2823,13 +2843,6 @@ static test_return  delete_buffer_generate(memcached_st *memc)
   return 0;
 }
 
-static test_return  free_data(memcached_st *memc __attribute__((unused)))
-{
-  pairs_free(global_pairs);
-
-  return 0;
-}
-
 static test_return  add_host_test1(memcached_st *memc)
 {
   unsigned int x;
@@ -2927,6 +2940,7 @@ static memcached_return  pre_hsieh(memcached_st *memc)
   memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_HASH, (uint64_t)MEMCACHED_HASH_HSIEH);
   return MEMCACHED_SUCCESS;
 #else
+  (void) memc;
   return MEMCACHED_FAILURE;
 #endif
 }
@@ -3021,7 +3035,7 @@ static void my_free(memcached_st *ptr __attribute__((unused)), void *mem)
 
 static void *my_malloc(memcached_st *ptr __attribute__((unused)), const size_t size)
 {
-  return malloc(size);
+  return calloc(1, size);
 }
 
 static void *my_realloc(memcached_st *ptr __attribute__((unused)), void *mem, const size_t size)
@@ -3098,37 +3112,45 @@ static memcached_return set_prefix(memcached_st *memc)
 
 static memcached_return  set_memory_alloc(memcached_st *memc)
 {
+  void *test_ptr= NULL;
+  void *cb_ptr= NULL;
   {
-    memcached_malloc_function test_ptr;
+    memcached_malloc_function malloc_cb= 
+      (memcached_malloc_function)my_malloc;
+    cb_ptr= *(void **)&malloc_cb;
     memcached_return rc;
 
-    rc= memcached_callback_set(memc, MEMCACHED_CALLBACK_MALLOC_FUNCTION, (void*)&my_malloc);
+    rc= memcached_callback_set(memc, MEMCACHED_CALLBACK_MALLOC_FUNCTION, cb_ptr);
     assert(rc == MEMCACHED_SUCCESS);
-    test_ptr= (memcached_malloc_function)memcached_callback_get(memc, MEMCACHED_CALLBACK_MALLOC_FUNCTION, &rc);
+    test_ptr= memcached_callback_get(memc, MEMCACHED_CALLBACK_MALLOC_FUNCTION, &rc);
     assert(rc == MEMCACHED_SUCCESS);
-    assert(test_ptr == my_malloc);
+    assert(test_ptr == cb_ptr);
   }
 
   {
-    memcached_realloc_function test_ptr;
+    memcached_realloc_function realloc_cb= 
+      (memcached_realloc_function)my_realloc;
+    cb_ptr= *(void **)&realloc_cb;
     memcached_return rc;
 
-    rc= memcached_callback_set(memc, MEMCACHED_CALLBACK_REALLOC_FUNCTION, (void*)&my_realloc);
+    rc= memcached_callback_set(memc, MEMCACHED_CALLBACK_REALLOC_FUNCTION, cb_ptr);
     assert(rc == MEMCACHED_SUCCESS);
-    test_ptr= (memcached_realloc_function)memcached_callback_get(memc, MEMCACHED_CALLBACK_REALLOC_FUNCTION, &rc);
+    test_ptr= memcached_callback_get(memc, MEMCACHED_CALLBACK_REALLOC_FUNCTION, &rc);
     assert(rc == MEMCACHED_SUCCESS);
-    assert(test_ptr == my_realloc);
+    assert(test_ptr == cb_ptr);
   }
 
   {
-    memcached_free_function test_ptr;
+    memcached_free_function free_cb= 
+      (memcached_free_function)my_free;
+    cb_ptr= *(void **)&free_cb;
     memcached_return rc;
 
-    rc= memcached_callback_set(memc, MEMCACHED_CALLBACK_FREE_FUNCTION, (void*)my_free);
+    rc= memcached_callback_set(memc, MEMCACHED_CALLBACK_FREE_FUNCTION, cb_ptr);
     assert(rc == MEMCACHED_SUCCESS);
-    test_ptr= (memcached_free_function)memcached_callback_get(memc, MEMCACHED_CALLBACK_FREE_FUNCTION, &rc);
+    test_ptr= memcached_callback_get(memc, MEMCACHED_CALLBACK_FREE_FUNCTION, &rc);
     assert(rc == MEMCACHED_SUCCESS);
-    assert(test_ptr == my_free);
+    assert(test_ptr == cb_ptr);
   }
 
   return MEMCACHED_SUCCESS;
@@ -3274,7 +3296,7 @@ static test_return noreply_test(memcached_st *memc)
     ** way it is supposed to do!!!!
     */
     int no_msg=0;
-    for (int x=0; x < memc->number_of_hosts; ++x)
+    for (uint32_t x=0; x < memc->number_of_hosts; ++x)
       no_msg+=memc->hosts[x].cursor_active;
 
     assert(no_msg == 0);
@@ -3368,6 +3390,67 @@ static test_return analyzer_test(memcached_st *memc)
   return TEST_SUCCESS;
 }
 
+#ifdef HAVE_LIBMEMCACHEDUTIL
+static void* connection_release(void *arg) {
+  struct {
+    memcached_pool_st* pool;
+    memcached_st* mmc;
+  } *resource= arg;
+
+  usleep(250);
+  assert(memcached_pool_push(resource->pool, resource->mmc) == MEMCACHED_SUCCESS);
+  return arg;
+}
+
+static test_return connection_pool_test(memcached_st *memc)
+{
+  memcached_pool_st* pool= memcached_pool_create(memc, 5, 10);
+  assert(pool != NULL);
+  memcached_st* mmc[10];
+  memcached_return rc;
+
+  for (int x= 0; x < 10; ++x) {
+    mmc[x]= memcached_pool_pop(pool, false, &rc);
+    assert(mmc[x] != NULL);
+    assert(rc == MEMCACHED_SUCCESS);
+  }
+
+  assert(memcached_pool_pop(pool, false, &rc) == NULL);
+  assert(rc == MEMCACHED_SUCCESS);
+
+  pthread_t tid;
+  struct {
+    memcached_pool_st* pool;
+    memcached_st* mmc;
+  } item= { .pool = pool, .mmc = mmc[9] };
+  pthread_create(&tid, NULL, connection_release, &item);
+  mmc[9]= memcached_pool_pop(pool, true, &rc);
+  assert(rc == MEMCACHED_SUCCESS);
+  pthread_join(tid, NULL);
+  assert(mmc[9] == item.mmc);
+  const char *key= "key";
+  size_t keylen= strlen(key);
+
+  // verify that I can do ops with all connections
+  rc= memcached_set(mmc[0], key, keylen, "0", 1, 0, 0);
+  assert(rc == MEMCACHED_SUCCESS);
+
+  for (unsigned int x= 0; x < 10; ++x) {
+    uint64_t number_value;
+    rc= memcached_increment(mmc[x], key, keylen, 1, &number_value);
+    assert(rc == MEMCACHED_SUCCESS);
+    assert(number_value == (x+1));
+  }
+
+  // Release them..
+  for (int x= 0; x < 10; ++x)
+    assert(memcached_pool_push(pool, mmc[x]) == MEMCACHED_SUCCESS);
+
+  assert(memcached_pool_destroy(pool) == memc);
+  return TEST_SUCCESS;
+}
+#endif
+
 static void increment_request_id(uint16_t *id)
 {
   (*id)++;
@@ -3534,7 +3617,7 @@ static test_return udp_set_too_big_test(memcached_st *memc)
   return post_udp_op_check(memc,expected_ids);
 }
 
-test_return udp_delete_test(memcached_st *memc)
+static test_return udp_delete_test(memcached_st *memc)
 {
   unsigned int x= 0;
   unsigned int num_iters= 1025; //request id rolls over at 1024
@@ -3567,7 +3650,7 @@ static test_return udp_buffered_delete_test(memcached_st *memc)
   return udp_delete_test(memc);
 }
 
-test_return udp_verbosity_test(memcached_st *memc)
+static test_return udp_verbosity_test(memcached_st *memc)
 {
   memcached_return rc;
   uint16_t *expected_ids= get_udp_request_ids(memc);
@@ -3580,14 +3663,14 @@ test_return udp_verbosity_test(memcached_st *memc)
   return post_udp_op_check(memc,expected_ids);
 }
 
-test_return udp_quit_test(memcached_st *memc)
+static test_return udp_quit_test(memcached_st *memc)
 {
   uint16_t *expected_ids= get_udp_request_ids(memc);
   memcached_quit(memc);
   return post_udp_op_check(memc, expected_ids);
 }
 
-test_return udp_flush_test(memcached_st *memc)
+static test_return udp_flush_test(memcached_st *memc)
 {
   memcached_return rc;
   uint16_t *expected_ids= get_udp_request_ids(memc);
@@ -3600,7 +3683,7 @@ test_return udp_flush_test(memcached_st *memc)
   return post_udp_op_check(memc,expected_ids);
 }
 
-test_return udp_incr_test(memcached_st *memc)
+static test_return udp_incr_test(memcached_st *memc)
 {
   memcached_return rc;
   char *key= "incr";
@@ -3619,7 +3702,7 @@ test_return udp_incr_test(memcached_st *memc)
   return post_udp_op_check(memc, expected_ids);
 }
 
-test_return udp_decr_test(memcached_st *memc)
+static test_return udp_decr_test(memcached_st *memc)
 {
   memcached_return rc;
   char *key= "decr";
@@ -3639,7 +3722,7 @@ test_return udp_decr_test(memcached_st *memc)
 }
 
 
-test_return udp_stat_test(memcached_st *memc)
+static test_return udp_stat_test(memcached_st *memc)
 {
   memcached_stat_st * rv= NULL;
   memcached_return rc;
@@ -3651,7 +3734,7 @@ test_return udp_stat_test(memcached_st *memc)
   return post_udp_op_check(memc, expected_ids);
 }
 
-test_return udp_version_test(memcached_st *memc)
+static test_return udp_version_test(memcached_st *memc)
 {
   memcached_return rc;
   uint16_t *expected_ids = get_udp_request_ids(memc);
@@ -3660,7 +3743,7 @@ test_return udp_version_test(memcached_st *memc)
   return post_udp_op_check(memc, expected_ids);
 }
 
-test_return udp_get_test(memcached_st *memc)
+static test_return udp_get_test(memcached_st *memc)
 {
   memcached_return rc;
   char *key= "foo";
@@ -3672,7 +3755,7 @@ test_return udp_get_test(memcached_st *memc)
   return post_udp_op_check(memc, expected_ids);
 }
 
-test_return udp_mixed_io_test(memcached_st *memc)
+static test_return udp_mixed_io_test(memcached_st *memc)
 {
   test_st current_op;
   test_st mixed_io_ops [] ={
@@ -3695,7 +3778,7 @@ test_return udp_mixed_io_test(memcached_st *memc)
   return TEST_SUCCESS;
 }
 
-test_return hsieh_avaibility_test (memcached_st *memc)
+static test_return hsieh_avaibility_test (memcached_st *memc)
 {
   memcached_return expected_rc= MEMCACHED_FAILURE;
 #ifdef HAVE_HSIEH_HASH
@@ -3742,6 +3825,9 @@ test_st tests[] ={
   {"server_sort", 0, server_sort_test},
   {"server_sort2", 0, server_sort2_test},
   {"clone_test", 0, clone_test },
+  {"connection_test", 0, connection_test},
+  {"callback_test", 0, callback_test},
+  {"behavior_test", 0, behavior_test},
   {"error", 0, error_test },
   {"set", 0, set_test },
   {"set2", 0, set_test2 },
@@ -3777,6 +3863,9 @@ test_st tests[] ={
   {"delete_through", 1, delete_through },
   {"noreply", 1, noreply_test},
   {"analyzer", 1, analyzer_test},
+#ifdef HAVE_LIBMEMCACHEDUTIL
+  {"connectionpool", 1, connection_pool_test },
+#endif
   {0, 0, 0}
 };