From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932278AbcGOHaR (ORCPT ); Fri, 15 Jul 2016 03:30:17 -0400 Received: from mx1.redhat.com ([209.132.183.28]:51633 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932248AbcGOHaO (ORCPT ); Fri, 15 Jul 2016 03:30:14 -0400 From: Jiri Olsa To: Arnaldo Carvalho de Melo Cc: "Steven Rostedt (Red Hat)" , lkml , David Ahern , Ingo Molnar , Namhyung Kim , Peter Zijlstra Subject: [PATCH 2/3] perf tools: Make is_printable_array global Date: Fri, 15 Jul 2016 09:29:56 +0200 Message-Id: <1468567797-27564-3-git-send-email-jolsa@kernel.org> In-Reply-To: <1468567797-27564-1-git-send-email-jolsa@kernel.org> References: <1468567797-27564-1-git-send-email-jolsa@kernel.org> X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Fri, 15 Jul 2016 07:30:14 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org It's used from 2 objects in perf, so it's better to keep just one copy. Cc: Steven Rostedt (Red Hat) Link: http://lkml.kernel.org/n/tip-dss4lxnywysgpyjd8p7paffg@git.kernel.org Signed-off-by: Jiri Olsa --- tools/perf/util/python.c | 12 ------------ tools/perf/util/scripting-engines/trace-event-python.c | 14 -------------- tools/perf/util/util.c | 14 ++++++++++++++ tools/perf/util/util.h | 1 + 4 files changed, 15 insertions(+), 26 deletions(-) diff --git a/tools/perf/util/python.c b/tools/perf/util/python.c index d32f97033718..a5fbc012e3df 100644 --- a/tools/perf/util/python.c +++ b/tools/perf/util/python.c @@ -295,18 +295,6 @@ static bool is_tracepoint(struct pyrf_event *pevent) return pevent->evsel->attr.type == PERF_TYPE_TRACEPOINT; } -static int is_printable_array(char *p, unsigned int len) -{ - unsigned int i; - - for (i = 0; i < len; i++) { - if (!isprint(p[i]) && !isspace(p[i])) - return 0; - } - - return 1; -} - static PyObject* tracepoint_field(struct pyrf_event *pe, struct format_field *field) { diff --git a/tools/perf/util/scripting-engines/trace-event-python.c b/tools/perf/util/scripting-engines/trace-event-python.c index 1bc995de5a6d..e0203b979474 100644 --- a/tools/perf/util/scripting-engines/trace-event-python.c +++ b/tools/perf/util/scripting-engines/trace-event-python.c @@ -386,20 +386,6 @@ exit: return pylist; } -static int is_printable_array(char *p, unsigned int len) -{ - unsigned int i; - - if (p[len - 1] == 0) - len--; - - for (i = 0; i < len - 1; i++) - if (!isprint(p[i]) && !isspace(p[i])) - return 0; - - return 1; -} - static void python_process_tracepoint(struct perf_sample *sample, struct perf_evsel *evsel, struct addr_location *al) diff --git a/tools/perf/util/util.c b/tools/perf/util/util.c index 5f44a21955cd..7ca4719787d0 100644 --- a/tools/perf/util/util.c +++ b/tools/perf/util/util.c @@ -746,3 +746,17 @@ void print_binary(unsigned char *data, size_t len, } printer(BINARY_PRINT_DATA_END, -1, extra); } + +int is_printable_array(char *p, unsigned int len) +{ + unsigned int i; + + if (p[len - 1] == 0) + len--; + + for (i = 0; i < len - 1; i++) + if (!isprint(p[i]) && !isspace(p[i])) + return 0; + + return 1; +} diff --git a/tools/perf/util/util.h b/tools/perf/util/util.h index 6178cab82374..66d24bdbac33 100644 --- a/tools/perf/util/util.h +++ b/tools/perf/util/util.h @@ -364,4 +364,5 @@ void print_binary(unsigned char *data, size_t len, extern int sched_getcpu(void); #endif +int is_printable_array(char *p, unsigned int len); #endif /* GIT_COMPAT_UTIL_H */ -- 2.4.11