Commit 3caeafce authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

perf units: Move parse_tag_value() to units.[ch] 

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: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 5068b52f

tools/perf/util/units.c

+29 −0
Original line number Diff line number Diff line 
#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 = ' ';

tools/perf/util/units.h

+7 −0
Original line number Diff line number Diff line
@@ -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);

tools/perf/util/util.c

+0 −27
Original line number Diff line number Diff line
@@ -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;

tools/perf/util/util.h

+0 −7
Original line number Diff line number Diff line
@@ -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,

CRA Git | Maintained and supported by SUSTech CRA and CCSE