projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Updated copyright headers.
[m6w6/libmemcached]
/
tests
/
atomsmasher.c
diff --git
a/tests/atomsmasher.c
b/tests/atomsmasher.c
index c43788775b75c58676bf1ac9530142228b4738ba..90f7e8f72a6674018bcc6eb9616e1ec320340a28 100644
(file)
--- a/
tests/atomsmasher.c
+++ b/
tests/atomsmasher.c
@@
-1,8
+1,20
@@
+/* LibMemcached
+ * Copyright (C) 2006-2009 Brian Aker
+ * All rights reserved.
+ *
+ * Use and distribution licensed under the BSD license. See
+ * the COPYING file in the parent directory for full text.
+ *
+ * Summary:
+ *
+ */
+
/*
Sample test application.
*/
/*
Sample test application.
*/
+#include "libmemcached/common.h"
+
#include <assert.h>
#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
+24,8
@@
#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 "../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
+48,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_t 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_t 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,10
+70,10
@@
uint8_t generate_pairs(memcached_st *memc)
return 0;
}
return 0;
}
-
uint8
_t drizzle(memcached_st *memc)
+
static test_return
_t drizzle(memcached_st *memc)
{
unsigned int x;
{
unsigned int x;
- memcached_return rc;
+ memcached_return
_t
rc;
char *return_value;
size_t return_value_length;
uint32_t flags;
char *return_value;
size_t return_value_length;
uint32_t flags;
@@
-73,8
+84,8
@@
infinite:
uint32_t test_bit;
uint8_t which;
uint32_t test_bit;
uint8_t which;
- test_bit=
random() % GLOBAL_COUNT
;
- which=
random() % 2
;
+ test_bit=
(uint32_t)(random() % GLOBAL_COUNT)
;
+ which=
(uint8_t)(random() % 2)
;
if (which == 0)
{
if (which == 0)
{
@@
-111,40
+122,38
@@
infinite:
return 0;
}
return 0;
}
-
memcached_return
pre_nonblock(memcached_st *memc)
+
static memcached_return_t
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;
}
return MEMCACHED_SUCCESS;
}
-
memcached_return
pre_md5(memcached_st *memc)
+
static memcached_return_t
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_t
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_t
enable_consistent(memcached_st *memc)
{
{
- memcached_server_distribution value= MEMCACHED_DISTRIBUTION_CONSISTENT;
- memcached_hash hash;
- memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_DISTRIBUTION,
&
value);
+ memcached_server_distribution
_t
value= MEMCACHED_DISTRIBUTION_CONSISTENT;
+ memcached_hash
_t
hash;
+ memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_DISTRIBUTION, value);
pre_hsieh(memc);
pre_hsieh(memc);
- value= (memcached_server_distribution)memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_DISTRIBUTION);
+ value= (memcached_server_distribution
_t
)memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_DISTRIBUTION);
assert(value == MEMCACHED_DISTRIBUTION_CONSISTENT);
assert(value == MEMCACHED_DISTRIBUTION_CONSISTENT);
- hash= (memcached_hash)memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_HASH);
+ hash= (memcached_hash
_t
)memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_HASH);
assert(hash == MEMCACHED_HASH_HSIEH);
assert(hash == MEMCACHED_HASH_HSIEH);
@@
-155,11
+164,11
@@
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
_t add_test(memcached_st *memc)
{
{
- memcached_return rc;
- char *key= "foo";
- char *value= "when we sanitize";
+ memcached_return
_t
rc;
+ c
onst c
har *key= "foo";
+ c
onst c
har *value= "when we sanitize";
unsigned long long setting_value;
setting_value= memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_NO_BLOCK);
unsigned long long setting_value;
setting_value= memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_NO_BLOCK);
@@
-167,7
+176,7
@@
uint8_t add_test(memcached_st *memc)
rc= memcached_set(memc, key, strlen(key),
value, strlen(value),
(time_t)0, (uint32_t)0);
rc= memcached_set(memc, key, strlen(key),
value, strlen(value),
(time_t)0, (uint32_t)0);
-
assert
(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED);
+
test_truth
(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED);
memcached_quit(memc);
rc= memcached_add(memc, key, strlen(key),
value, strlen(value),
memcached_quit(memc);
rc= memcached_add(memc, key, strlen(key),
value, strlen(value),
@@
-175,9
+184,13
@@
uint8_t add_test(memcached_st *memc)
/* Too many broken OS'es have broken loopback in async, so we can't be sure of the result */
if (setting_value)
/* Too many broken OS'es have broken loopback in async, so we can't be sure of the result */
if (setting_value)
- assert(rc == MEMCACHED_NOTSTORED || MEMCACHED_STORED);
+ {
+ test_truth(rc == MEMCACHED_NOTSTORED || rc == MEMCACHED_STORED);
+ }
else
else
- assert(rc == MEMCACHED_NOTSTORED);
+ {
+ test_truth(rc == MEMCACHED_NOTSTORED);
+ }
return 0;
}
return 0;
}
@@
-186,10
+199,11
@@
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
_t many_adds(memcached_st *memc)
{
unsigned int i;
{
unsigned int i;
- for (i = 0; i < TEST_COUNTER; i++){
+ for (i = 0; i < TEST_COUNTER; i++)
+ {
add_test(memc);
}
return 0;
add_test(memc);
}
return 0;
@@
-215,7
+229,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
+242,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;