projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merging Trond
[m6w6/libmemcached]
/
tests
/
atomsmasher.c
diff --git
a/tests/atomsmasher.c
b/tests/atomsmasher.c
index 08aa86f7f7cb3d72f30cb15ba4efb12ca97a8240..19ad086ad624565330890fcdf0030e1ae39267f0 100644
(file)
--- a/
tests/atomsmasher.c
+++ b/
tests/atomsmasher.c
@@
-1,6
+1,8
@@
/*
Sample test application.
*/
/*
Sample test application.
*/
+#include "libmemcached/common.h"
+
#include <assert.h>
#include <stdio.h>
#include <stdlib.h>
#include <assert.h>
#include <stdio.h>
#include <stdlib.h>
@@
-11,7
+13,6
@@
#include <unistd.h>
#include <time.h>
#include "server.h"
#include <unistd.h>
#include <time.h>
#include "server.h"
-#include "../libmemcached/common.h"
#include "../clients/generator.h"
#include "../clients/execute.h"
#include "../clients/generator.h"
#include "../clients/execute.h"
@@
-36,14
+37,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];
-static test_return cleanup_pairs(memcached_st *memc __attribute__((unused)))
+static test_return
_t
cleanup_pairs(memcached_st *memc __attribute__((unused)))
{
pairs_free(global_pairs);
return 0;
}
{
pairs_free(global_pairs);
return 0;
}
-static test_return generate_pairs(memcached_st *memc __attribute__((unused)))
+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);
@@
-58,7
+59,7
@@
static test_return generate_pairs(memcached_st *memc __attribute__((unused)))
return 0;
}
return 0;
}
-static test_return drizzle(memcached_st *memc)
+static test_return
_t
drizzle(memcached_st *memc)
{
unsigned int x;
memcached_return rc;
{
unsigned int x;
memcached_return rc;
@@
-72,8
+73,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)
{
@@
-152,11
+153,11
@@
static 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.
*/
-static test_return add_test(memcached_st *memc)
+static test_return
_t
add_test(memcached_st *memc)
{
memcached_return rc;
{
memcached_return rc;
- char *key= "foo";
- char *value= "when we sanitize";
+ 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);
@@
-172,7
+173,7
@@
static test_return 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);
+ assert(rc == MEMCACHED_NOTSTORED ||
rc ==
MEMCACHED_STORED);
else
assert(rc == MEMCACHED_NOTSTORED);
else
assert(rc == MEMCACHED_NOTSTORED);
@@
-183,7
+184,7
@@
static test_return 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
*/
-static test_return many_adds(memcached_st *memc)
+static test_return
_t
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++)