Skip to content

Commit

Permalink
perf scripts: Fallback to syscalls:* when raw_syscalls:* is not avail…
Browse files Browse the repository at this point in the history
…able

Older kernels (e.g., RHEL6) do system call tracing via the
syscalls:sys_{enter,exit} tracepoints rather than using raw_syscalls:*.

Update perf python and perl scripts to fallback to syscalls:* when
raw_syscalls:* isn't available.

Signed-off-by: Daniel Bristot de Oliveira <bristot@redhat.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Luis Claudio R. Goncalves <lgoncalv@redhat.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/5a6c64081a3375bc3bc66351b14559678ef4d71e.1402507908.git.bristot@redhat.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
  • Loading branch information
Daniel Bristot de Oliveira authored and Arnaldo Carvalho de Melo committed Jun 25, 2014
1 parent 1c92f88 commit 0710087
Show file tree
Hide file tree
Showing 10 changed files with 35 additions and 5 deletions.
3 changes: 2 additions & 1 deletion tools/perf/scripts/perl/bin/failed-syscalls-record
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
#!/bin/bash
perf record -e raw_syscalls:sys_exit $@
(perf record -e raw_syscalls:sys_exit $@ || \
perf record -e syscalls:sys_exit $@) 2> /dev/null
5 changes: 5 additions & 0 deletions tools/perf/scripts/perl/failed-syscalls.pl
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,11 @@ sub raw_syscalls::sys_exit
}
}

sub syscalls::sys_exit
{
raw_syscalls::sys_exit(@_)
}

sub trace_end
{
printf("\nfailed syscalls by comm:\n\n");
Expand Down
3 changes: 2 additions & 1 deletion tools/perf/scripts/python/bin/failed-syscalls-by-pid-record
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
#!/bin/bash
perf record -e raw_syscalls:sys_exit $@
(perf record -e raw_syscalls:sys_exit $@ || \
perf record -e syscalls:sys_exit $@) 2> /dev/null
3 changes: 2 additions & 1 deletion tools/perf/scripts/python/bin/sctop-record
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
#!/bin/bash
perf record -e raw_syscalls:sys_enter $@
(perf record -e raw_syscalls:sys_enter $@ || \
perf record -e syscalls:sys_enter $@) 2> /dev/null
3 changes: 2 additions & 1 deletion tools/perf/scripts/python/bin/syscall-counts-by-pid-record
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
#!/bin/bash
perf record -e raw_syscalls:sys_enter $@
(perf record -e raw_syscalls:sys_enter $@ || \
perf record -e syscalls:sys_enter $@) 2> /dev/null
3 changes: 2 additions & 1 deletion tools/perf/scripts/python/bin/syscall-counts-record
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
#!/bin/bash
perf record -e raw_syscalls:sys_enter $@
(perf record -e raw_syscalls:sys_enter $@ || \
perf record -e syscalls:sys_enter $@) 2> /dev/null
5 changes: 5 additions & 0 deletions tools/perf/scripts/python/failed-syscalls-by-pid.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,11 @@ def raw_syscalls__sys_exit(event_name, context, common_cpu,
except TypeError:
syscalls[common_comm][common_pid][id][ret] = 1

def syscalls__sys_exit(event_name, context, common_cpu,
common_secs, common_nsecs, common_pid, common_comm,
id, ret):
raw_syscalls__sys_exit(**locals())

def print_error_totals():
if for_comm is not None:
print "\nsyscall errors for %s:\n\n" % (for_comm),
Expand Down
5 changes: 5 additions & 0 deletions tools/perf/scripts/python/sctop.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,11 @@ def raw_syscalls__sys_enter(event_name, context, common_cpu,
except TypeError:
syscalls[id] = 1

def syscalls__sys_enter(event_name, context, common_cpu,
common_secs, common_nsecs, common_pid, common_comm,
id, args):
raw_syscalls__sys_enter(**locals())

def print_syscall_totals(interval):
while 1:
clear_term()
Expand Down
5 changes: 5 additions & 0 deletions tools/perf/scripts/python/syscall-counts-by-pid.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,11 @@ def raw_syscalls__sys_enter(event_name, context, common_cpu,
except TypeError:
syscalls[common_comm][common_pid][id] = 1

def syscalls__sys_enter(event_name, context, common_cpu,
common_secs, common_nsecs, common_pid, common_comm,
id, args):
raw_syscalls__sys_enter(**locals())

def print_syscall_totals():
if for_comm is not None:
print "\nsyscall events for %s:\n\n" % (for_comm),
Expand Down
5 changes: 5 additions & 0 deletions tools/perf/scripts/python/syscall-counts.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,11 @@ def raw_syscalls__sys_enter(event_name, context, common_cpu,
except TypeError:
syscalls[id] = 1

def syscalls__sys_enter(event_name, context, common_cpu,
common_secs, common_nsecs, common_pid, common_comm,
id, args):
raw_syscalls__sys_enter(**locals())

def print_syscall_totals():
if for_comm is not None:
print "\nsyscall events for %s:\n\n" % (for_comm),
Expand Down

0 comments on commit 0710087

Please sign in to comment.