Commit a041ede0 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'perf-core-for-mingo-5.3-20190701' of... 

Merge tag 'perf-core-for-mingo-5.3-20190701' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux

 into perf/core

Pull perf/core improvements and fixes from Arnaldo Carvalho de Melo:

perf annotate:

  Mao Han:

  - Add support for the csky processor architecture.

perf stat:

  Andi Kleen:

  - Fix metrics with --no-merge.

  - Don't merge events in the same PMU.

  - Fix group lookup for metric group.

Intel PT:

  Adrian Hunter:

  - Improve CBR (Core to Bus Ratio) packets support.

  - Fix thread stack return from kernel for kernel only case.

  - Export power and ptwrite events to sqlite and postgresql.

core libraries:

  Arnaldo Carvalho de Melo:

  - Find routines in tools/perf/util/ that have implementations in the kernel
    libraries (lib/*.c), such as strreplace(), strim(), skip_spaces() and reuse
    them after making a copy into tools/lib and tools/include/.

    This continues the effort of having tools/ code looking as much as possible
    like kernel source code, to help encourage people to work on both the kernel
    and in tools hosted in the kernel sources.

    That in turn will help moving stuff that uses those routines to
    tools/lib/perf/ where they will be made available for use in other tools.

    In the process ditch old cruft, remove unused variables and add missing
    include directives for headers providing things used in places that were
    building by sheer luck.

  Kyle Meyer:

  - Bump MAX_NR_CPUS and MAX_CACHES to get these tools to work on more machines.

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents fd7d5517 06c642c0

tools/include/linux/ctype.h

0 → 100644
+75 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

#ifndef _LINUX_CTYPE_H

#define _LINUX_CTYPE_H



/*

 * NOTE! This ctype does not handle EOF like the standard C

 * library is required to.

 */



#define _U	0x01	/* upper */

#define _L	0x02	/* lower */

#define _D	0x04	/* digit */

#define _C	0x08	/* cntrl */

#define _P	0x10	/* punct */

#define _S	0x20	/* white space (space/lf/tab) */

#define _X	0x40	/* hex digit */

#define _SP	0x80	/* hard space (0x20) */



extern const unsigned char _ctype[];



#define __ismask(x) (_ctype[(int)(unsigned char)(x)])



#define isalnum(c)	((__ismask(c)&(_U|_L|_D)) != 0)

#define isalpha(c)	((__ismask(c)&(_U|_L)) != 0)

#define iscntrl(c)	((__ismask(c)&(_C)) != 0)

static inline int __isdigit(int c)

{

	return '0' <= c && c <= '9';

}

#define isdigit(c)	__isdigit(c)

#define isgraph(c)	((__ismask(c)&(_P|_U|_L|_D)) != 0)

#define islower(c)	((__ismask(c)&(_L)) != 0)

#define isprint(c)	((__ismask(c)&(_P|_U|_L|_D|_SP)) != 0)

#define ispunct(c)	((__ismask(c)&(_P)) != 0)

/* Note: isspace() must return false for %NUL-terminator */

#define isspace(c)	((__ismask(c)&(_S)) != 0)

#define isupper(c)	((__ismask(c)&(_U)) != 0)

#define isxdigit(c)	((__ismask(c)&(_D|_X)) != 0)



#define isascii(c) (((unsigned char)(c))<=0x7f)

#define toascii(c) (((unsigned char)(c))&0x7f)



static inline unsigned char __tolower(unsigned char c)

{

	if (isupper(c))

		c -= 'A'-'a';

	return c;

}



static inline unsigned char __toupper(unsigned char c)

{

	if (islower(c))

		c -= 'a'-'A';

	return c;

}



#define tolower(c) __tolower(c)

#define toupper(c) __toupper(c)



/*

 * Fast implementation of tolower() for internal usage. Do not use in your

 * code.

 */

static inline char _tolower(const char c)

{

	return c | 0x20;

}



/* Fast check for octal digit */

static inline int isodigit(const char c)

{

	return c >= '0' && c <= '7';

}



#endif

tools/include/linux/string.h

+10 −1
Original line number Diff line number Diff line
@@ -7,6 +7,9 @@ 


void *memdup(const void *src, size_t len);



char **argv_split(const char *str, int *argcp);

void argv_free(char **argv);



int strtobool(const char *s, bool *res);



/*
@@ -19,6 +22,8 @@ extern size_t strlcpy(char *dest, const char *src, size_t size); 


char *str_error_r(int errnum, char *buf, size_t buflen);



char *strreplace(char *s, char old, char new);



/**

 * strstarts - does @str start with @prefix?

 * @str: string to examine
@@ -29,4 +34,8 @@ static inline bool strstarts(const char *str, const char *prefix) 
	return strncmp(str, prefix, strlen(prefix)) == 0;

}



#endif /* _LINUX_STRING_H_ */
 
extern char * __must_check skip_spaces(const char *);



extern char *strim(char *);



#endif /* _TOOLS_LINUX_STRING_H_ */

tools/lib/argv_split.c

0 → 100644
+100 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/*

 * Helper function for splitting a string into an argv-like array.

 */



#include <stdlib.h>

#include <linux/kernel.h>

#include <linux/ctype.h>

#include <linux/string.h>



static const char *skip_arg(const char *cp)

{

	while (*cp && !isspace(*cp))

		cp++;



	return cp;

}



static int count_argc(const char *str)

{

	int count = 0;



	while (*str) {

		str = skip_spaces(str);

		if (*str) {

			count++;

			str = skip_arg(str);

		}

	}



	return count;

}



/**

 * argv_free - free an argv

 * @argv - the argument vector to be freed

 *

 * Frees an argv and the strings it points to.

 */

void argv_free(char **argv)

{

	char **p;

	for (p = argv; *p; p++) {

		free(*p);

		*p = NULL;

	}



	free(argv);

}



/**

 * argv_split - split a string at whitespace, returning an argv

 * @str: the string to be split

 * @argcp: returned argument count

 *

 * Returns an array of pointers to strings which are split out from

 * @str.  This is performed by strictly splitting on white-space; no

 * quote processing is performed.  Multiple whitespace characters are

 * considered to be a single argument separator.  The returned array

 * is always NULL-terminated.  Returns NULL on memory allocation

 * failure.

 */

char **argv_split(const char *str, int *argcp)

{

	int argc = count_argc(str);

	char **argv = calloc(argc + 1, sizeof(*argv));

	char **argvp;



	if (argv == NULL)

		goto out;



	if (argcp)

		*argcp = argc;



	argvp = argv;



	while (*str) {

		str = skip_spaces(str);



		if (*str) {

			const char *p = str;

			char *t;



			str = skip_arg(str);



			t = strndup(p, str-p);

			if (t == NULL)

				goto fail;

			*argvp++ = t;

		}

	}

	*argvp = NULL;



out:

	return argv;



fail:

	argv_free(argv);

	return NULL;

}

tools/lib/ctype.c

0 → 100644
+35 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/*

 *  linux/lib/ctype.c

 *

 *  Copyright (C) 1991, 1992  Linus Torvalds

 */



#include <linux/ctype.h>

#include <linux/compiler.h>



const unsigned char _ctype[] = {

_C,_C,_C,_C,_C,_C,_C,_C,				/* 0-7 */

_C,_C|_S,_C|_S,_C|_S,_C|_S,_C|_S,_C,_C,			/* 8-15 */

_C,_C,_C,_C,_C,_C,_C,_C,				/* 16-23 */

_C,_C,_C,_C,_C,_C,_C,_C,				/* 24-31 */

_S|_SP,_P,_P,_P,_P,_P,_P,_P,				/* 32-39 */

_P,_P,_P,_P,_P,_P,_P,_P,				/* 40-47 */

_D,_D,_D,_D,_D,_D,_D,_D,				/* 48-55 */

_D,_D,_P,_P,_P,_P,_P,_P,				/* 56-63 */

_P,_U|_X,_U|_X,_U|_X,_U|_X,_U|_X,_U|_X,_U,		/* 64-71 */

_U,_U,_U,_U,_U,_U,_U,_U,				/* 72-79 */

_U,_U,_U,_U,_U,_U,_U,_U,				/* 80-87 */

_U,_U,_U,_P,_P,_P,_P,_P,				/* 88-95 */

_P,_L|_X,_L|_X,_L|_X,_L|_X,_L|_X,_L|_X,_L,		/* 96-103 */

_L,_L,_L,_L,_L,_L,_L,_L,				/* 104-111 */

_L,_L,_L,_L,_L,_L,_L,_L,				/* 112-119 */

_L,_L,_L,_P,_P,_P,_P,_C,				/* 120-127 */

0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,			/* 128-143 */

0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,			/* 144-159 */

_S|_SP,_P,_P,_P,_P,_P,_P,_P,_P,_P,_P,_P,_P,_P,_P,_P,	/* 160-175 */

_P,_P,_P,_P,_P,_P,_P,_P,_P,_P,_P,_P,_P,_P,_P,_P,	/* 176-191 */

_U,_U,_U,_U,_U,_U,_U,_U,_U,_U,_U,_U,_U,_U,_U,_U,	/* 192-207 */

_U,_U,_U,_U,_U,_U,_U,_P,_U,_U,_U,_U,_U,_U,_U,_L,	/* 208-223 */

_L,_L,_L,_L,_L,_L,_L,_L,_L,_L,_L,_L,_L,_L,_L,_L,	/* 224-239 */

_L,_L,_L,_L,_L,_L,_L,_P,_L,_L,_L,_L,_L,_L,_L,_L};	/* 240-255 */

tools/lib/string.c

+55 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include <string.h>

#include <errno.h>

#include <linux/string.h>

#include <linux/ctype.h>

#include <linux/compiler.h>



/**
@@ -106,3 +107,57 @@ size_t __weak strlcpy(char *dest, const char *src, size_t size) 
	}

	return ret;

}



/**

 * skip_spaces - Removes leading whitespace from @str.

 * @str: The string to be stripped.

 *

 * Returns a pointer to the first non-whitespace character in @str.

 */

char *skip_spaces(const char *str)

{

	while (isspace(*str))

		++str;

	return (char *)str;

}



/**

 * strim - Removes leading and trailing whitespace from @s.

 * @s: The string to be stripped.

 *

 * Note that the first trailing whitespace is replaced with a %NUL-terminator

 * in the given string @s. Returns a pointer to the first non-whitespace

 * character in @s.

 */

char *strim(char *s)

{

	size_t size;

	char *end;



	size = strlen(s);

	if (!size)

		return s;



	end = s + size - 1;

	while (end >= s && isspace(*end))

		end--;

	*(end + 1) = '\0';



	return skip_spaces(s);

}



/**

 * strreplace - Replace all occurrences of character in string.

 * @s: The string to operate on.

 * @old: The character being replaced.

 * @new: The character @old is replaced with.

 *

 * Returns pointer to the nul byte at the end of @s.

 */

char *strreplace(char *s, char old, char new)

{

	for (; *s; ++s)

		if (*s == old)

			*s = new;

	return s;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE