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

Commit bad03ae4 authored by Masami Hiramatsu's avatar Masami Hiramatsu Committed by Steven Rostedt
Browse files

perf probe: Move strtailcmp to string.c 



Since strtailcmp() is enough generic, it should be defined in string.c.

Signed-off-by: default avatarMasami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
Link: http://lkml.kernel.org/r/20110627072715.6528.10677.stgit@fedora15


Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
parent baad2d3e

tools/perf/util/probe-finder.c

+0 −15
Original line number Diff line number Diff line
@@ -43,21 +43,6 @@ 
/* Kprobe tracer basic type is up to u64 */

#define MAX_BASIC_TYPE_BITS	64



/*

 * Compare the tail of two strings.

 * Return 0 if whole of either string is same as another's tail part.

 */

static int strtailcmp(const char *s1, const char *s2)

{

	int i1 = strlen(s1);

	int i2 = strlen(s2);

	while (--i1 >= 0 && --i2 >= 0) {

		if (s1[i1] != s2[i2])

			return s1[i1] - s2[i2];

	}

	return 0;

}



/* Line number list operations */



/* Add a line to line number list */

tools/perf/util/string.c

+19 −0
Original line number Diff line number Diff line
@@ -294,3 +294,22 @@ bool strlazymatch(const char *str, const char *pat) 
{

	return __match_glob(str, pat, true);

}



/**

 * strtailcmp - Compare the tail of two strings

 * @s1: 1st string to be compared

 * @s2: 2nd string to be compared

 *

 * Return 0 if whole of either string is same as another's tail part.

 */

int strtailcmp(const char *s1, const char *s2)

{

	int i1 = strlen(s1);

	int i2 = strlen(s2);

	while (--i1 >= 0 && --i2 >= 0) {

		if (s1[i1] != s2[i2])

			return s1[i1] - s2[i2];

	}

	return 0;

}

tools/perf/util/util.h

+1 −0
Original line number Diff line number Diff line
@@ -238,6 +238,7 @@ char **argv_split(const char *str, int *argcp); 
void argv_free(char **argv);

bool strglobmatch(const char *str, const char *pat);

bool strlazymatch(const char *str, const char *pat);

int strtailcmp(const char *s1, const char *s2);

unsigned long convert_unit(unsigned long value, char *unit);

int readn(int fd, void *buf, size_t size);