Commit 3052ba56 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

tools perf: Move from sane_ctype.h obtained from git to the Linux's original 

We got the sane_ctype.h headers from git and kept using it so far, but
since that code originally came from the kernel sources to the git
sources, perhaps its better to just use the one in the kernel, so that
we can leverage tools/perf/check_headers.sh to be notified when our copy
gets out of sync, i.e. when fixes or goodies are added to the code we've
copied.

This will help with things like tools/lib/string.c where we want to have
more things in common with the kernel, such as strim(), skip_spaces(),
etc so as to go on removing the things that we have in tools/perf/util/
and instead using the code in the kernel, indirectly and removing things
like EXPORT_SYMBOL(), etc, getting notified when fixes and improvements
are made to the original code.

Hopefully this also should help with reducing the difference of code
hosted in tools/ to the one in the kernel proper.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: https://lkml.kernel.org/n/tip-7k9868l713wqtgo01xxygn12@git.kernel.org


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

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/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/symbol/kallsyms.c

+0 −1
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

#include <ctype.h>

#include "symbol/kallsyms.h"

#include <stdio.h>

#include <stdlib.h>

tools/lib/symbol/kallsyms.h

+1 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
#define __TOOLS_KALLSYMS_H_ 1



#include <elf.h>

#include <linux/ctype.h>

#include <linux/types.h>



#ifndef KSYM_NAME_LEN

tools/perf/MANIFEST

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ tools/lib/traceevent 
tools/lib/api

tools/lib/bpf

tools/lib/subcmd

tools/lib/ctype.c

tools/lib/hweight.c

tools/lib/rbtree.c

tools/lib/string.c

CRA Git | Maintained and supported by SUSTech CRA and CCSE