libglusterfs/options: enable validator macros for type 'double'

Values like 'entry-timeout' and 'attribute-timeout' in FUSE are of
C type double. Enable support in the options framework for using
this type.

Change-Id: If1a619595a5925937e88540710860df27347acd0
BUG: 841417
Signed-off-by: Anand Avati <avati@redhat.com>
Reviewed-on: http://review.gluster.com/3697
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Amar Tumballi <amarts@redhat.com>

2 files changed, 48 insertions, 25 deletions

diff --git a/libglusterfs/src/options.c b/libglusterfs/src/options.c
index dc119923533..fa238528e2d 100644
--- a/libglusterfs/src/options.c
+++ b/libglusterfs/src/options.c
@@ -84,7 +84,7 @@ xlator_option_validate_int (xlator_t *xl, const char *key, const char *value,
                 if (inputll < opt->min) {
                         snprintf (errstr, 256,
                                   "'%lld' in 'option %s %s' is smaller than "
-                                  "minimum value '%"PRId64"'", inputll, key,
+                                  "minimum value '%.0f'", inputll, key,
                                   value, opt->min);
                         gf_log (xl->name, GF_LOG_ERROR, "%s", errstr);
                         goto out;
@@ -93,7 +93,7 @@ xlator_option_validate_int (xlator_t *xl, const char *key, const char *value,
                 if ((inputll > opt->max)) {
                         snprintf (errstr, 256,
                                   "'%lld' in 'option %s %s' is greater than "
-                                  "maximum value '%"PRId64"'", inputll, key,
+                                  "maximum value '%.0f'", inputll, key,
                                   value, opt->max);
                         gf_log (xl->name, GF_LOG_ERROR, "%s", errstr);
                         goto out;
@@ -101,7 +101,7 @@ xlator_option_validate_int (xlator_t *xl, const char *key, const char *value,
         } else if ((inputll < opt->min) || (inputll > opt->max)) {
                 snprintf (errstr, 256,
                           "'%lld' in 'option %s %s' is out of range "
-                          "[%"PRId64" - %"PRId64"]",
+                          "[%.0f - %.0f]",
                           inputll, key, value, opt->min, opt->max);
                 gf_log (xl->name, GF_LOG_ERROR, "%s", errstr);
                 goto out;
@@ -144,13 +144,13 @@ xlator_option_validate_sizet (xlator_t *xl, const char *key, const char *value,
                 if ((strncmp (key, "cache-size", 10) == 0) &&
                     (size > opt->max)) {
                        snprintf (errstr, 256, "Cache size %"PRId64" is out of "
-                                 "range [%"PRId64" - %"PRId64"]",
+                                 "range [%.0f - %.0f]",
                                  size, opt->min, opt->max);
                        gf_log (xl->name, GF_LOG_WARNING, "%s", errstr);
                 } else {
                         snprintf (errstr, 256,
                                   "'%"PRId64"' in 'option %s %s' "
-                                  "is out of range [%"PRId64" - %"PRId64"]",
+                                  "is out of range [%.0f - %.0f]",
                                   size, key, value, opt->min, opt->max);
                         gf_log (xl->name, GF_LOG_ERROR, "%s", errstr);
                         ret = -1;
@@ -354,8 +354,7 @@ xlator_option_validate_percent_or_sizet (xlator_t *xl, const char *key,
 		if ((size < opt->min) || (size > opt->max)) {
 			snprintf (errstr, 256,
 				  "'%"PRId64"' in 'option %s %s'"
-				  " is out of range [%"PRId64" -"
-				  " %"PRId64"]",
+				  " is out of range [%.0f - %.0f]",
 				  size, key, value, opt->min, opt->max);
 			gf_log (xl->name, GF_LOG_ERROR, "%s", errstr);
 			goto out;
@@ -409,7 +408,7 @@ xlator_option_validate_time (xlator_t *xl, const char *key, const char *value,
         if ((input_time < opt->min) || (input_time > opt->max)) {
                 snprintf (errstr, 256,
                           "'%"PRIu32"' in 'option %s %s' is "
-                          "out of range [%"PRId64" - %"PRId64"]",
+                          "out of range [%.0f - %.0f]",
                           input_time, key, value,
                           opt->min, opt->max);
                 gf_log (xl->name, GF_LOG_ERROR, "%s", errstr);
@@ -428,28 +427,21 @@ static int
 xlator_option_validate_double (xlator_t *xl, const char *key, const char *value,
                                volume_option_t *opt, char **op_errstr)
 {
-        int          ret = -1;
-        char         errstr[256];
-        double       val = 0.0;
-
-        /* Check if the value is valid double */
-        if (gf_string2double (value, &val) != 0) {
-                snprintf (errstr, 256,
-                          "invalid double \"%s\" in \"option %s\"",
-                          value, key);
-                gf_log (xl->name, GF_LOG_ERROR, "%s", errstr);
-                goto out;
-        }
+        double    input = 0.0;
+        int       ret = -1;
+        char      errstr[256];
 
-        if (val < 0.0) {
+        /* Check the range */
+        if (gf_string2double (value, &input) != 0) {
                 snprintf (errstr, 256,
-                          "invalid double \"%s\" in \"option %s\"",
+                          "invalid number format \"%s\" in option \"%s\"",
                           value, key);
                 gf_log (xl->name, GF_LOG_ERROR, "%s", errstr);
                 goto out;
         }
 
-        if ((opt->min == 0) && (opt->max == 0)) {
+        if ((opt->min == 0) && (opt->max == 0) &&
+            (opt->validate == GF_OPT_VALIDATE_BOTH)) {
                 gf_log (xl->name, GF_LOG_TRACE,
                         "no range check required for 'option %s %s'",
                         key, value);
@@ -457,6 +449,33 @@ xlator_option_validate_double (xlator_t *xl, const char *key, const char *value,
                 goto out;
         }
 
+        if ((opt->validate == GF_OPT_VALIDATE_MIN)) {
+                if (input < opt->min) {
+                        snprintf (errstr, 256,
+                                  "'%f' in 'option %s %s' is smaller than "
+                                  "minimum value '%f'", input, key,
+                                  value, opt->min);
+                        gf_log (xl->name, GF_LOG_ERROR, "%s", errstr);
+                        goto out;
+                }
+        } else if ((opt->validate == GF_OPT_VALIDATE_MAX)) {
+                if ((input > opt->max)) {
+                        snprintf (errstr, 256,
+                                  "'%f' in 'option %s %s' is greater than "
+                                  "maximum value '%f'", input, key,
+                                  value, opt->max);
+                        gf_log (xl->name, GF_LOG_ERROR, "%s", errstr);
+                        goto out;
+                }
+        } else if ((input < opt->min) || (input > opt->max)) {
+                snprintf (errstr, 256,
+                          "'%f' in 'option %s %s' is out of range "
+                          "[%f - %f]",
+                          input, key, value, opt->min, opt->max);
+                gf_log (xl->name, GF_LOG_ERROR, "%s", errstr);
+                goto out;
+        }
+
         ret = 0;
 out:
         if (ret && op_errstr)
@@ -1053,6 +1072,7 @@ DEFINE_INIT_OPT(uint64_t, percent_or_size, pc_or_size);
 DEFINE_INIT_OPT(gf_boolean_t, bool, gf_string2boolean);
 DEFINE_INIT_OPT(xlator_t *, xlator, xl_by_name);
 DEFINE_INIT_OPT(char *, path, pass);
+DEFINE_INIT_OPT(double, double, gf_string2double);
 
 
 
@@ -1067,3 +1087,4 @@ DEFINE_RECONF_OPT(uint64_t, percent_or_size, pc_or_size);
 DEFINE_RECONF_OPT(gf_boolean_t, bool, gf_string2boolean);
 DEFINE_RECONF_OPT(xlator_t *, xlator, xl_by_name);
 DEFINE_RECONF_OPT(char *, path, pass);
+DEFINE_RECONF_OPT(double, double, gf_string2double);
diff --git a/libglusterfs/src/options.h b/libglusterfs/src/options.h
index 1775ad9ea71..309a9ab9a5d 100644
--- a/libglusterfs/src/options.h
+++ b/libglusterfs/src/options.h
@@ -55,8 +55,8 @@ typedef struct volume_options {
         char                    *key[ZR_VOLUME_MAX_NUM_KEY];
         /* different key, same meaning */
         volume_option_type_t    type;
-        int64_t                 min;  /* 0 means no range */
-        int64_t                 max;  /* 0 means no range */
+        double                  min;  /* 0 means no range */
+        double                  max;  /* 0 means no range */
         char                    *value[ZR_OPTION_MAX_ARRAY_SIZE];
         /* If specified, will check for one of
            the value from this array */
@@ -110,6 +110,7 @@ DECLARE_INIT_OPT(uint64_t, percent_or_size);
 DECLARE_INIT_OPT(gf_boolean_t, bool);
 DECLARE_INIT_OPT(xlator_t *, xlator);
 DECLARE_INIT_OPT(char *, path);
+DECLARE_INIT_OPT(double, double);
 
 
 #define DEFINE_INIT_OPT(type_t, type, conv)                             \
@@ -189,6 +190,7 @@ DECLARE_RECONF_OPT(uint64_t, percent_or_size);
 DECLARE_RECONF_OPT(gf_boolean_t, bool);
 DECLARE_RECONF_OPT(xlator_t *, xlator);
 DECLARE_RECONF_OPT(char *, path);
+DECLARE_RECONF_OPT(double, double);
 
 
 #define DEFINE_RECONF_OPT(type_t, type, conv)                            \