Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b2aff5f6 authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo
Browse files

perf tools: Move hex2u64 into util object 



Moving hex2u64 function into util object.

Signed-off-by: default avatarJiri Olsa <jolsa@redhat.com>
Reviewed-by: default avatarNamhyung Kim <namhyung@kernel.org>
Tested-by: default avatarNamhyung Kim <namhyung@kernel.org>
Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1351372712-21104-4-git-send-email-jolsa@redhat.com


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 4383db88

tools/perf/util/symbol.c

+0 −33
Original line number Diff line number Diff line
@@ -2050,39 +2050,6 @@ int machines__create_kernel_maps(struct rb_root *machines, pid_t pid) 
	return machine__create_kernel_maps(machine);

}



static int hex(char ch)

{

	if ((ch >= '0') && (ch <= '9'))

		return ch - '0';

	if ((ch >= 'a') && (ch <= 'f'))

		return ch - 'a' + 10;

	if ((ch >= 'A') && (ch <= 'F'))

		return ch - 'A' + 10;

	return -1;

}



/*

 * While we find nice hex chars, build a long_val.

 * Return number of chars processed.

 */

int hex2u64(const char *ptr, u64 *long_val)

{

	const char *p = ptr;

	*long_val = 0;



	while (*p) {

		const int hex_val = hex(*p);



		if (hex_val < 0)

			break;



		*long_val = (*long_val << 4) | hex_val;

		p++;

	}



	return p - ptr;

}



char *strxfrchar(char *s, char from, char to)

{

	char *p = s;

tools/perf/util/symbol.h

+0 −1
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ static inline char *bfd_demangle(void __maybe_unused *v, 
#endif

#endif



int hex2u64(const char *ptr, u64 *val);

char *strxfrchar(char *s, char from, char to);



/*

tools/perf/util/util.c

+33 −0
Original line number Diff line number Diff line
@@ -166,6 +166,39 @@ size_t hex_width(u64 v) 
	return n;

}



static int hex(char ch)

{

	if ((ch >= '0') && (ch <= '9'))

		return ch - '0';

	if ((ch >= 'a') && (ch <= 'f'))

		return ch - 'a' + 10;

	if ((ch >= 'A') && (ch <= 'F'))

		return ch - 'A' + 10;

	return -1;

}



/*

 * While we find nice hex chars, build a long_val.

 * Return number of chars processed.

 */

int hex2u64(const char *ptr, u64 *long_val)

{

	const char *p = ptr;

	*long_val = 0;



	while (*p) {

		const int hex_val = hex(*p);



		if (hex_val < 0)

			break;



		*long_val = (*long_val << 4) | hex_val;

		p++;

	}



	return p - ptr;

}



/* Obtain a backtrace and print it to stdout. */

#ifdef BACKTRACE_SUPPORT

void dump_stack(void)

tools/perf/util/util.h

+1 −0
Original line number Diff line number Diff line
@@ -262,6 +262,7 @@ bool is_power_of_2(unsigned long n) 
}



size_t hex_width(u64 v);

int hex2u64(const char *ptr, u64 *val);



char *rtrim(char *s);