projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Update framework.
[m6w6/libmemcached]
/
tests
/
libmemcached-1.0
/
atomsmasher.cc
diff --git
a/tests/libmemcached-1.0/atomsmasher.cc
b/tests/libmemcached-1.0/atomsmasher.cc
index bab25d031c04e4d9af33d7602b2da261b90b0566..23d6dd238cdbedefc8b2cc87f6d4fb48a4913986 100644
(file)
--- a/
tests/libmemcached-1.0/atomsmasher.cc
+++ b/
tests/libmemcached-1.0/atomsmasher.cc
@@
-41,7
+41,6
@@
using namespace libtest;
/* Number of times to run the test loop */
#define TEST_COUNTER 500000
/* Number of times to run the test loop */
#define TEST_COUNTER 500000
-static uint32_t global_count;
static pairs_st *global_pairs;
static char *global_keys[GLOBAL_COUNT];
static pairs_st *global_pairs;
static char *global_keys[GLOBAL_COUNT];
@@
-57,9
+56,8
@@
static test_return_t cleanup_pairs(memcached_st *)
static test_return_t generate_pairs(memcached_st *)
{
global_pairs= pairs_generate(GLOBAL_COUNT, 400);
static test_return_t generate_pairs(memcached_st *)
{
global_pairs= pairs_generate(GLOBAL_COUNT, 400);
- global_count= GLOBAL_COUNT;
- for (
size_t x= 0; x < global_count
; x++)
+ for (
ptrdiff_t x= 0; x < GLOBAL_COUNT
; x++)
{
global_keys[x]= global_pairs[x].key;
global_keys_length[x]= global_pairs[x].key_length;
{
global_keys[x]= global_pairs[x].key;
global_keys_length[x]= global_pairs[x].key_length;
@@
-71,7
+69,7
@@
static test_return_t generate_pairs(memcached_st *)
static test_return_t drizzle(memcached_st *memc)
{
infinite:
static test_return_t drizzle(memcached_st *memc)
{
infinite:
- for (
size
_t x= 0; x < TEST_COUNTER; x++)
+ for (
ptrdiff
_t x= 0; x < TEST_COUNTER; x++)
{
memcached_return_t rc;
char *return_value;
{
memcached_return_t rc;
char *return_value;
@@
-174,7
+172,7
@@
static test_return_t add_test(memcached_st *memc)
static test_return_t many_adds(memcached_st *memc)
{
test_true(memc);
static test_return_t many_adds(memcached_st *memc)
{
test_true(memc);
- for (
size
_t x= 0; x < TEST_COUNTER; x++)
+ for (
ptrdiff
_t x= 0; x < TEST_COUNTER; x++)
{
test_compare_got(TEST_SUCCESS, add_test(memc), x);
}
{
test_compare_got(TEST_SUCCESS, add_test(memc), x);
}
@@
-203,7
+201,7
@@
static test_return_t memcached_create_benchmark(memcached_st *)
{
benchmark_state.create_init= true;
{
benchmark_state.create_init= true;
- for (
size
_t x= 0; x < BENCHMARK_TEST_LOOP; x++)
+ for (
ptrdiff
_t x= 0; x < BENCHMARK_TEST_LOOP; x++)
{
memcached_st *ptr;
ptr= memcached_create(&benchmark_state.create[x]);
{
memcached_st *ptr;
ptr= memcached_create(&benchmark_state.create[x]);
@@
-218,10
+216,9
@@
static test_return_t memcached_clone_benchmark(memcached_st *memc)
{
benchmark_state.clone_init= true;
{
benchmark_state.clone_init= true;
- for (
size
_t x= 0; x < BENCHMARK_TEST_LOOP; x++)
+ for (
ptrdiff
_t x= 0; x < BENCHMARK_TEST_LOOP; x++)
{
{
- memcached_st *ptr;
- ptr= memcached_clone(&benchmark_state.clone[x], memc);
+ memcached_st *ptr= memcached_clone(&benchmark_state.clone[x], memc);
test_true(ptr);
}
test_true(ptr);
}
@@
-243,7
+240,7
@@
static test_return_t pre_allocate(memcached_st *)
static test_return_t post_allocate(memcached_st *)
{
static test_return_t post_allocate(memcached_st *)
{
- for (
size
_t x= 0; x < BENCHMARK_TEST_LOOP; x++)
+ for (
ptrdiff
_t x= 0; x < BENCHMARK_TEST_LOOP; x++)
{
if (benchmark_state.create_init)
{
{
if (benchmark_state.create_init)
{
@@
-278,8
+275,6
@@
collection_st collection[] ={
};
};
-#define TEST_PORT_BASE MEMCACHED_DEFAULT_PORT +10
-
#include "tests/libmemcached_world.h"
void get_world(Framework *world)
#include "tests/libmemcached_world.h"
void get_world(Framework *world)
@@
-298,5
+293,5
@@
void get_world(Framework *world)
world->collection_startup= (test_callback_fn*)world_container_startup;
world->collection_shutdown= (test_callback_fn*)world_container_shutdown;
world->collection_startup= (test_callback_fn*)world_container_startup;
world->collection_shutdown= (test_callback_fn*)world_container_shutdown;
- world->set_runner(
&defualt_libmemcached_r
unner);
+ world->set_runner(
new LibmemcachedR
unner);
}
}