/* 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);
*
* @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);
FILE *f;
size_t start_len, end_len;
double proportion;
- size_t frequence;
char *line= NULL;
size_t read_len;
ssize_t nread;
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;
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=
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)
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)
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");
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 */