projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Adding new memcached_clone() function
[m6w6/libmemcached]
/
src
/
memstat.c
diff --git
a/src/memstat.c
b/src/memstat.c
index a82f3f123d176ecde20f16f1df2a40f436600abd..6f3c55d80fee6dffa79c6e283090b01cc5537cce 100644
(file)
--- a/
src/memstat.c
+++ b/
src/memstat.c
@@
-4,6
+4,8
@@
#include <sys/types.h>
#include <sys/mman.h>
#include <fcntl.h>
#include <sys/types.h>
#include <sys/mman.h>
#include <fcntl.h>
+#include <string.h>
+#include <assert.h>
#include <getopt.h>
#include <memcached.h>
#include <getopt.h>
#include <memcached.h>
@@
-11,6
+13,9
@@
#include "client_options.h"
#include "utilities.h"
#include "client_options.h"
#include "utilities.h"
+#define PROGRAM_NAME "memstat"
+#define PROGRAM_DESCRIPTION "Output the state of a memcached cluster."
+
/* Prototypes */
void options_parse(int argc, char *argv[]);
/* Prototypes */
void options_parse(int argc, char *argv[]);
@@
-30,17
+35,24
@@
int main(int argc, char *argv[])
options_parse(argc, argv);
if (!opt_servers)
options_parse(argc, argv);
if (!opt_servers)
- return 0;
+ {
+ char *temp;
+
+ if ((temp= getenv("MEMCACHED_SERVERS")))
+ opt_servers= strdup(temp);
+ else
+ exit(1);
+ }
- memc= memcached_
init
(NULL);
+ memc= memcached_
create
(NULL);
- servers=
parse_opt_servers
(opt_servers);
+ servers=
memcached_servers_parse
(opt_servers);
memcached_server_push(memc, servers);
memcached_server_list_free(servers);
stat= memcached_stat(memc, NULL, &rc);
memcached_server_push(memc, servers);
memcached_server_list_free(servers);
stat= memcached_stat(memc, NULL, &rc);
- if (rc != MEMCACHED_SUCCESS
|| rc != MEMCACHED_SOME_ERRORS);
+ if (rc != MEMCACHED_SUCCESS
&& rc != MEMCACHED_SOME_ERRORS)
{
printf("Failure to communicate with servers (%s)\n",
memcached_strerror(memc, rc));
{
printf("Failure to communicate with servers (%s)\n",
memcached_strerror(memc, rc));
@@
-77,13
+89,18
@@
int main(int argc, char *argv[])
free(stat);
free(opt_servers);
free(stat);
free(opt_servers);
- memcached_
deinit
(memc);
+ memcached_
free
(memc);
return 0;
}
void options_parse(int argc, char *argv[])
{
return 0;
}
void options_parse(int argc, char *argv[])
{
+ memcached_programs_help_st help_options[]=
+ {
+ {0},
+ };
+
static struct option long_options[]=
{
{"version", no_argument, NULL, OPT_VERSION},
static struct option long_options[]=
{
{"version", no_argument, NULL, OPT_VERSION},
@@
-113,12
+130,10
@@
void options_parse(int argc, char *argv[])
opt_verbose = OPT_DEBUG;
break;
case OPT_VERSION: /* --version or -V */
opt_verbose = OPT_DEBUG;
break;
case OPT_VERSION: /* --version or -V */
- printf("memcache tools, memcat, v1.0\n");
- exit(0);
+ version_command(PROGRAM_NAME);
break;
case OPT_HELP: /* --help or -h */
break;
case OPT_HELP: /* --help or -h */
- printf("useful help messages go here\n");
- exit(0);
+ help_command(PROGRAM_NAME, PROGRAM_DESCRIPTION, long_options, help_options);
break;
case OPT_SERVERS: /* --servers or -s */
opt_servers= strdup(optarg);
break;
case OPT_SERVERS: /* --servers or -s */
opt_servers= strdup(optarg);