projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Extended server_sort_test() test.
[m6w6/libmemcached]
/
tests
/
atomsmasher.c
diff --git
a/tests/atomsmasher.c
b/tests/atomsmasher.c
index c43788775b75c58676bf1ac9530142228b4738ba..11b4258f55f9387c9d16d51533cd9981cc7ba2cd 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
@@
-113,23
+112,21
@@
infinite:
memcached_return pre_nonblock(memcached_st *memc)
{
memcached_return pre_nonblock(memcached_st *memc)
{
- memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_NO_BLOCK,
NULL
);
+ memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_NO_BLOCK,
0
);
return MEMCACHED_SUCCESS;
}
memcached_return pre_md5(memcached_st *memc)
{
return MEMCACHED_SUCCESS;
}
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;
}
memcached_return pre_hsieh(memcached_st *memc)
{
return MEMCACHED_SUCCESS;
}
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;
}
@@
-138,7
+135,7
@@
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;
- memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_DISTRIBUTION,
&
value);
+ memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_DISTRIBUTION, value);
pre_hsieh(memc);
value= (memcached_server_distribution)memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_DISTRIBUTION);
pre_hsieh(memc);
value= (memcached_server_distribution)memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_DISTRIBUTION);