projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Updated headers for version 21
[m6w6/libmemcached]
/
clients
/
memslap.c
diff --git
a/clients/memslap.c
b/clients/memslap.c
index 164fc0993dfdd961ab3d6eaf0f4f6a88e4ca2349..6fc8176f75cbd1e855b24078f23297bbdb6eb038 100644
(file)
--- a/
clients/memslap.c
+++ b/
clients/memslap.c
@@
-6,7
+6,6
@@
#include <sys/types.h>
#include <sys/mman.h>
#include <fcntl.h>
#include <sys/types.h>
#include <sys/mman.h>
#include <fcntl.h>
-#include <assert.h>
#include <sys/time.h>
#include <getopt.h>
#include <pthread.h>
#include <sys/time.h>
#include <getopt.h>
#include <pthread.h>
@@
-148,11
+147,10
@@
void scheduler(memcached_server_st *servers, conclusions_st *conclusion)
/* We set this after we have loaded */
{
/* We set this after we have loaded */
{
- unsigned int value= 1;
if (opt_non_blocking_io)
if (opt_non_blocking_io)
- memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_NO_BLOCK,
&value
);
+ memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_NO_BLOCK,
1
);
if (opt_tcp_nodelay)
if (opt_tcp_nodelay)
- memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_TCP_NODELAY,
&value
);
+ memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_TCP_NODELAY,
1
);
}
}
@@
-220,6
+218,7
@@
void scheduler(memcached_server_st *servers, conclusions_st *conclusion)
conclusion->load_time= timedif(end_time, start_time);
conclusion->read_time= timedif(end_time, start_time);
pairs_free(pairs);
conclusion->load_time= timedif(end_time, start_time);
conclusion->read_time= timedif(end_time, start_time);
pairs_free(pairs);
+ memcached_free(memc);
}
void options_parse(int argc, char *argv[])
}
void options_parse(int argc, char *argv[])
@@
-354,6
+353,7
@@
void *run_task(void *p)
if (context->execute_pairs)
pairs_free(context->execute_pairs);
if (context->execute_pairs)
pairs_free(context->execute_pairs);
+
free(context);
pthread_mutex_lock(&counter_mutex);
free(context);
pthread_mutex_lock(&counter_mutex);
@@
-377,7
+377,7
@@
pairs_st *load_create_data(memcached_st *memc, unsigned int number_of,
clone= memcached_clone(NULL, memc);
/* We always used non-blocking IO for load since it is faster */
clone= memcached_clone(NULL, memc);
/* We always used non-blocking IO for load since it is faster */
- memcached_behavior_set(clone, MEMCACHED_BEHAVIOR_NO_BLOCK,
NULL
);
+ memcached_behavior_set(clone, MEMCACHED_BEHAVIOR_NO_BLOCK,
0
);
pairs= pairs_generate(number_of, 400);
*actual_loaded= execute_set(clone, pairs, number_of);
pairs= pairs_generate(number_of, 400);
*actual_loaded= execute_set(clone, pairs, number_of);