Adding memstat framework.

Rewrote server parsing routines.

diff --git a/src/Makefile.am b/src/Makefile.am
index fc47cc49ecc05cc26ef11f019468155e11880f30..d4cf2e69750fa35f3a07f50cfab8f8e69801d672 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,10 +1,15 @@
 INCLUDES = -I$(top_builddir)/include\r
 LDADDS = ../lib/libmemcached.la\r
 \r
 INCLUDES = -I$(top_builddir)/include\r
 LDADDS = ../lib/libmemcached.la\r
 \r

-bin_PROGRAMS = memcat memcp\r
+bin_PROGRAMS = memcat memcp memstat\r

 \r
 \r

-memcat_SOURCES = memcat.c\r
+noinst_includes= client_options.h utilities.h\r
+\r
+memcat_SOURCES = memcat.c utilities.c\r

 memcat_LDADD = $(LDADDS)\r
 \r
 memcat_LDADD = $(LDADDS)\r
 \r

-memcp_SOURCES = memcp.c\r
+memcp_SOURCES = memcp.c utilities.c\r

 memcp_LDADD = $(LDADDS)\r
 memcp_LDADD = $(LDADDS)\r

+\r
+memstat_SOURCES = memstat.c utilities.c\r
+memstat_LDADD = $(LDADDS)\r

diff --git a/src/memcat.c b/src/memcat.c
index 645b54ac3d762f7459823e835f6d5b1fda16e47c..dedcb94595e5bc79f9417c0cefaffe17aeaa68f6 100644 (file)
--- a/src/memcat.c
+++ b/src/memcat.c
@@ -2,25 +2,18 @@
 #include <unistd.h>\r
 #include <getopt.h>\r
 #include <memcached.h>\r
 #include <unistd.h>\r
 #include <getopt.h>\r
 #include <memcached.h>\r

+\r

 #include "client_options.h"\r
 #include "client_options.h"\r

+#include "utilities.h"\r
+\r
+\r
+/* Prototypes */\r
+void options_parse(int argc, char *argv[]);\r

 \r
 static int opt_verbose;\r
 static int opt_displayflag;\r
 static char *opt_servers;\r
 \r
 \r
 static int opt_verbose;\r
 static int opt_displayflag;\r
 static char *opt_servers;\r
 \r

-struct memcached_st *parse_opt_servers (struct memcached_st *m,\r
-                                       char *opt_servers)\r
-{\r
-  char *s, *hostname;\r
-  unsigned int portnum;\r
-  while (s = strsep(&opt_servers, ",")) {\r
-    hostname = strsep(&s, ":");\r
-    portnum = atoi(s);\r
-    memcached_server_add(m, hostname, portnum);\r
-  }\r
-  return m;\r
-}\r
-\r

 int main(int argc, char *argv[])\r
 {\r
   memcached_st *memc;\r
 int main(int argc, char *argv[])\r
 {\r
   memcached_st *memc;\r


@@ -30,6 +23,40 @@ int main(int argc, char *argv[])
   memcached_return rc;\r
   unsigned int x;\r
 \r
   memcached_return rc;\r
   unsigned int x;\r
 \r

+  memc= memcached_init(NULL);\r
+\r
+  options_parse(argc, argv);\r
+\r
+  parse_opt_servers(memc, opt_servers);\r
+\r
+  for (x= 1; x < argc; x++)\r
+  {\r
+    string= memcached_get(memc, argv[x], strlen(argv[x]),\r
+                          &string_length, &flags, &rc);\r
+    if (rc == MEMCACHED_SUCCESS) {\r
+      if (opt_displayflag) {\r
+       printf("%d\n", flags);\r
+      } else {\r
+       if (string) \r
+       {\r
+         printf("%.*s\n", string_length, string);\r
+         free(string);\r
+       }\r
+      }\r
+    }\r
+  }\r
+\r
+  memcached_deinit(memc);\r
+\r
+  return 0;\r
+};\r
+\r
+\r
+void options_parse(int argc, char *argv[])\r
+{\r
+  int option_index = 0;\r
+  int option_rv;\r
+\r

   static struct option long_options[] =\r
     {\r
       {"version", no_argument, NULL, OPT_VERSION},\r
   static struct option long_options[] =\r
     {\r
       {"version", no_argument, NULL, OPT_VERSION},\r


@@ -40,8 +67,6 @@ int main(int argc, char *argv[])
       {"flag", no_argument, &opt_displayflag, OPT_FLAG},\r
       {0, 0, 0, 0},\r
     };\r
       {"flag", no_argument, &opt_displayflag, OPT_FLAG},\r
       {0, 0, 0, 0},\r
     };\r

-  int option_index = 0;\r
-  int option_rv;\r

 \r
   while (1) \r
   {\r
 \r
   while (1) \r
   {\r


@@ -59,7 +84,7 @@ int main(int argc, char *argv[])
       exit(0);\r
       break;\r
     case OPT_SERVERS: /* --servers */\r
       exit(0);\r
       break;\r
     case OPT_SERVERS: /* --servers */\r

-      opt_servers = strdup(optarg);\r
+      opt_servers= strdup(optarg);\r

       break;\r
     case '?':\r
       /* getopt_long already printed an error message. */\r
       break;\r
     case '?':\r
       /* getopt_long already printed an error message. */\r


@@ -68,30 +93,4 @@ int main(int argc, char *argv[])
       abort();\r
     }\r
   }\r
       abort();\r
     }\r
   }\r

