projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Changed how I disabled the Wconversion warning.
[awesomized/libmemcached]
/
clients
/
memslap.c
diff --git
a/clients/memslap.c
b/clients/memslap.c
index 0baff1df62a0db4990cde01dde9902eb3defccdc..5e747b23fc58ee9789beda3e590b3634841e1b05 100644
(file)
--- a/
clients/memslap.c
+++ b/
clients/memslap.c
@@
-147,7
+147,6
@@
void scheduler(memcached_server_st *servers, conclusions_st *conclusion)
if (opt_udp_io)
{
memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_USE_UDP, opt_udp_io);
if (opt_udp_io)
{
memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_USE_UDP, opt_udp_io);
- unsigned int x= 0;
for(x= 0; x < servers[0].count; x++ )
servers[x].type= MEMCACHED_CONNECTION_UDP;
}
for(x= 0; x < servers[0].count; x++ )
servers[x].type= MEMCACHED_CONNECTION_UDP;
}
@@
-378,6
+377,9
@@
void *run_task(void *p)
case GET_TEST:
execute_get(memc, context->initial_pairs, context->initial_number);
break;
case GET_TEST:
execute_get(memc, context->initial_pairs, context->initial_number);
break;
+ default:
+ WATCHPOINT_ASSERT(context->test);
+ break;
}
memcached_free(memc);
}
memcached_free(memc);
@@
-403,17
+405,17
@@
void flush_all(memcached_st *memc)
pairs_st *load_create_data(memcached_st *memc, unsigned int number_of,
unsigned int *actual_loaded)
{
pairs_st *load_create_data(memcached_st *memc, unsigned int number_of,
unsigned int *actual_loaded)
{
- memcached_st *clone;
+ memcached_st *
memc_
clone;
pairs_st *pairs;
pairs_st *pairs;
- clone= memcached_clone(NULL, memc);
+
memc_
clone= memcached_clone(NULL, memc);
/* We always used non-blocking IO for load since it is faster */
/* We always used non-blocking IO for load since it is faster */
- memcached_behavior_set(clone, MEMCACHED_BEHAVIOR_NO_BLOCK, 0);
+ memcached_behavior_set(
memc_
clone, MEMCACHED_BEHAVIOR_NO_BLOCK, 0);
pairs= pairs_generate(number_of, 400);
pairs= pairs_generate(number_of, 400);
- *actual_loaded= execute_set(clone, pairs, number_of);
+ *actual_loaded= execute_set(
memc_
clone, pairs, number_of);
- memcached_free(clone);
+ memcached_free(
memc_
clone);
return pairs;
}
return pairs;
}