Skip to content

Commit

Permalink
perf tools: Make is_printable_array global
Browse files Browse the repository at this point in the history
It's used from 2 objects in perf, so it's better to keep just one copy.

Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Pirko <jiri@mellanox.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Steven Rostedt <rostedt@goodmis.org>
Link: http://lkml.kernel.org/r/1468685480-18951-3-git-send-email-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
  • Loading branch information
Jiri Olsa authored and Arnaldo Carvalho de Melo committed Jul 18, 2016
1 parent 249de6e commit accaed2
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 28 deletions.
12 changes: 0 additions & 12 deletions tools/perf/util/python.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down
16 changes: 0 additions & 16 deletions tools/perf/util/scripting-engines/trace-event-python.c
Original file line number Diff line number Diff line change
Expand Up @@ -386,22 +386,6 @@ static PyObject *python_process_callchain(struct perf_sample *sample,
return pylist;
}

static int is_printable_array(char *p, unsigned int len)
{
unsigned int i;

if (!p || !len || p[len - 1] != 0)
return 0;

len--;

for (i = 0; i < len; 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)
Expand Down
16 changes: 16 additions & 0 deletions tools/perf/util/util.c
Original file line number Diff line number Diff line change
Expand Up @@ -746,3 +746,19 @@ 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 || p[len - 1] != 0)
return 0;

len--;

for (i = 0; i < len; i++) {
if (!isprint(p[i]) && !isspace(p[i]))
return 0;
}
return 1;
}
1 change: 1 addition & 0 deletions tools/perf/util/util.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 */

0 comments on commit accaed2

Please sign in to comment.