Skip to content

Commit

Permalink
perf units: Move parse_tag_value() to units.[ch]
Browse files Browse the repository at this point in the history
Its basically to do units handling, so move to a more appropriately
named object.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/n/tip-90ob9vfepui24l8l2makhd9u@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
  • Loading branch information
Arnaldo Carvalho de Melo committed Apr 26, 2017
1 parent 5068b52 commit 3caeafc
Show file tree
Hide file tree
Showing 4 changed files with 36 additions and 34 deletions.
29 changes: 29 additions & 0 deletions tools/perf/util/units.c
Original file line number Diff line number Diff line change
@@ -1,8 +1,37 @@
#include "units.h"
#include <inttypes.h>
#include <limits.h>
#include <stdlib.h>
#include <string.h>
#include <linux/kernel.h>
#include <linux/time64.h>

unsigned long parse_tag_value(const char *str, struct parse_tag *tags)
{
struct parse_tag *i = tags;

while (i->tag) {
char *s = strchr(str, i->tag);

if (s) {
unsigned long int value;
char *endptr;

value = strtoul(str, &endptr, 10);
if (s != endptr)
break;

if (value > ULONG_MAX / i->mult)
break;
value *= i->mult;
return value;
}
i++;
}

return (unsigned long) -1;
}

unsigned long convert_unit(unsigned long value, char *unit)
{
*unit = ' ';
Expand Down
7 changes: 7 additions & 0 deletions tools/perf/util/units.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,13 @@
#include <stddef.h>
#include <linux/types.h>

struct parse_tag {
char tag;
int mult;
};

unsigned long parse_tag_value(const char *str, struct parse_tag *tags);

unsigned long convert_unit(unsigned long value, char *unit);
int unit_number__scnprintf(char *buf, size_t size, u64 n);

Expand Down
27 changes: 0 additions & 27 deletions tools/perf/util/util.c
Original file line number Diff line number Diff line change
Expand Up @@ -334,33 +334,6 @@ int hex2u64(const char *ptr, u64 *long_val)
return p - ptr;
}

unsigned long parse_tag_value(const char *str, struct parse_tag *tags)
{
struct parse_tag *i = tags;

while (i->tag) {
char *s;

s = strchr(str, i->tag);
if (s) {
unsigned long int value;
char *endptr;

value = strtoul(str, &endptr, 10);
if (s != endptr)
break;

if (value > ULONG_MAX / i->mult)
break;
value *= i->mult;
return value;
}
i++;
}

return (unsigned long) -1;
}

int perf_event_paranoid(void)
{
int value;
Expand Down
7 changes: 0 additions & 7 deletions tools/perf/util/util.h
Original file line number Diff line number Diff line change
Expand Up @@ -59,13 +59,6 @@ int hex2u64(const char *ptr, u64 *val);
extern unsigned int page_size;
extern int cacheline_size;

struct parse_tag {
char tag;
int mult;
};

unsigned long parse_tag_value(const char *str, struct parse_tag *tags);

bool find_process(const char *name);

int fetch_kernel_version(unsigned int *puint,
Expand Down

0 comments on commit 3caeafc

Please sign in to comment.