+#include "libmemcached/common.h"
#include <stdio.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <string.h>
#include <getopt.h>
+#include <sys/time.h>
#include <libmemcached/memcached.h>
/* Prototypes */
static void options_parse(int argc, char *argv[]);
-static void run_analyzer(memcached_st *memc, memcached_stat_st *stat,
+static void run_analyzer(memcached_st *memc, memcached_stat_st *memc_stat,
memcached_server_st *server_list);
-static void print_server_listing(memcached_st *memc, memcached_stat_st *stat,
+static void print_server_listing(memcached_st *memc, memcached_stat_st *memc_stat,
memcached_server_st *server_list);
static void print_analysis_report(memcached_st *memc,
memcached_analysis_st *report,
static struct option long_options[]=
{
- {"version", no_argument, NULL, OPT_VERSION},
- {"help", no_argument, NULL, OPT_HELP},
- {"verbose", no_argument, &opt_verbose, OPT_VERBOSE},
- {"debug", no_argument, &opt_verbose, OPT_DEBUG},
- {"servers", required_argument, NULL, OPT_SERVERS},
- {"flag", no_argument, &opt_displayflag, OPT_FLAG},
- {"analyze", optional_argument, NULL, OPT_ANALYZE},
+ {(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)"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},
};
{
memcached_return rc;
memcached_st *memc;
- memcached_stat_st *stat;
+ memcached_stat_st *memc_stat;
memcached_server_st *servers;
memcached_server_st *server_list;
memcached_server_push(memc, servers);
memcached_server_list_free(servers);
- stat= memcached_stat(memc, NULL, &rc);
+ memc_stat= memcached_stat(memc, NULL, &rc);
if (rc != MEMCACHED_SUCCESS && rc != MEMCACHED_SOME_ERRORS)
{
server_list= memcached_server_list(memc);
if (opt_analyze)
- run_analyzer(memc, stat, server_list);
+ run_analyzer(memc, memc_stat, server_list);
else
- print_server_listing(memc, stat, server_list);
+ print_server_listing(memc, memc_stat, server_list);
- free(stat);
+ free(memc_stat);
free(opt_servers);
memcached_free(memc);
return 0;
}
-static void run_analyzer(memcached_st *memc, memcached_stat_st *stat,
+static void run_analyzer(memcached_st *memc, memcached_stat_st *memc_stat,
memcached_server_st *server_list)
{
memcached_return rc;
if (analyze_mode == NULL)
{
memcached_analysis_st *report;
- report= memcached_analyze(memc, stat, &rc);
+ report= memcached_analyze(memc, memc_stat, &rc);
if (rc != MEMCACHED_SUCCESS || report == NULL)
{
printf("Failure to analyze servers (%s)\n",
if((servers[x]= memcached_create(NULL)) == NULL)
{
fprintf(stderr, "Failed to memcached_create()\n");
+ if (x > 0)
+ memcached_free(servers[0]);
x--;
- for (; x >= 0; x--)
+ for (; x > 0; x--)
memcached_free(servers[x]);
+
free(servers);
return;
}
}
gettimeofday(&end_time, NULL);
- elapsed_time= timedif(end_time, start_time);
- elapsed_time /= num_of_tests;
+ elapsed_time= (long) timedif(end_time, start_time);
+ elapsed_time /= (long) num_of_tests;
if (elapsed_time > slowest_time)
{
- slowest_server= x;
+ slowest_server= (long)x;
slowest_time= elapsed_time;
}
}
}
-static void print_server_listing(memcached_st *memc, memcached_stat_st *stat,
+static void print_server_listing(memcached_st *memc, memcached_stat_st *memc_stat,
memcached_server_st *server_list)
{
unsigned int x;
char **list;
char **ptr;
- list= memcached_stat_get_keys(memc, &stat[x], &rc);
+ list= memcached_stat_get_keys(memc, &memc_stat[x], &rc);
printf("Server: %s (%u)\n", memcached_server_name(memc, server_list[x]),
memcached_server_port(memc, server_list[x]));
for (ptr= list; *ptr; ptr++)
{
- memcached_return rc;
- char *value= memcached_stat_get_value(memc, &stat[x], *ptr, &rc);
+ char *value= memcached_stat_get_value(memc, &memc_stat[x], *ptr, &rc);
printf("\t %s: %s\n", *ptr, value);
free(value);