Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8dd2a131 authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo
Browse files

perf evsel: Propagate error info from tp_format 



Propagate error info from tp_format via ERR_PTR to get it all the way
down to the parse-event.c tracepoint adding routines. Following
functions now return pointer with encoded error:

  - tp_format
  - trace_event__tp_format
  - perf_evsel__newtp_idx
  - perf_evsel__newtp

This affects several other places in perf, that cannot use pointer check
anymore, but must utilize the err.h interface, when getting error
information from above functions list.

Signed-off-by: default avatarJiri Olsa <jolsa@kernel.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Matt Fleming <matt@codeblueprint.co.uk>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Raphael Beamonte <raphael.beamonte@gmail.com>
Link: http://lkml.kernel.org/r/1441615087-13886-5-git-send-email-jolsa@kernel.org


[ Add two missing ERR_PTR() and one IS_ERR() ]
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent e2f9f8ea

tools/perf/builtin-trace.c

+11 −8
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ 
#include <stdlib.h>

#include <sys/mman.h>

#include <linux/futex.h>

#include <linux/err.h>



/* For older distros: */

#ifndef MAP_STACK
@@ -245,13 +246,14 @@ static struct perf_evsel *perf_evsel__syscall_newtp(const char *direction, void 
	struct perf_evsel *evsel = perf_evsel__newtp("raw_syscalls", direction);



	/* older kernel (e.g., RHEL6) use syscalls:{enter,exit} */

	if (evsel == NULL)

	if (IS_ERR(evsel))

		evsel = perf_evsel__newtp("syscalls", direction);



	if (evsel) {

	if (IS_ERR(evsel))

		return NULL;



	if (perf_evsel__init_syscall_tp(evsel, handler))

		goto out_delete;

	}



	return evsel;
@@ -1705,12 +1707,12 @@ static int trace__read_syscall_info(struct trace *trace, int id) 
	snprintf(tp_name, sizeof(tp_name), "sys_enter_%s", sc->name);

	sc->tp_format = trace_event__tp_format("syscalls", tp_name);



	if (sc->tp_format == NULL && sc->fmt && sc->fmt->alias) {

	if (IS_ERR(sc->tp_format) && sc->fmt && sc->fmt->alias) {

		snprintf(tp_name, sizeof(tp_name), "sys_enter_%s", sc->fmt->alias);

		sc->tp_format = trace_event__tp_format("syscalls", tp_name);

	}



	if (sc->tp_format == NULL)

	if (IS_ERR(sc->tp_format))

		return -1;



	sc->args = sc->tp_format->format.fields;
@@ -2390,7 +2392,8 @@ static size_t trace__fprintf_thread_summary(struct trace *trace, FILE *fp); 
static bool perf_evlist__add_vfs_getname(struct perf_evlist *evlist)

{

	struct perf_evsel *evsel = perf_evsel__newtp("probe", "vfs_getname");

	if (evsel == NULL)



	if (IS_ERR(evsel))

		return false;



	if (perf_evsel__field(evsel, "pathname") == NULL) {

tools/perf/tests/evsel-tp-sched.c

+8 −2
Original line number Diff line number Diff line 
#include <linux/err.h>

#include <traceevent/event-parse.h>

#include "evsel.h"

#include "tests.h"
@@ -36,8 +37,8 @@ int test__perf_evsel__tp_sched_test(void) 
	struct perf_evsel *evsel = perf_evsel__newtp("sched", "sched_switch");

	int ret = 0;



	if (evsel == NULL) {

		pr_debug("perf_evsel__new\n");

	if (IS_ERR(evsel)) {

		pr_debug("perf_evsel__newtp failed with %ld\n", PTR_ERR(evsel));

		return -1;

	}
@@ -66,6 +67,11 @@ int test__perf_evsel__tp_sched_test(void) 


	evsel = perf_evsel__newtp("sched", "sched_wakeup");



	if (IS_ERR(evsel)) {

		pr_debug("perf_evsel__newtp failed with %ld\n", PTR_ERR(evsel));

		return -1;

	}



	if (perf_evsel__test_field(evsel, "comm", 16, true))

		ret = -1;

tools/perf/tests/mmap-basic.c

+2 −1
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
#include "thread_map.h"

#include "cpumap.h"

#include "tests.h"

#include <linux/err.h>



/*

 * This test will generate random numbers of calls to some getpid syscalls,
@@ -65,7 +66,7 @@ int test__basic_mmap(void) 


		snprintf(name, sizeof(name), "sys_enter_%s", syscall_names[i]);

		evsels[i] = perf_evsel__newtp("syscalls", name);

		if (evsels[i] == NULL) {

		if (IS_ERR(evsels[i])) {

			pr_debug("perf_evsel__new\n");

			goto out_delete_evlist;

		}

tools/perf/tests/openat-syscall-all-cpus.c

+2 −1
Original line number Diff line number Diff line 
#include <api/fs/fs.h>

#include <linux/err.h>

#include "evsel.h"

#include "tests.h"

#include "thread_map.h"
@@ -31,7 +32,7 @@ int test__openat_syscall_event_on_all_cpus(void) 
	CPU_ZERO(&cpu_set);



	evsel = perf_evsel__newtp("syscalls", "sys_enter_openat");

	if (evsel == NULL) {

	if (IS_ERR(evsel)) {

		tracing_path__strerror_open_tp(errno, errbuf, sizeof(errbuf), "syscalls", "sys_enter_openat");

		pr_err("%s\n", errbuf);

		goto out_thread_map_delete;

tools/perf/tests/openat-syscall-tp-fields.c

+2 −1
Original line number Diff line number Diff line 
#include <linux/err.h>

#include "perf.h"

#include "evlist.h"

#include "evsel.h"
@@ -30,7 +31,7 @@ int test__syscall_openat_tp_fields(void) 
	}



	evsel = perf_evsel__newtp("syscalls", "sys_enter_openat");

	if (evsel == NULL) {

	if (IS_ERR(evsel)) {

		pr_debug("%s: perf_evsel__newtp\n", __func__);

		goto out_delete_evlist;

	}