projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Updated release notes
[awesomized/libmemcached]
/
clients
/
memslap.c
diff --git
a/clients/memslap.c
b/clients/memslap.c
index d42c06aefffab36b64bd52f6a1754f50a2ae9557..0baff1df62a0db4990cde01dde9902eb3defccdc 100644
(file)
--- a/
clients/memslap.c
+++ b/
clients/memslap.c
@@
-1,3
+1,4
@@
+#include "libmemcached/common.h"
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@
-9,6
+10,7
@@
#include <sys/time.h>
#include <getopt.h>
#include <pthread.h>
#include <sys/time.h>
#include <getopt.h>
#include <pthread.h>
+#include <assert.h>
#include <libmemcached/memcached.h>
#include <libmemcached/memcached.h>
@@
-177,8
+179,7
@@
void scheduler(memcached_server_st *servers, conclusions_st *conclusion)
for (x= 0; x < opt_concurrency; x++)
{
thread_context_st *context;
for (x= 0; x < opt_concurrency; x++)
{
thread_context_st *context;
- context= (thread_context_st *)malloc(sizeof(thread_context_st));
- memset(context, 0, sizeof(thread_context_st));
+ context= (thread_context_st *)calloc(1, sizeof(thread_context_st));
context->memc= memcached_clone(NULL, memc);
context->test= opt_test;
context->memc= memcached_clone(NULL, memc);
context->test= opt_test;
@@
-371,6
+372,7
@@
void *run_task(void *p)
switch (context->test)
{
case SET_TEST:
switch (context->test)
{
case SET_TEST:
+ assert(context->execute_pairs);
execute_set(memc, context->execute_pairs, context->execute_number);
break;
case GET_TEST:
execute_set(memc, context->execute_pairs, context->execute_number);
break;
case GET_TEST: