Commit a73c7d84 authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Ingo Molnar
Browse files

perf_counter tools: Add and use isprint() 



Introduce isprint() to print out raw event dumps to ASCII, etc.

(This is an extension to upstream Git's ctype.c.)

Signed-off-by: default avatarPeter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
LKML-Reference: <new-submission>
[ removed openssl.h inclusion from util.h - it leaked ctype.h ]
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 7522060c

tools/perf/builtin-report.c

+1 −1
Original line number Diff line number Diff line
@@ -1285,7 +1285,7 @@ static void trace_event(event_t *event) 
			for (j = 0; j < 15-(i & 15); j++)

				cdprintf("   ");

			for (j = 0; j < (i & 15); j++) {

				if (issane(raw_event[i-15+j]))

				if (isprint(raw_event[i-15+j]))

					cdprintf("%c", raw_event[i-15+j]);

				else

					cdprintf(".");

tools/perf/util/ctype.c

+11 −6
Original line number Diff line number Diff line
@@ -11,16 +11,21 @@ enum { 
	D = GIT_DIGIT,

	G = GIT_GLOB_SPECIAL,	/* *, ?, [, \\ */

	R = GIT_REGEX_SPECIAL,	/* $, (, ), +, ., ^, {, | * */

	P = GIT_PRINT_EXTRA,	/* printable - alpha - digit - glob - regex */



	PS = GIT_SPACE | GIT_PRINT_EXTRA,

};



unsigned char sane_ctype[256] = {

/*	0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F			    */



	0, 0, 0, 0, 0, 0, 0, 0, 0, S, S, 0, 0, S, 0, 0,		/*   0.. 15 */

	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,		/*  16.. 31 */

	S, 0, 0, 0, R, 0, 0, 0, R, R, G, R, 0, 0, R, 0,		/*  32.. 47 */

	D, D, D, D, D, D, D, D, D, D, 0, 0, 0, 0, 0, G,		/*  48.. 63 */

	0, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,		/*  64.. 79 */

	A, A, A, A, A, A, A, A, A, A, A, G, G, 0, R, 0,		/*  80.. 95 */

	0, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,		/*  96..111 */

	A, A, A, A, A, A, A, A, A, A, A, R, R, 0, 0, 0,		/* 112..127 */

	PS,P, P, P, R, P, P, P, R, R, G, R, P, P, R, P,		/*  32.. 47 */

	D, D, D, D, D, D, D, D, D, D, P, P, P, P, P, G,		/*  48.. 63 */

	P, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,		/*  64.. 79 */

	A, A, A, A, A, A, A, A, A, A, A, G, G, P, R, P,		/*  80.. 95 */

	P, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,		/*  96..111 */

	A, A, A, A, A, A, A, A, A, A, A, R, R, P, P, 0,		/* 112..127 */

	/* Nothing in the 128.. range */

};

tools/perf/util/util.h

+8 −11
Original line number Diff line number Diff line
@@ -100,11 +100,6 @@ 
#include <iconv.h>

#endif



#ifndef NO_OPENSSL

#include <openssl/ssl.h>

#include <openssl/err.h>

#endif



/* On most systems <limits.h> would have given us this, but

 * not on some systems (e.g. GNU/Hurd).

 */
@@ -337,13 +332,15 @@ extern unsigned char sane_ctype[256]; 
#define GIT_ALPHA		0x04

#define GIT_GLOB_SPECIAL	0x08

#define GIT_REGEX_SPECIAL	0x10

#define GIT_PRINT_EXTRA		0x20

#define GIT_PRINT		0x3E

#define sane_istest(x,mask) ((sane_ctype[(unsigned char)(x)] & (mask)) != 0)

#define isascii(x) (((x) & ~0x7f) == 0)

#define isspace(x) sane_istest(x,GIT_SPACE)

#define isdigit(x) sane_istest(x,GIT_DIGIT)

#define isalpha(x) sane_istest(x,GIT_ALPHA)

#define isalnum(x) sane_istest(x,GIT_ALPHA | GIT_DIGIT)

#define issane(x)  sane_istest(x,GIT_SPACE | GIT_DIGIT | GIT_ALPHA | GIT_GLOB_SPECIAL | GIT_REGEX_SPECIAL)

#define isprint(x) sane_istest(x,GIT_PRINT)

#define is_glob_special(x) sane_istest(x,GIT_GLOB_SPECIAL)

#define is_regex_special(x) sane_istest(x,GIT_GLOB_SPECIAL | GIT_REGEX_SPECIAL)

#define tolower(x) sane_case((unsigned char)(x), 0x20)

CRA Git | Maintained and supported by SUSTech CRA and CCSE