Skip to contentSkip to conversation

perf python: Fix breakage introduced by the test_attr infrastructure

tip:perf/core tip-bot for Arnaldo Carvalho de Melo 1 participant 1 message Jan 25, 2013 perf events

lore
Share & tools
lore
#0 lore raw
Commit-ID:  0c6332e9d8b8f38a9d5f0cdd66c5575e76ad8995
Gitweb:     http://git.kernel.org/tip/0c6332e9d8b8f38a9d5f0cdd66c5575e76ad8995
Author:     Arnaldo Carvalho de Melo <[email protected]>
AuthorDate: Thu, 13 Dec 2012 16:43:04 -0300
Committer:  Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Thu, 24 Jan 2013 16:40:09 -0300

perf python: Fix breakage introduced by the test_attr infrastructure

The test_attr infrastructure hooks on the sys_perf_event_open call, checking if a variable is set and if so calling a function to intercept calls and do the checking.

But both the variable and the function aren't on objects that are linked on the python binding, breaking it:

  # perf test -v 15
  15: Try 'use perf' in python, checking link problems       :
  --- start ---
  Traceback (most recent call last):
    File "<stdin>", line 1, in <module>
  ImportError: /home/acme/git/build/perf//python/perf.so: undefined symbol: test_attr__enabled
  ---- end ----
  Try 'use perf' in python, checking link problems: FAILED!
  #

Fix it by moving the variable to one of the linked object files and providing a stub for the function in the python.o object, that is only linked in the python binding.

Now 'perf test' is happy again:

  # perf test 15
  15: Try 'use perf' in python, checking link problems       : Ok
  #
Cc David Ahern <[email protected]>
Cc Frederic Weisbecker <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Mike Galbraith <[email protected]>
Cc Namhyung Kim <[email protected]>
Cc Paul Mackerras <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Stephane Eranian <[email protected]>
---
 tools/perf/tests/attr.c  | 2 --
 tools/perf/util/python.c | 9 +++++++++
 tools/perf/util/util.c   | 2 ++
 3 files changed, 11 insertions(+), 2 deletions(-)
tools/perf/tests/attr.c +0 -2
index 25638a9..05b5acb 100644
@@ -33,8 +33,6 @@
 
 extern int verbose;
 
-bool test_attr__enabled;
-
 static char *dir;
 
 void test_attr__init(void)
tools/perf/util/python.c +9 -0
index a2657fd..925e0c3 100644
@@ -1045,3 +1045,12 @@ error:
 	if (PyErr_Occurred())
 		PyErr_SetString(PyExc_ImportError, "perf: Init failed!");
 }
+
+/*
+ * Dummy, to avoid dragging all the test_attr infrastructure in the python
+ * binding.
+ */
+void test_attr__open(struct perf_event_attr *attr, pid_t pid, int cpu,
+                     int fd, int group_fd, unsigned long flags)
+{
+}
tools/perf/util/util.c +2 -0
index 5906e84..252b889 100644
@@ -12,6 +12,8 @@
  */
 unsigned int page_size;
 
+bool test_attr__enabled;
+
 bool perf_host  = true;
 bool perf_guest = false;