#include <stdlib.h>
#include <string.h>
#include <sys/time.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
#include <time.h>
#include "../lib/common.h"
free(list);
}
- free(stat);
+ memcached_stat_free(NULL, stat);
}
void add_host_test(memcached_st *memc)
value= memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_TCP_NODELAY);
assert(value == 1);
- memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_MD5_HASHING, &set);
- value= memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_MD5_HASHING);
- assert(value == 1);
+ set= MEMCACHED_HASH_MD5;
+ memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_HASH, &set);
+ value= memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_HASH);
+ assert(value == MEMCACHED_HASH_MD5);
set= 0;
value= memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_TCP_NODELAY);
assert(value == 0);
- memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_MD5_HASHING, &set);
- value= memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_MD5_HASHING);
- assert(value == 0);
+ set= MEMCACHED_HASH_DEFAULT;
+ memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_HASH, &set);
+ value= memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_HASH);
+ assert(value == MEMCACHED_HASH_DEFAULT);
+
+ set= MEMCACHED_HASH_CRC;
+ memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_HASH, &set);
+ value= memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_HASH);
+ assert(value == MEMCACHED_HASH_CRC);
value= memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_SOCKET_SEND_SIZE);
assert(value > 0);
memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_SOCKET_RECV_SIZE, &setter);
getter = memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_SOCKET_SEND_SIZE);
getter = memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_SOCKET_RECV_SIZE);
-#endif
for (x= 0, errors= 0, total= 0 ; total < 20 * 1024576 ; x++)
+#endif
+
+ for (x= 0, errors= 0, total= 0 ; total < 24576 ; x++)
{
memcached_return rc= MEMCACHED_SUCCESS;
char buffer[SMALL_STRING_LEN];
free(keys);
}
+void result_static(memcached_st *memc)
+{
+ memcached_result_st result;
+ memcached_result_st *result_ptr;
+
+ result_ptr= memcached_result_create(memc, &result);
+ assert(result.is_allocated == MEMCACHED_NOT_ALLOCATED);
+ assert(result_ptr);
+ memcached_result_free(&result);
+}
+
+void result_alloc(memcached_st *memc)
+{
+ memcached_result_st *result;
+
+ result= memcached_result_create(memc, NULL);
+ assert(result);
+ memcached_result_free(result);
+}
+
+void string_static_null(memcached_st *memc)
+{
+ memcached_string_st string;
+ memcached_string_st *string_ptr;
+
+ string_ptr= memcached_string_create(memc, &string, 0);
+ assert(string.is_allocated == MEMCACHED_NOT_ALLOCATED);
+ assert(string_ptr);
+ memcached_string_free(&string);
+}
+
void string_alloc_null(memcached_st *memc)
{
memcached_string_st *string;
- string= memcached_string_create(memc, 0);
+ string= memcached_string_create(memc, NULL, 0);
assert(string);
- memcached_string_free(memc, string);
+ memcached_string_free(string);
}
void string_alloc_with_size(memcached_st *memc)
{
memcached_string_st *string;
- string= memcached_string_create(memc, 1024);
+ string= memcached_string_create(memc, NULL, 1024);
assert(string);
- memcached_string_free(memc, string);
+ memcached_string_free(string);
}
void string_alloc_with_size_toobig(memcached_st *memc)
{
memcached_string_st *string;
- string= memcached_string_create(memc, INT64_MAX);
+ string= memcached_string_create(memc, NULL, INT64_MAX);
assert(string == NULL);
}
/* Ring the bell! */
memset(buffer, 6, SMALL_STRING_LEN);
- string= memcached_string_create(memc, 100);
+ string= memcached_string_create(memc, NULL, 100);
assert(string);
for (x= 0; x < 1024; x++)
{
memcached_return rc;
- rc= memcached_string_append(memc, string, buffer, SMALL_STRING_LEN);
+ rc= memcached_string_append(string, buffer, SMALL_STRING_LEN);
assert(rc == MEMCACHED_SUCCESS);
}
- memcached_string_free(memc, string);
+ memcached_string_free(string);
}
void string_alloc_append_toobig(memcached_st *memc)
/* Ring the bell! */
memset(buffer, 6, SMALL_STRING_LEN);
- string= memcached_string_create(memc, 100);
+ string= memcached_string_create(memc, NULL, 100);
assert(string);
for (x= 0; x < 1024; x++)
{
- rc= memcached_string_append(memc, string, buffer, SMALL_STRING_LEN);
+ rc= memcached_string_append(string, buffer, SMALL_STRING_LEN);
assert(rc == MEMCACHED_SUCCESS);
}
- rc= memcached_string_append(memc, string, buffer, INT64_MAX);
+ rc= memcached_string_append(string, buffer, INT64_MAX);
assert(rc == MEMCACHED_MEMORY_ALLOCATION_FAILURE);
- memcached_string_free(memc, string);
+ memcached_string_free(string);
}
void add_host_test1(memcached_st *memc)
memcached_server_list_free(servers);
}
-void pre_nonblock(memcached_st *memc)
+memcached_return pre_nonblock(memcached_st *memc)
{
memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_NO_BLOCK, NULL);
+
+ return MEMCACHED_SUCCESS;
+}
+
+memcached_return pre_md5(memcached_st *memc)
+{
+ memcached_hash value= MEMCACHED_HASH_MD5;
+ memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_HASH, &value);
+
+ return MEMCACHED_SUCCESS;
+}
+
+memcached_return pre_crc(memcached_st *memc)
+{
+ memcached_hash value= MEMCACHED_HASH_CRC;
+ memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_HASH, &value);
+
+ return MEMCACHED_SUCCESS;
+}
+
+memcached_return pre_hash_fnv1_64(memcached_st *memc)
+{
+ memcached_hash value= MEMCACHED_HASH_FNV1_64;
+ memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_HASH, &value);
+
+ return MEMCACHED_SUCCESS;
+}
+
+memcached_return pre_hash_fnv1a_64(memcached_st *memc)
+{
+ memcached_hash value= MEMCACHED_HASH_FNV1A_64;
+ memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_HASH, &value);
+
+ return MEMCACHED_SUCCESS;
}
-void pre_md5(memcached_st *memc)
+memcached_return pre_hash_fnv1_32(memcached_st *memc)
{
- memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_MD5_HASHING, NULL);
+ memcached_hash value= MEMCACHED_HASH_FNV1_32;
+ memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_HASH, &value);
+
+ return MEMCACHED_SUCCESS;
+}
+
+memcached_return pre_hash_fnv1a_32(memcached_st *memc)
+{
+ memcached_hash value= MEMCACHED_HASH_FNV1A_32;
+ memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_HASH, &value);
+
+ return MEMCACHED_SUCCESS;
+}
+
+memcached_return pre_hash_ketama(memcached_st *memc)
+{
+ memcached_hash value= MEMCACHED_HASH_KETAMA;
+ memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_HASH, &value);
+
+ return MEMCACHED_SUCCESS;
}
-void pre_nodelay(memcached_st *memc)
+memcached_return pre_unix_socket(memcached_st *memc)
+{
+ memcached_return rc;
+ struct stat buf;
+
+ memcached_server_list_free(memc->hosts);
+ memc->hosts= NULL;
+ memc->number_of_hosts= 0;
+
+ if (stat("/tmp/memcached.socket", &buf))
+ return MEMCACHED_FAILURE;
+
+ rc= memcached_server_add_unix_socket(memc, "/tmp/memcached.socket");
+
+ return rc;
+}
+
+memcached_return pre_nodelay(memcached_st *memc)
{
memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_NO_BLOCK, NULL);
memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_TCP_NODELAY, NULL);
+
+ return MEMCACHED_SUCCESS;
}
typedef struct collection_st collection_st;
struct collection_st {
char *name;
- void (*pre)(memcached_st *memc);
- void (*post)(memcached_st *memc);
+ memcached_return (*pre)(memcached_st *memc);
+ memcached_return (*post)(memcached_st *memc);
test_st *tests;
};
};
test_st string_tests[] ={
+ {"string static with null", 0, string_static_null },
{"string alloc with null", 0, string_alloc_null },
{"string alloc with 1K", 0, string_alloc_with_size },
{"string alloc with malloc failure", 0, string_alloc_with_size_toobig },
{0, 0, 0}
};
+ test_st result_tests[] ={
+ {"result static", 0, result_static},
+ {"result alloc", 0, result_alloc},
+ {0, 0, 0}
+ };
+
test_st user_tests[] ={
{"user_supplied_bug1", 0, user_supplied_bug1 },
{"user_supplied_bug2", 0, user_supplied_bug2 },
{"nonblock", pre_nonblock, 0, tests},
{"nodelay", pre_nodelay, 0, tests},
{"md5", pre_md5, 0, tests},
+ {"crc", pre_crc, 0, tests},
+ {"fnv1_64", pre_hash_fnv1_64, 0, tests},
+ {"fnv1a_64", pre_hash_fnv1a_64, 0, tests},
+ {"fnv1_32", pre_hash_fnv1_32, 0, tests},
+ {"fnv1a_32", pre_hash_fnv1a_32, 0, tests},
+ {"ketama", pre_hash_ketama, 0, tests},
+ {"unix_socket", pre_unix_socket, 0, tests},
+ {"unix_socket_nodelay", pre_nodelay, 0, tests},
{"string", 0, 0, string_tests},
+ {"result", 0, 0, result_tests},
{"user", 0, 0, user_tests},
{0, 0, 0, 0}
};
}
if (next->pre)
- next->pre(memc);
+ {
+ memcached_return rc;
+ rc= next->pre(memc);
+
+ if (rc != MEMCACHED_SUCCESS)
+ {
+ fprintf(stderr, "\t\t\t\t\t [ skipping ]\n");
+ goto error;
+ }
+ }
gettimeofday(&start_time, NULL);
run->function(memc);
load_time % 1000);
if (next->post)
- next->post(memc);
+ (void)next->post(memc);
assert(memc);
+error:
memcached_free(memc);
}
}