-\r
-  memc = malloc(sizeof(struct memcached_st));\r
-  memcached_init(memc);\r
-  memc= parse_opt_servers(memc, opt_servers);\r
-  memc= memcached_init(memc);\r
-\r
-  for (x= 1; x < argc; x++)\r
-  {\r
-    string= memcached_get(memc, argv[x], strlen(argv[x]),\r
-                          &string_length, &flags, &rc);\r
-    if (rc == MEMCACHED_SUCCESS) {\r
-      if (opt_displayflag) {\r
-       printf("%d\n", flags);\r
-      } else {\r
-       if (string) \r
-       {\r
-         printf("%.*s\n", string_length, string);\r
-         free(string);\r
-       }\r
-      }\r
-    }\r
-  }\r
-\r
-  memcached_deinit(memc);\r
-\r
-  return 0;\r
-};\r
+}\r

diff --git a/src/memstat.c b/src/memstat.c
new file mode 100644 (file)
index 0000000..939f806
--- /dev/null
+++ b/src/memstat.c
@@ -0,0 +1,76 @@
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <sys/mman.h>
+#include <fcntl.h>
+#include <getopt.h>
+
+#include <memcached.h>
+
+#include "client_options.h"
+#include "utilities.h"
+
+/* Prototypes */
+void options_parse(int argc, char *argv[]);
+
+static int opt_verbose;
+static int opt_displayflag;
+static char *opt_servers;
+
+int main(int argc, char *argv[])
+{
+  memcached_st *memc;
+
+  memc= memcached_init(NULL);
+  options_parse(argc, argv);
+
+  parse_opt_servers(memc, opt_servers);
+
+  memcached_deinit(memc);
+
+  return 0;
+}
+
+void options_parse(int argc, char *argv[])
+{
+  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},
+    };
+
+  int option_index = 0;
+  int option_rv;
+
+  while (1) 
+  {
+    option_rv = getopt_long(argc, argv, "", long_options, &option_index);
+    if (option_rv == -1) break;
+    switch (option_rv) {
+    case 0:
+      break;
+    case OPT_VERSION: /* --version */
+      printf("memcache tools, memcat, v1.0\n");
+      exit(0);
+      break;
+    case OPT_HELP: /* --help */
+      printf("useful help messages go here\n");
+      exit(0);
+      break;
+    case OPT_SERVERS: /* --servers */
+      opt_servers = strdup(optarg);
+      break;
+    case '?':
+      /* getopt_long already printed an error message. */
+      exit(1);
+    default:
+      abort();
+    }
+  }
+}

diff --git a/src/utilities.c b/src/utilities.c
new file mode 100644 (file)
index 0000000..5dd66f6
--- /dev/null
+++ b/src/utilities.c
@@ -0,0 +1,47 @@
+#include <memcached.h>
+
+void parse_opt_servers(memcached_st *memc,
+                       char *opt_servers)
+{
+  char *string;
+  unsigned int port;
+  char *begin_ptr;
+
+  for (begin_ptr= opt_servers, string= index(opt_servers, ','); 
+       begin_ptr[0]; 
+       begin_ptr= ++string, string= index(begin_ptr, ','))
+  {
+    char buffer[HUGE_STRING_LEN];
+    char *ptr;
+
+    memset(buffer, 0, HUGE_STRING_LEN);
+    if (string)
+    {
+      memcpy(buffer, begin_ptr, string - begin_ptr);
+    }
+    else
+    {
+      size_t length= strlen(opt_servers);
+      memcpy(buffer, begin_ptr, length);
+      string= opt_servers+length;
+    }
+
+    ptr= index(buffer, ':');
+
+    if (ptr)
+    {
+      ptr[0]= 0;
+
+      ptr++;
+
+      port= strtol(ptr, (char **)NULL, 10);
+
+      memcached_server_add(memc, buffer, port);
+    }
+    else
+    {
+      memcached_server_add(memc, buffer, 0);
+    }
+  }
+}
+

diff --git a/src/utilities.h b/src/utilities.h
new file mode 100644 (file)
index 0000000..fe79781
--- /dev/null
+++ b/src/utilities.h
@@ -0,0 +1,4 @@
+#include <memcached.h>
+
+void parse_opt_servers (memcached_st *ptr,
+                        char *opt_servers);