Fixed memory issues found by new tool memslap.

[m6w6/libmemcached] / src / memstat.c

diff --git a/src/memstat.c b/src/memstat.c
index e7810200db7736f721f7380e57a8c6ed0dc14704..bc81cb07f195f375444e645d46c61eef4d71e048 100644 (file)
--- a/src/memstat.c
+++ b/src/memstat.c
@@ -14,9 +14,9 @@
 /* Prototypes */
 void options_parse(int argc, char *argv[]);
 
-static int opt_verbose;
-static int opt_displayflag;
-static char *opt_servers;
+static int opt_verbose= 0;
+static int opt_displayflag= 0;
+static char *opt_servers= NULL;
 
 int main(int argc, char *argv[])
 {
@@ -25,7 +25,53 @@ int main(int argc, char *argv[])
   memc= memcached_init(NULL);
   options_parse(argc, argv);
 
-  parse_opt_servers(memc, opt_servers);
+  if (opt_servers)
+  {
+    unsigned int x;
+    memcached_return rc;
+    memcached_stat_st *stat;
+    memcached_server_st *server_list;
+
+    parse_opt_servers(memc, opt_servers);
+    stat= memcached_stat(memc, NULL, &rc);
+
+    if (rc != MEMCACHED_SUCCESS || rc != MEMCACHED_SOME_ERRORS);
+    {
+      printf("Failure to communicate with servers (%s)\n",
+              memcached_strerror(memc, rc));
+      exit(1);
+    }
+
+    server_list= memcached_server_list(memc);
+
+    printf("Listing %u Server\n\n", memcached_server_count(memc));
+    for (x= 0; x < memcached_server_count(memc); x++)
+    {
+      char **list;
+      char **ptr;
+
+      list= memcached_stat_get_keys(memc, &stat[x], &rc);
+      assert(list);
+      assert(rc == MEMCACHED_SUCCESS);
+
+      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);
+
+        printf("\t %s: %s\n", *ptr, value);
+        free(value);
+      }
+
+      free(list);
+      printf("\n");
+    }
+
+    free(stat);
+    free(opt_servers);
+  }
 
   memcached_deinit(memc);
 
@@ -56,6 +102,12 @@ void options_parse(int argc, char *argv[])
     {
     case 0:
       break;
+    case OPT_VERBOSE: /* --verbose or -v */
+      opt_verbose = OPT_VERBOSE;
+      break;
+    case OPT_DEBUG: /* --debug or -d */
+      opt_verbose = OPT_DEBUG;
+      break;
     case OPT_VERSION: /* --version or -V */
       printf("memcache tools, memcat, v1.0\n");
       exit(0);
@@ -65,7 +117,7 @@ void options_parse(int argc, char *argv[])
       exit(0);
       break;
     case OPT_SERVERS: /* --servers or -s */
-      opt_servers= optarg;
+      opt_servers= strdup(optarg);
       break;
     case '?':
       /* getopt_long already printed an error message. */