1 files changed, 49 insertions, 6 deletions

diff --git a/tools/perf/util/parse-options.c b/tools/perf/util/parse-options.c
index efebd5b476b3..99d02aa57dbf 100644
--- a/tools/perf/util/parse-options.c
+++ b/tools/perf/util/parse-options.c
@@ -49,8 +49,9 @@ static int get_value(struct parse_opt_ctx_t *p,
                                 break;
                         /* FALLTHROUGH */
                 case OPTION_BOOLEAN:
+                case OPTION_INCR:
                 case OPTION_BIT:
-                case OPTION_SET_INT:
+                case OPTION_SET_UINT:
                 case OPTION_SET_PTR:
                         return opterror(opt, "takes no value", flags);
                 case OPTION_END:
@@ -58,7 +59,9 @@ static int get_value(struct parse_opt_ctx_t *p,
                 case OPTION_GROUP:
                 case OPTION_STRING:
                 case OPTION_INTEGER:
+                case OPTION_UINTEGER:
                 case OPTION_LONG:
+                case OPTION_U64:
                 default:
                         break;
                 }
@@ -73,11 +76,15 @@ static int get_value(struct parse_opt_ctx_t *p,
                 return 0;
 
         case OPTION_BOOLEAN:
+                *(bool *)opt->value = unset ? false : true;
+                return 0;
+
+        case OPTION_INCR:
                 *(int *)opt->value = unset ? 0 : *(int *)opt->value + 1;
                 return 0;
 
-        case OPTION_SET_INT:
-                *(int *)opt->value = unset ? 0 : opt->defval;
+        case OPTION_SET_UINT:
+                *(unsigned int *)opt->value = unset ? 0 : opt->defval;
                 return 0;
 
         case OPTION_SET_PTR:
@@ -120,6 +127,22 @@ static int get_value(struct parse_opt_ctx_t *p,
                         return opterror(opt, "expects a numerical value", flags);
                 return 0;
 
+        case OPTION_UINTEGER:
+                if (unset) {
+                        *(unsigned int *)opt->value = 0;
+                        return 0;
+                }
+                if (opt->flags & PARSE_OPT_OPTARG && !p->opt) {
+                        *(unsigned int *)opt->value = opt->defval;
+                        return 0;
+                }
+                if (get_arg(p, opt, flags, &arg))
+                        return -1;
+                *(unsigned int *)opt->value = strtol(arg, (char **)&s, 10);
+                if (*s)
+                        return opterror(opt, "expects a numerical value", flags);
+                return 0;
+
         case OPTION_LONG:
                 if (unset) {
                         *(long *)opt->value = 0;
@@ -136,6 +159,22 @@ static int get_value(struct parse_opt_ctx_t *p,
                         return opterror(opt, "expects a numerical value", flags);
                 return 0;
 
+        case OPTION_U64:
+                if (unset) {
+                        *(u64 *)opt->value = 0;
+                        return 0;
+                }
+                if (opt->flags & PARSE_OPT_OPTARG && !p->opt) {
+                        *(u64 *)opt->value = opt->defval;
+                        return 0;
+                }
+                if (get_arg(p, opt, flags, &arg))
+                        return -1;
+                *(u64 *)opt->value = strtoull(arg, (char **)&s, 10);
+                if (*s)
+                        return opterror(opt, "expects a numerical value", flags);
+                return 0;
+
         case OPTION_END:
         case OPTION_ARGUMENT:
         case OPTION_GROUP:
@@ -441,7 +480,10 @@ int usage_with_options_internal(const char * const *usagestr,
                 switch (opts->type) {
                 case OPTION_ARGUMENT:
                         break;
+                case OPTION_LONG:
+                case OPTION_U64:
                 case OPTION_INTEGER:
+                case OPTION_UINTEGER:
                         if (opts->flags & PARSE_OPT_OPTARG)
                                 if (opts->long_name)
                                         pos += fprintf(stderr, "[=<n>]");
@@ -473,14 +515,14 @@ int usage_with_options_internal(const char * const *usagestr,
                                         pos += fprintf(stderr, " ...");
                         }
                         break;
-                default: /* OPTION_{BIT,BOOLEAN,SET_INT,SET_PTR} */
+                default: /* OPTION_{BIT,BOOLEAN,SET_UINT,SET_PTR} */
                 case OPTION_END:
                 case OPTION_GROUP:
                 case OPTION_BIT:
                 case OPTION_BOOLEAN:
-                case OPTION_SET_INT:
+                case OPTION_INCR:
+                case OPTION_SET_UINT:
                 case OPTION_SET_PTR:
-                case OPTION_LONG:
                         break;
                 }
 
@@ -500,6 +542,7 @@ int usage_with_options_internal(const char * const *usagestr,
 void usage_with_options(const char * const *usagestr,
                         const struct option *opts)
 {
+        exit_browser(false);
         usage_with_options_internal(usagestr, opts, 0);
         exit(129);
 }