Update memcapable quiet command test to work with servers that cork

[m6w6/libmemcached] / clients / ms_setting.c

diff --git a/clients/ms_setting.c b/clients/ms_setting.c
index d269e33022250c4007713d6ce76516e945b58614..ac76853fbb1289192dc88e05aa5a2ae4843a1149 100644 (file)
--- a/clients/ms_setting.c
+++ b/clients/ms_setting.c
@@ -11,6 +11,8 @@
 
 #include "config.h"
 
+#include <libmemcached/memcached.h>
+
 #include <ctype.h>
 #include <inttypes.h>
 #include <limits.h>
@@ -52,7 +54,7 @@ ms_setting_st ms_setting;       /* store the settings specified by user */
 
 /* read setting from configuration file */
 static void ms_get_serverlist(char *str);
-static int ms_get_cpu_count(void);
+static uint32_t ms_get_cpu_count(void);
 ms_conf_type_t ms_get_conf_type(char *line);
 static int ms_is_line_data(char *line);
 static int ms_read_is_data(char *line, ssize_t nread);
@@ -155,60 +157,28 @@ static ssize_t getline (char **line, size_t *line_size, FILE *fp)
  */
 static void ms_get_serverlist(char *str)
 {
-  char *string;
-  int64_t port;
-  char *begin_ptr;
-  char *end_ptr= str + strlen(str);
   ms_mcd_server_t *srvs= NULL;
-  char buffer[512];
-  char *ptr= NULL;
 
   /**
    * Servers list format is like this. For example:
    * "localhost:11108, localhost:11109"
    */
-  for (begin_ptr= str, string= index(str, ',');
-       begin_ptr != end_ptr;
-       string= index(begin_ptr, ','))
-  {
-    port= 0;
-
-    if (string)
-    {
-      memcpy(buffer, begin_ptr, (size_t)(string - begin_ptr));
-      buffer[(unsigned int)(string - begin_ptr)]= '\0';
-      begin_ptr= string + 1;
-    }
-    else
-    {
-      size_t length= strlen(begin_ptr);
-      memcpy(buffer, begin_ptr, length);
-      buffer[length]= '\0';
-      begin_ptr= end_ptr;
-    }
-
-    ptr= index(buffer, ':');
-
-    if (ptr != NULL)
-    {
-      ptr[0]= '\0';
-      ptr++;
-      port= strtol(ptr, (char **)NULL, 10);
-    }
+  memcached_server_st *server_pool;
+  server_pool = memcached_servers_parse(str);
 
+  for (uint32_t loop= 0; loop < memcached_server_list_count(server_pool); loop++)
+  {
     assert(ms_setting.srv_cnt < ms_setting.total_srv_cnt);
-    strcpy(ms_setting.servers[ms_setting.srv_cnt].srv_host_name, buffer);
-    ms_setting.servers[ms_setting.srv_cnt].srv_port= (int)port;
+    strcpy(ms_setting.servers[ms_setting.srv_cnt].srv_host_name, server_pool[loop].hostname);
+    ms_setting.servers[ms_setting.srv_cnt].srv_port= server_pool[loop].port;
     ms_setting.servers[ms_setting.srv_cnt].disconn_cnt= 0;
     ms_setting.servers[ms_setting.srv_cnt].reconn_cnt= 0;
     ms_setting.srv_cnt++;
 
     if (ms_setting.srv_cnt >= ms_setting.total_srv_cnt)
     {
-      srvs= (ms_mcd_server_t *)realloc(
-        ms_setting.servers,
-        (size_t)ms_setting.total_srv_cnt
-        * sizeof(ms_mcd_server_t) * 2);
+      srvs= (ms_mcd_server_t *)realloc( ms_setting.servers,
+                                        (size_t)ms_setting.total_srv_cnt * sizeof(ms_mcd_server_t) * 2);
       if (srvs == NULL)
       {
         fprintf(stderr, "Can't reallocate servers structure.\n");
@@ -217,10 +187,9 @@ static void ms_get_serverlist(char *str)
       ms_setting.servers= srvs;
       ms_setting.total_srv_cnt*= 2;
     }
-
-    if (isspace(*begin_ptr))
-      begin_ptr++;
   }
+
+  memcached_server_free(server_pool);
 } /* ms_get_serverlist */
 
 
@@ -229,7 +198,7 @@ static void ms_get_serverlist(char *str)
  *
  * @return return the cpu count if get, else return 1
  */
-static int ms_get_cpu_count()
+static uint32_t ms_get_cpu_count()
 {
 #ifdef HAVE__SC_NPROCESSORS_ONLN
   return sysconf(_SC_NPROCESSORS_CONF);
@@ -373,7 +342,6 @@ static void ms_parse_cfg_file(char *cfg_file)
   FILE *f;
   size_t start_len, end_len;
   double proportion;
-  size_t frequence;
   char *line= NULL;
   size_t  read_len;
   ssize_t nread;
@@ -466,8 +434,8 @@ static void ms_parse_cfg_file(char *cfg_file)
 
         if (nread != EOF)
         {
-          if (sscanf(line, "%zu %zu %lf %zu", &start_len, &end_len,
-                     &proportion, &frequence) != 3)
+          if (sscanf(line, "%zu %zu %lf", &start_len, &end_len,
+                     &proportion) != 3)
           {
             conf_type= ms_get_conf_type(line);
             break;
@@ -510,11 +478,15 @@ static void ms_parse_cfg_file(char *cfg_file)
 
         if (nread != EOF)
         {
-          if (sscanf(line, "%d %lf\n", &cmd_type, &proportion) != 2)
+          if (sscanf(line, "%d %lf", &cmd_type, &proportion) != 2)
           {
             conf_type= ms_get_conf_type(line);
             break;
           }
+          if (cmd_type >= CMD_NULL)
+          {
+            continue;
+          }
           ms_setting.cmd_distr[ms_setting.cmd_used_count].cmd_type=
             cmd_type;
           ms_setting.cmd_distr[ms_setting.cmd_used_count].cmd_prop=
@@ -951,7 +923,7 @@ void ms_setting_init_pre()
 static void ms_setting_slapmode_init_post()
 {
   ms_setting.total_key_rng_cnt= KEY_RANGE_COUNT_INIT;
-  ms_setting.key_distr= 
+  ms_setting.key_distr=
     (ms_key_distr_t *)malloc((size_t)ms_setting.total_key_rng_cnt * sizeof(ms_key_distr_t));
 
   if (ms_setting.key_distr == NULL)
@@ -962,7 +934,7 @@ static void ms_setting_slapmode_init_post()
 
   ms_setting.total_val_rng_cnt= VALUE_RANGE_COUNT_INIT;
 
-  ms_setting.value_distr= 
+  ms_setting.value_distr=
     (ms_value_distr_t *)malloc((size_t)ms_setting.total_val_rng_cnt * sizeof( ms_value_distr_t));
 
   if (ms_setting.value_distr == NULL)
@@ -1011,13 +983,6 @@ static void ms_setting_slapmode_init_post()
     exit(1);
   }
 
-  if ((ms_setting.udp
-       || ms_setting.facebook_test) && ms_setting.binary_prot)
-  {
-    fprintf(stderr, "Binary protocol doesn't support UDP now.\n");
-    exit(1);
-  }
-
   if ((ms_setting.rep_write_srv > 0) && (ms_setting.srv_cnt < 2))
   {
     fprintf(stderr, "Please specify 2 servers at least for replication\n");
@@ -1038,26 +1003,12 @@ static void ms_setting_slapmode_init_post()
     exit(1);
   }
 
-  if ((ms_setting.rep_write_srv > 0) && (ms_setting.sock_per_conn > 1))
-  {
-    fprintf(stderr, "Replication doesn't support multi-socks "
-                    "in one connection structure.\n");
-    exit(1);
-  }
-
   if (ms_setting.facebook_test && (ms_setting.rep_write_srv > 0))
   {
     fprintf(stderr, "facebook test couldn't work with replication.\n");
     exit(1);
   }
 
-  if (ms_setting.reconnect && (ms_setting.sock_per_conn > 1))
-  {
-    fprintf(stderr, "Reconnection doesn't support multi-socks "
-                    "in one connection structure.\n");
-    exit(1);
-  }
-
   ms_build_distr();
 
   /* initialize global character block */