X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=clients%2Fmemstat.c;h=b8b02cfbff8be51194b2edab02bcdba2199ec1bd;hb=d76b611a9173f8ea494b6287d768fdce39159958;hp=a04327e64e947de63abe1b951455fda2f4ee15b4;hpb=f351ea037148e992ef5a6ea66d355dcab47e570a;p=awesomized%2Flibmemcached

diff --git a/clients/memstat.c b/clients/memstat.c
index a04327e6..b8b02cfb 100644
--- a/clients/memstat.c
+++ b/clients/memstat.c
@@ -6,6 +6,7 @@
 #include <fcntl.h>
 #include <string.h>
 #include <getopt.h>
+#include <sys/time.h>
 
 #include <libmemcached/memcached.h>
 
@@ -17,6 +18,8 @@
 
 /* Prototypes */
 static void options_parse(int argc, char *argv[]);
+static void run_analyzer(memcached_st *memc, memcached_stat_st *stat,
+                         memcached_server_st *server_list);
 static void print_server_listing(memcached_st *memc, memcached_stat_st *stat,
                                  memcached_server_st *server_list);
 static void print_analysis_report(memcached_st *memc,
@@ -27,6 +30,7 @@ static int opt_verbose= 0;
 static int opt_displayflag= 0;
 static int opt_analyze= 0;
 static char *opt_servers= NULL;
+static char *analyze_mode= NULL;
 
 static struct option long_options[]=
 {
@@ -36,7 +40,7 @@ static struct option long_options[]=
   {"debug", no_argument, &opt_verbose, OPT_DEBUG},
   {"servers", required_argument, NULL, OPT_SERVERS},
   {"flag", no_argument, &opt_displayflag, OPT_FLAG},
-  {"analyze", no_argument, NULL, OPT_ANALYZE},
+  {"analyze", optional_argument, NULL, OPT_ANALYZE},
   {0, 0, 0, 0},
 };
 
@@ -47,7 +51,6 @@ int main(int argc, char *argv[])
   memcached_stat_st *stat;
   memcached_server_st *servers;
   memcached_server_st *server_list;
-  memcached_analysis_st *report;
 
   options_parse(argc, argv);
 
@@ -83,7 +86,26 @@ int main(int argc, char *argv[])
   server_list= memcached_server_list(memc);
 
   if (opt_analyze)
+    run_analyzer(memc, stat, server_list);
+  else
+    print_server_listing(memc, stat, server_list);
+
+  free(stat);
+  free(opt_servers);
+
+  memcached_free(memc);
+
+  return 0;
+}
+
+static void run_analyzer(memcached_st *memc, memcached_stat_st *stat,
+                         memcached_server_st *server_list)
+{
+  memcached_return rc;
+
+  if (analyze_mode == NULL)
   {
+    memcached_analysis_st *report;
     report= memcached_analyze(memc, stat, &rc);
     if (rc != MEMCACHED_SUCCESS || report == NULL)
     {
@@ -94,15 +116,99 @@ int main(int argc, char *argv[])
     print_analysis_report(memc, report, server_list);
     free(report);
   }
-  else
-    print_server_listing(memc, stat, server_list);
+  else if (strcmp(analyze_mode, "latency") == 0)
+  {
+    memcached_st **servers;
+    uint32_t x, y, flags, server_count= memcached_server_count(memc);
+    uint32_t num_of_tests= 32;
+    const char *test_key= "libmemcached_test_key";
 
-  free(stat);
-  free(opt_servers);
+    servers= malloc(sizeof(memcached_st*) * server_count);
+    if (!servers)
+    {
+      fprintf(stderr, "Failed to allocate memory\n");
+      return;
+    }
 
-  memcached_free(memc);
+    for (x= 0; x < server_count; x++)
+    {
+      if((servers[x]= memcached_create(NULL)) == NULL)
+      {
+        fprintf(stderr, "Failed to memcached_create()\n");
+        x--;
+        for (; x >= 0; x--)
+          memcached_free(servers[x]);
+        free(servers);
+        return;
+      }
+      memcached_server_add(servers[x],
+                           memcached_server_name(memc, server_list[x]),
+                           memcached_server_port(memc, server_list[x]));
+    }
 
-  return 0;
+    printf("Network Latency Test:\n\n");
+    struct timeval start_time, end_time;
+    long elapsed_time, slowest_time= 0, slowest_server= 0;
+
+    for (x= 0; x < server_count; x++)
+    {
+      gettimeofday(&start_time, NULL);
+      for (y= 0; y < num_of_tests; y++)
+      {
+        size_t vlen;
+        char *val= memcached_get(servers[x], test_key, strlen(test_key),
+                                 &vlen, &flags, &rc);
+        if (rc != MEMCACHED_NOTFOUND && rc != MEMCACHED_SUCCESS)
+          break;
+        free(val);
+      }
+      gettimeofday(&end_time, NULL);
+
+      elapsed_time= timedif(end_time, start_time);
+      elapsed_time /= num_of_tests;
+
+      if (elapsed_time > slowest_time)
+      {
+        slowest_server= x;
+        slowest_time= elapsed_time;
+      }
+
+      if (rc != MEMCACHED_NOTFOUND && rc != MEMCACHED_SUCCESS)
+      {
+        printf("\t %s (%d)  =>  failed to reach the server\n",
+               memcached_server_name(memc, server_list[x]),
+               memcached_server_port(memc, server_list[x]));
+      }
+      else
+      {
+        printf("\t %s (%d)  =>  %ld.%ld seconds\n",
+               memcached_server_name(memc, server_list[x]),
+               memcached_server_port(memc, server_list[x]),
+               elapsed_time / 1000, elapsed_time % 1000);
+      }
+    }
+
+    if (server_count > 1 && slowest_time > 0)
+    {
+      printf("---\n");
+      printf("Slowest Server: %s (%d) => %ld.%ld seconds\n",
+             memcached_server_name(memc, server_list[slowest_server]),
+             memcached_server_port(memc, server_list[slowest_server]),
+             slowest_time / 1000, slowest_time % 1000);
+    }
+    printf("\n");
+
+    for (x= 0; x < server_count; x++)
+      memcached_free(servers[x]);
+
+    free(servers);
+    free(analyze_mode);
+  }
+  else
+  {
+    fprintf(stderr, "Invalid Analyzer Option provided\n");
+    free(analyze_mode);
+  }
 }
 
 static void print_server_listing(memcached_st *memc, memcached_stat_st *stat,
@@ -205,6 +311,7 @@ static void options_parse(int argc, char *argv[])
       break;
     case OPT_ANALYZE: /* --analyze or -a */
       opt_analyze= OPT_ANALYZE;
+      analyze_mode= (optarg) ? strdup(optarg) : NULL;
       break;
     case '?':
       /* getopt_long already printed an error message. */