X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=clients%2Fmemstat.cc;h=1eab6f9f30623b52d503c6ecbafdc2f005104780;hb=d40eca3b5b67ef4403f92254e8c6d0253da62553;hp=a3b85108c4f95363db42aee1aa92a9e1a4898383;hpb=ae6bc7501efd5aeaaee92dabe2da0ec2d1625c5b;p=m6w6%2Flibmemcached diff --git a/clients/memstat.cc b/clients/memstat.cc index a3b85108..1eab6f9f 100644 --- a/clients/memstat.cc +++ b/clients/memstat.cc @@ -11,13 +11,15 @@ * Brian Aker * Toru Maesaka */ -#include "config.h" +#include #include #include #include +#include #include #include +#include #include #include #include @@ -37,9 +39,10 @@ static void run_analyzer(memcached_st *memc, memcached_stat_st *memc_stat); static void print_analysis_report(memcached_st *memc, memcached_analysis_st *report); -static int opt_verbose= 0; -static int opt_displayflag= 0; -static int opt_analyze= 0; +static bool opt_binary= false; +static bool opt_verbose= false; +static bool opt_server_version= false; +static bool opt_analyze= false; static char *opt_servers= NULL; static char *stat_args= NULL; static char *analyze_mode= NULL; @@ -49,10 +52,12 @@ static struct option long_options[]= {(OPTIONSTRING)"args", required_argument, NULL, OPT_STAT_ARGS}, {(OPTIONSTRING)"version", no_argument, NULL, OPT_VERSION}, {(OPTIONSTRING)"help", no_argument, NULL, OPT_HELP}, - {(OPTIONSTRING)"verbose", no_argument, &opt_verbose, OPT_VERBOSE}, - {(OPTIONSTRING)"debug", no_argument, &opt_verbose, OPT_DEBUG}, + {(OPTIONSTRING)"quiet", no_argument, NULL, OPT_QUIET}, + {(OPTIONSTRING)"verbose", no_argument, NULL, OPT_VERBOSE}, + {(OPTIONSTRING)"binary", no_argument, NULL, OPT_BINARY}, + {(OPTIONSTRING)"debug", no_argument, NULL, OPT_DEBUG}, + {(OPTIONSTRING)"server-version", no_argument, NULL, OPT_SERVER_VERSION}, {(OPTIONSTRING)"servers", required_argument, NULL, OPT_SERVERS}, - {(OPTIONSTRING)"flag", no_argument, &opt_displayflag, OPT_FLAG}, {(OPTIONSTRING)"analyze", optional_argument, NULL, OPT_ANALYZE}, {0, 0, 0, 0}, }; @@ -78,26 +83,39 @@ static memcached_return_t stat_printer(memcached_server_instance_st instance, return MEMCACHED_SUCCESS; } +static memcached_return_t server_print_callback(const memcached_st *, + memcached_server_instance_st instance, + void *) +{ + std::cerr << memcached_server_name(instance) << ":" << memcached_server_port(instance) << + " " << int(memcached_server_major_version(instance)) << + "." << int(memcached_server_minor_version(instance)) << + "." << int(memcached_server_micro_version(instance)) << std::endl; + + return MEMCACHED_SUCCESS; +} + int main(int argc, char *argv[]) { options_parse(argc, argv); initialize_sockets(); - if (! opt_servers) + if (opt_servers == false) { char *temp; - if ((temp= getenv("MEMCACHED_SERVERS"))) + { opt_servers= strdup(temp); + } else { - fprintf(stderr, "No Servers provided\n\n"); - help_command(PROGRAM_NAME, PROGRAM_DESCRIPTION, long_options, 0); - exit(1); + std::cerr << "No Servers provided" << std::endl; + return EXIT_FAILURE; } } memcached_st *memc= memcached_create(NULL); + memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL, opt_binary); memcached_server_st *servers= memcached_servers_parse(opt_servers); free(opt_servers); @@ -105,21 +123,33 @@ int main(int argc, char *argv[]) memcached_return_t rc= memcached_server_push(memc, servers); memcached_server_list_free(servers); - if (rc != MEMCACHED_SUCCESS && rc != MEMCACHED_SOME_ERRORS) + if (rc != MEMCACHED_SUCCESS and rc != MEMCACHED_SOME_ERRORS) { printf("Failure to communicate with servers (%s)\n", memcached_strerror(memc, rc)); - exit(1); + exit(EXIT_FAILURE); } - if (opt_analyze) + if (opt_server_version) { - memcached_stat_st *memc_stat; + if (memcached_failed(memcached_version(memc))) + { + std::cerr << "Unable to obtain server version"; + exit(EXIT_FAILURE); + } - memc_stat= memcached_stat(memc, NULL, &rc); + memcached_server_fn callbacks[1]; + callbacks[0]= server_print_callback; + memcached_server_cursor(memc, callbacks, NULL, 1); + } + else if (opt_analyze) + { + memcached_stat_st *memc_stat= memcached_stat(memc, NULL, &rc); - if (! memc_stat) - exit(-1); + if (memc_stat == NULL) + { + exit(EXIT_FAILURE); + } run_analyzer(memc, memc_stat); @@ -307,38 +337,62 @@ static void options_parse(int argc, char *argv[]) }; int option_index= 0; - int option_rv; + bool opt_version= false; + bool opt_help= false; while (1) { - option_rv= getopt_long(argc, argv, "Vhvds:a", long_options, &option_index); - if (option_rv == -1) break; + int option_rv= getopt_long(argc, argv, "Vhvds:a", long_options, &option_index); + + if (option_rv == -1) + break; + switch (option_rv) { case 0: break; + case OPT_VERBOSE: /* --verbose or -v */ - opt_verbose = OPT_VERBOSE; + opt_verbose= true; break; + case OPT_DEBUG: /* --debug or -d */ - opt_verbose = OPT_DEBUG; + opt_verbose= true; + break; + + case OPT_BINARY: + opt_binary= true; + break; + + case OPT_SERVER_VERSION: + opt_server_version= true; break; + case OPT_VERSION: /* --version or -V */ - version_command(PROGRAM_NAME); + opt_version= true; break; + case OPT_HELP: /* --help or -h */ - help_command(PROGRAM_NAME, PROGRAM_DESCRIPTION, long_options, help_options); + opt_help= true; break; + case OPT_SERVERS: /* --servers or -s */ opt_servers= strdup(optarg); break; + case OPT_STAT_ARGS: stat_args= strdup(optarg); break; + case OPT_ANALYZE: /* --analyze or -a */ opt_analyze= OPT_ANALYZE; analyze_mode= (optarg) ? strdup(optarg) : NULL; break; + + case OPT_QUIET: + close_stdio(); + break; + case '?': /* getopt_long already printed an error message. */ exit(1); @@ -346,4 +400,16 @@ static void options_parse(int argc, char *argv[]) abort(); } } + + if (opt_version) + { + version_command(PROGRAM_NAME); + exit(EXIT_SUCCESS); + } + + if (opt_help) + { + help_command(PROGRAM_NAME, PROGRAM_DESCRIPTION, long_options, help_options); + exit(EXIT_SUCCESS); + } }