Merge Monty

[awesomized/libmemcached] / clients / memslap.c

diff --git a/clients/memslap.c b/clients/memslap.c
index 47be3c37e63e4dfac8052c002c6e4b3e4d793d22..efda8affae122722bb2f5aae61db84ad7d31488d 100644 (file)
--- a/clients/memslap.c
+++ b/clients/memslap.c
@@ -13,9 +13,22 @@
  *      Mingqiang Zhuang <mingqiangzhuang@hengtiansoft.com>
  *
  */
+#include "config.h"
+
 #include <stdlib.h>
 #include <getopt.h>
 #include <limits.h>
+#if TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# if HAVE_SYS_TIME_H
+#  include <sys/time.h>
+# else
+#  include <time.h>
+# endif
+#endif
+
 
 #include "ms_sigsegv.h"
 #include "ms_setting.h"
@@ -298,6 +311,7 @@ void ms_help_command(const char *command_name, const char *description)
   {
     printf("    -%c, --%s%c\n", long_options[x].val, long_options[x].name,
            long_options[x].has_arg ? '=' : ' ');
+
     if ((help_message= (char *)ms_lookup_help(long_options[x].val)) != NULL)
     {
       printf("        %s\n", help_message);
@@ -417,7 +431,7 @@ static void ms_options_parse(int argc, char *argv[])
       break;
 
     case OPT_CONCURRENCY:       /* --concurrency or -c */
-      ms_setting.nconns= atoi(optarg);
+      ms_setting.nconns= (int)strtol(optarg, (char **) NULL, 10);
       if (ms_setting.nconns <= 0)
       {
         fprintf(stderr, "Concurrency must be greater than 0.:-)\n");
@@ -426,7 +440,7 @@ static void ms_options_parse(int argc, char *argv[])
       break;
 
     case OPT_EXECUTE_NUMBER:        /* --execute_number or -x */
-      ms_setting.exec_num= atoll(optarg);
+      ms_setting.exec_num= (int)strtol(optarg, (char **) NULL, 10);
       if (ms_setting.exec_num <= 0)
       {
         fprintf(stderr, "Execute number must be greater than 0.:-)\n");
@@ -435,7 +449,7 @@ static void ms_options_parse(int argc, char *argv[])
       break;
 
     case OPT_THREAD_NUMBER:     /* --threads or -T */
-      ms_setting.nthreads= atoi(optarg);
+      ms_setting.nthreads= (int)strtol(optarg, (char **) NULL, 10);
       if (ms_setting.nthreads <= 0)
       {
         fprintf(stderr, "Threads number must be greater than 0.:-)\n");
@@ -444,7 +458,7 @@ static void ms_options_parse(int argc, char *argv[])
       break;
 
     case OPT_FIXED_LTH:         /* --fixed_size or -X */
-      ms_setting.fixed_value_size= (size_t)atoi(optarg);
+      ms_setting.fixed_value_size= (size_t)strtoull(optarg, (char **) NULL, 10);
       if ((ms_setting.fixed_value_size <= 0)
           || (ms_setting.fixed_value_size > MAX_VALUE_SIZE))
       {
@@ -465,7 +479,7 @@ static void ms_options_parse(int argc, char *argv[])
       break;
 
     case OPT_GETS_DIVISION:         /* --division or -d */
-      ms_setting.mult_key_num= atoi(optarg);
+      ms_setting.mult_key_num= (int)strtol(optarg, (char **) NULL, 10);
       if (ms_setting.mult_key_num <= 0)
       {
         fprintf(stderr, "Multi-get key number must be greater than 0.:-)\n");
@@ -551,7 +565,7 @@ static void ms_options_parse(int argc, char *argv[])
       break;
 
     case OPT_SOCK_PER_CONN:         /* --conn_sock or -n */
-      ms_setting.sock_per_conn= atoi(optarg);
+      ms_setting.sock_per_conn= (int)strtol(optarg, (char **) NULL, 10);
       if (ms_setting.sock_per_conn <= 0)
       {
         fprintf(stderr, "Number of socks of each concurrency "
@@ -588,7 +602,7 @@ static void ms_options_parse(int argc, char *argv[])
       break;
 
     case OPT_REP_WRITE_SRV:         /* --rep_write or -p */
-      ms_setting.rep_write_srv= atoi(optarg);
+      ms_setting.rep_write_srv= (int)strtol(optarg, (char **) NULL, 10);
       if (ms_setting.rep_write_srv <= 0)
       {
         fprintf(stderr,
@@ -613,8 +627,17 @@ static int ms_check_para()
 {
   if (ms_setting.srv_str == NULL)
   {
-    fprintf(stderr, "No Servers provided.\n\n");
-    return -1;
+    char *temp;
+
+    if ((temp= getenv("MEMCACHED_SERVERS")))
+    {
+      ms_setting.srv_str= strdup(temp);
+    }
+    else
+    {
+      fprintf(stderr, "No Servers provided\n\n");
+      return -1;
+    }
   }
 
   if (ms_setting.nconns % ms_setting.nthreads != 0)
@@ -781,8 +804,8 @@ static void ms_monitor_slap_mode()
       second++;
 
       if ((ms_setting.stat_freq > 0) && (second % ms_setting.stat_freq == 0)
-          && ((int32_t)ms_stats.active_conns >= ms_setting.nconns)
-          && (ms_stats.active_conns <= (uint32_t)INT_MAX))
+          && (ms_stats.active_conns >= ms_setting.nconns)
+          && (ms_stats.active_conns <= INT_MAX))
       {
         ms_print_statistics(second);
       }