X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Fmemstat.c;h=23432fb758787028dd08fa959e3bb2aec0309d4d;hb=44152c2062812b74edbcad6b7bf15e78d93ed12c;hp=bc81cb07f195f375444e645d46c61eef4d71e048;hpb=246060cb7056a0aced6f164faaa1f16b8cf90ccf;p=awesomized%2Flibmemcached

diff --git a/src/memstat.c b/src/memstat.c
index bc81cb07..23432fb7 100644
--- a/src/memstat.c
+++ b/src/memstat.c
@@ -11,6 +11,9 @@
 #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[]);
 
@@ -20,76 +23,85 @@ static char *opt_servers= NULL;
 
 int main(int argc, char *argv[])
 {
+  unsigned int x;
+  memcached_return rc;
   memcached_st *memc;
+  memcached_stat_st *stat;
+  memcached_server_st *servers;
+  memcached_server_st *server_list;
 
-  memc= memcached_init(NULL);
   options_parse(argc, argv);
 
-  if (opt_servers)
+  if (!opt_servers)
+    return 0;
+
+  memc= memcached_create(NULL);
+
+  servers= parse_opt_servers(opt_servers);
+  memcached_server_push(memc, servers);
+  memcached_server_list_free(servers);
+
+  stat= memcached_stat(memc, NULL, &rc);
+
+  if (rc != MEMCACHED_SUCCESS || rc != MEMCACHED_SOME_ERRORS);
   {
-    unsigned int x;
-    memcached_return rc;
-    memcached_stat_st *stat;
-    memcached_server_st *server_list;
+    printf("Failure to communicate with servers (%s)\n",
+	   memcached_strerror(memc, rc));
+    exit(1);
+  }
 
-    parse_opt_servers(memc, opt_servers);
-    stat= memcached_stat(memc, NULL, &rc);
+  server_list= memcached_server_list(memc);
 
-    if (rc != MEMCACHED_SUCCESS || rc != MEMCACHED_SOME_ERRORS);
-    {
-      printf("Failure to communicate with servers (%s)\n",
-              memcached_strerror(memc, rc));
-      exit(1);
-    }
+  printf("Listing %u Server\n\n", memcached_server_count(memc));
+  for (x= 0; x < memcached_server_count(memc); x++)
+  {
+    char **list;
+    char **ptr;
 
-    server_list= memcached_server_list(memc);
+    list= memcached_stat_get_keys(memc, &stat[x], &rc);
+    assert(list);
+    assert(rc == MEMCACHED_SUCCESS);
 
-    printf("Listing %u Server\n\n", memcached_server_count(memc));
-    for (x= 0; x < memcached_server_count(memc); x++)
+    printf("Server: %s (%u)\n", memcached_server_name(memc, server_list[x]),
+	   memcached_server_port(memc, server_list[x]));
+    for (ptr= list; *ptr; ptr++)
     {
-      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");
+      memcached_return rc;
+      char *value= memcached_stat_get_value(memc, &stat[x], *ptr, &rc);
+
+      printf("\t %s: %s\n", *ptr, value);
+      free(value);
     }
 
-    free(stat);
-    free(opt_servers);
+    free(list);
+    printf("\n");
   }
 
-  memcached_deinit(memc);
+  free(stat);
+  free(opt_servers);
+
+  memcached_free(memc);
 
   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},
-      {"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},
-      {0, 0, 0, 0},
-    };
+  {
+    {"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},
+    {0, 0, 0, 0},
+  };
 
   int option_index= 0;
   int option_rv;
@@ -109,12 +121,10 @@ void options_parse(int argc, char *argv[])
       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 */
-      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);