projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
memcached_dump: ignore CLIENT_ERROR Illegal slab id
[awesomized/libmemcached]
/
clients
/
generator.cc
diff --git
a/clients/generator.cc
b/clients/generator.cc
index 011ed3a499bb778ed5963d3695d4cb48088967b3..1f40daedbc6fd21a1b70fac8c6433d1c892d5ded 100644
(file)
--- a/
clients/generator.cc
+++ b/
clients/generator.cc
@@
-1,4
+1,5
@@
/* LibMemcached
/* LibMemcached
+ * Copyright (C) 2011-2012 Data Differential, http://datadifferential.com/
* Copyright (C) 2006-2009 Brian Aker
* All rights reserved.
*
* Copyright (C) 2006-2009 Brian Aker
* All rights reserved.
*
@@
-9,7
+10,7
@@
*
*/
*
*/
-#include <config.h>
+#include <
mem_
config.h>
#include <stdint.h>
#include <stdint.h>
@@
-19,7
+20,9
@@
#include <iostream>
#include <unistd.h>
#include <iostream>
#include <unistd.h>
-#include "generator.h"
+#include "clients/generator.h"
+
+#define KEY_BYTES 20
/* Use this for string generation */
static const char ALPHANUMERICS[]=
/* Use this for string generation */
static const char ALPHANUMERICS[]=
@@
-32,26
+35,32
@@
static size_t get_alpha_num(void)
return (size_t)random() % ALPHANUMERICS_SIZE;
}
return (size_t)random() % ALPHANUMERICS_SIZE;
}
-
static
void get_random_string(char *buffer, size_t size)
+void get_random_string(char *buffer, size_t size)
{
char *buffer_ptr= buffer;
while (--size)
{
char *buffer_ptr= buffer;
while (--size)
+ {
*buffer_ptr++= ALPHANUMERICS[get_alpha_num()];
*buffer_ptr++= ALPHANUMERICS[get_alpha_num()];
+ }
*buffer_ptr++= ALPHANUMERICS[get_alpha_num()];
}
void pairs_free(pairs_st *pairs)
{
if (pairs == NULL)
*buffer_ptr++= ALPHANUMERICS[get_alpha_num()];
}
void pairs_free(pairs_st *pairs)
{
if (pairs == NULL)
+ {
return;
return;
+ }
/* We free until we hit the null pair we stores during creation */
for (uint32_t x= 0; pairs[x].key; x++)
{
free(pairs[x].key);
if (pairs[x].value)
/* We free until we hit the null pair we stores during creation */
for (uint32_t x= 0; pairs[x].key; x++)
{
free(pairs[x].key);
if (pairs[x].value)
+ {
free(pairs[x].value);
free(pairs[x].value);
+ }
}
free(pairs);
}
free(pairs);
@@
-68,13
+77,13
@@
pairs_st *pairs_generate(uint64_t number_of, size_t value_length)
for (uint64_t x= 0; x < number_of; x++)
{
for (uint64_t x= 0; x < number_of; x++)
{
- pairs[x].key= (char *)calloc(
100
, sizeof(char));
+ pairs[x].key= (char *)calloc(
KEY_BYTES
, sizeof(char));
if (pairs[x].key == NULL)
goto error;
if (pairs[x].key == NULL)
goto error;
- get_random_string(pairs[x].key,
100
);
- pairs[x].key_length=
100
;
+ get_random_string(pairs[x].key,
KEY_BYTES
);
+ pairs[x].key_length=
KEY_BYTES
;
if (value_length)
{
if (value_length)
{