projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Sync protocol_binary.h with the memcached repository
[awesomized/libmemcached]
/
tests
/
atomsmasher.c
diff --git
a/tests/atomsmasher.c
b/tests/atomsmasher.c
index 92b57b9a54df2a834853922009b41d151e4de0b6..7c4c8ae396f7f0ceeed6befc3312916b1f3d754f 100644
(file)
--- a/
tests/atomsmasher.c
+++ b/
tests/atomsmasher.c
@@
-2,7
+2,6
@@
Sample test application.
*/
#include <assert.h>
Sample test application.
*/
#include <assert.h>
-#include <memcached.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@
-12,9
+11,9
@@
#include <unistd.h>
#include <time.h>
#include "server.h"
#include <unistd.h>
#include <time.h>
#include "server.h"
-#include "../lib/common.h"
-#include "../
src
/generator.h"
-#include "../
src
/execute.h"
+#include "../lib
memcached
/common.h"
+#include "../
clients
/generator.h"
+#include "../
clients
/execute.h"
#ifndef INT64_MAX
#define INT64_MAX LONG_MAX
#ifndef INT64_MAX
#define INT64_MAX LONG_MAX
@@
-37,14
+36,14
@@
static pairs_st *global_pairs;
static char *global_keys[GLOBAL_COUNT];
static size_t global_keys_length[GLOBAL_COUNT];
static char *global_keys[GLOBAL_COUNT];
static size_t global_keys_length[GLOBAL_COUNT];
-
uint8_t cleanup_pairs(memcached_st *memc
)
+
static test_return cleanup_pairs(memcached_st *memc __attribute__((unused))
)
{
pairs_free(global_pairs);
return 0;
}
{
pairs_free(global_pairs);
return 0;
}
-
uint8_t generate_pairs(memcached_st *memc
)
+
static test_return generate_pairs(memcached_st *memc __attribute__((unused))
)
{
unsigned long long x;
global_pairs= pairs_generate(GLOBAL_COUNT, 400);
{
unsigned long long x;
global_pairs= pairs_generate(GLOBAL_COUNT, 400);
@@
-59,7
+58,7
@@
uint8_t generate_pairs(memcached_st *memc)
return 0;
}
return 0;
}
-
uint8_t
drizzle(memcached_st *memc)
+
static test_return
drizzle(memcached_st *memc)
{
unsigned int x;
memcached_return rc;
{
unsigned int x;
memcached_return rc;
@@
-111,30
+110,28
@@
infinite:
return 0;
}
return 0;
}
-memcached_return pre_nonblock(memcached_st *memc)
+
static
memcached_return pre_nonblock(memcached_st *memc)
{
memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_NO_BLOCK, 0);
return MEMCACHED_SUCCESS;
}
{
memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_NO_BLOCK, 0);
return MEMCACHED_SUCCESS;
}
-memcached_return pre_md5(memcached_st *memc)
+
static
memcached_return pre_md5(memcached_st *memc)
{
{
- memcached_hash value= MEMCACHED_HASH_MD5;
- memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_HASH, value);
+ memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_HASH, (uint64_t)MEMCACHED_HASH_MD5);
return MEMCACHED_SUCCESS;
}
return MEMCACHED_SUCCESS;
}
-memcached_return pre_hsieh(memcached_st *memc)
+
static
memcached_return pre_hsieh(memcached_st *memc)
{
{
- memcached_hash value= MEMCACHED_HASH_HSIEH;
- memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_HASH, value);
+ memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_HASH, (uint64_t)MEMCACHED_HASH_HSIEH);
return MEMCACHED_SUCCESS;
}
return MEMCACHED_SUCCESS;
}
-memcached_return enable_consistent(memcached_st *memc)
+
static
memcached_return enable_consistent(memcached_st *memc)
{
memcached_server_distribution value= MEMCACHED_DISTRIBUTION_CONSISTENT;
memcached_hash hash;
{
memcached_server_distribution value= MEMCACHED_DISTRIBUTION_CONSISTENT;
memcached_hash hash;
@@
-155,7
+152,7
@@
memcached_return enable_consistent(memcached_st *memc)
Set the value, then quit to make sure it is flushed.
Come back in and test that add fails.
*/
Set the value, then quit to make sure it is flushed.
Come back in and test that add fails.
*/
-
uint8_t
add_test(memcached_st *memc)
+
static test_return
add_test(memcached_st *memc)
{
memcached_return rc;
char *key= "foo";
{
memcached_return rc;
char *key= "foo";
@@
-186,7
+183,7
@@
uint8_t add_test(memcached_st *memc)
* repeating add_tests many times
* may show a problem in timing
*/
* repeating add_tests many times
* may show a problem in timing
*/
-
uint8_t
many_adds(memcached_st *memc)
+
static test_return
many_adds(memcached_st *memc)
{
unsigned int i;
for (i = 0; i < TEST_COUNTER; i++){
{
unsigned int i;
for (i = 0; i < TEST_COUNTER; i++){
@@
-215,7
+212,7
@@
collection_st collection[] ={
#define SERVERS_TO_CREATE 5
#define SERVERS_TO_CREATE 5
-void *world_create(void)
+
static
void *world_create(void)
{
server_startup_st *construct;
{
server_startup_st *construct;
@@
-228,7
+225,7
@@
void *world_create(void)
return construct;
}
return construct;
}
-void world_destroy(void *p)
+
static
void world_destroy(void *p)
{
server_startup_st *construct= (server_startup_st *)p;
memcached_server_st *servers= (memcached_server_st *)construct->servers;
{
server_startup_st *construct= (server_startup_st *)p;
memcached_server_st *servers= (memcached_server_st *)construct->servers;