diff options
| author | Jiri Olsa <jolsa@redhat.com> | 2013-12-03 08:09:30 -0500 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2013-12-04 13:30:36 -0500 |
| commit | de705e2e88442c0c5dc6ec8c1f3fb1931def102e (patch) | |
| tree | a7e9019676f3541c3d4f7a3464038674774cb49a /tools/lib | |
| parent | 35d79f9ff88765af3fba6981db8d071872dcc5a8 (diff) | |
tools lib traceevent: Add mac80211 plugin
Backporting mac80211 plugin.
Backported from Steven Rostedt's trace-cmd repo (HEAD 0f2c2fb):
git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/trace-cmd.git
This plugin adds changed field resolving for
mac80211:drv_bss_info_changed tracepoint event.
The diff of 'perf script' output generated by old and new code:
(data was generated by 'perf record -e 'mac80211:drv_bss_info_changed' -a')
--- script.mac80211.old
+++ script.mac80211.new
- ifconfig 3711 [000] 1290.446492: mac80211:drv_bss_info_changed: phy0 vif:wlan0(2) changed:0x309f
+ ifconfig 3711 [000] 1290.446492: mac80211:drv_bss_info_changed: phy0 vif:wlan0(2)
+ assoc:0 aid:2 cts:0 shortpre:0 shortslot:0 dtimper:1
+ bcnint:102 assoc_cap:0x431 basic_rates:0xf enable_beacon:0
+ ht_operation_mode:0
Omitting the mac80211:drv_config tracepoint handling because the kernel
tracepoint changed its prototype and the plugin handler is no longer
working.
Signed-off-by: Jiri Olsa <jolsa@redhat.com>
Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Steven Rostedt <rostedt@goodmis.org>
Link: http://lkml.kernel.org/r/1386076182-14484-17-git-send-email-jolsa@redhat.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/lib')
| -rw-r--r-- | tools/lib/traceevent/Makefile | 1 | ||||
| -rw-r--r-- | tools/lib/traceevent/plugin_mac80211.c | 95 |
2 files changed, 96 insertions, 0 deletions
diff --git a/tools/lib/traceevent/Makefile b/tools/lib/traceevent/Makefile index 226a8f9fb177..d0e0ca12aa10 100644 --- a/tools/lib/traceevent/Makefile +++ b/tools/lib/traceevent/Makefile | |||
| @@ -216,6 +216,7 @@ PLUGIN_OBJS = plugin_jbd2.o | |||
| 216 | PLUGIN_OBJS += plugin_hrtimer.o | 216 | PLUGIN_OBJS += plugin_hrtimer.o |
| 217 | PLUGIN_OBJS += plugin_kmem.o | 217 | PLUGIN_OBJS += plugin_kmem.o |
| 218 | PLUGIN_OBJS += plugin_kvm.o | 218 | PLUGIN_OBJS += plugin_kvm.o |
| 219 | PLUGIN_OBJS += plugin_mac80211.o | ||
| 219 | 220 | ||
| 220 | PLUGINS := $(PLUGIN_OBJS:.o=.so) | 221 | PLUGINS := $(PLUGIN_OBJS:.o=.so) |
| 221 | 222 | ||
diff --git a/tools/lib/traceevent/plugin_mac80211.c b/tools/lib/traceevent/plugin_mac80211.c new file mode 100644 index 000000000000..558a3b91c046 --- /dev/null +++ b/tools/lib/traceevent/plugin_mac80211.c | |||
| @@ -0,0 +1,95 @@ | |||
| 1 | /* | ||
| 2 | * Copyright (C) 2009 Johannes Berg <johannes@sipsolutions.net> | ||
| 3 | * | ||
| 4 | * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | ||
| 5 | * This program is free software; you can redistribute it and/or | ||
| 6 | * modify it under the terms of the GNU Lesser General Public | ||
| 7 | * License as published by the Free Software Foundation; | ||
| 8 | * version 2.1 of the License (not later!) | ||
| 9 | * | ||
| 10 | * This program is distributed in the hope that it will be useful, | ||
| 11 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 12 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 13 | * GNU Lesser General Public License for more details. | ||
| 14 | * | ||
| 15 | * You should have received a copy of the GNU Lesser General Public | ||
| 16 | * License along with this program; if not, see <http://www.gnu.org/licenses> | ||
| 17 | * | ||
| 18 | * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | ||
| 19 | */ | ||
| 20 | #include <stdio.h> | ||
| 21 | #include <stdlib.h> | ||
| 22 | #include <string.h> | ||
| 23 | |||
| 24 | #include "event-parse.h" | ||
| 25 | |||
| 26 | #define INDENT 65 | ||
| 27 | |||
| 28 | static void print_string(struct trace_seq *s, struct event_format *event, | ||
| 29 | const char *name, const void *data) | ||
| 30 | { | ||
| 31 | struct format_field *f = pevent_find_field(event, name); | ||
| 32 | int offset; | ||
| 33 | int length; | ||
| 34 | |||
| 35 | if (!f) { | ||
| 36 | trace_seq_printf(s, "NOTFOUND:%s", name); | ||
| 37 | return; | ||
| 38 | } | ||
| 39 | |||
| 40 | offset = f->offset; | ||
| 41 | length = f->size; | ||
| 42 | |||
| 43 | if (!strncmp(f->type, "__data_loc", 10)) { | ||
| 44 | unsigned long long v; | ||
| 45 | if (pevent_read_number_field(f, data, &v)) { | ||
| 46 | trace_seq_printf(s, "invalid_data_loc"); | ||
| 47 | return; | ||
| 48 | } | ||
| 49 | offset = v & 0xffff; | ||
| 50 | length = v >> 16; | ||
| 51 | } | ||
| 52 | |||
| 53 | trace_seq_printf(s, "%.*s", length, (char *)data + offset); | ||
| 54 | } | ||
| 55 | |||
| 56 | #define SF(fn) pevent_print_num_field(s, fn ":%d", event, fn, record, 0) | ||
| 57 | #define SFX(fn) pevent_print_num_field(s, fn ":%#x", event, fn, record, 0) | ||
| 58 | #define SP() trace_seq_putc(s, ' ') | ||
| 59 | |||
| 60 | static int drv_bss_info_changed(struct trace_seq *s, | ||
| 61 | struct pevent_record *record, | ||
| 62 | struct event_format *event, void *context) | ||
| 63 | { | ||
| 64 | void *data = record->data; | ||
| 65 | |||
| 66 | print_string(s, event, "wiphy_name", data); | ||
| 67 | trace_seq_printf(s, " vif:"); | ||
| 68 | print_string(s, event, "vif_name", data); | ||
| 69 | pevent_print_num_field(s, "(%d)", event, "vif_type", record, 1); | ||
| 70 | |||
| 71 | trace_seq_printf(s, "\n%*s", INDENT, ""); | ||
| 72 | SF("assoc"); SP(); | ||
| 73 | SF("aid"); SP(); | ||
| 74 | SF("cts"); SP(); | ||
| 75 | SF("shortpre"); SP(); | ||
| 76 | SF("shortslot"); SP(); | ||
| 77 | SF("dtimper"); SP(); | ||
| 78 | trace_seq_printf(s, "\n%*s", INDENT, ""); | ||
| 79 | SF("bcnint"); SP(); | ||
| 80 | SFX("assoc_cap"); SP(); | ||
| 81 | SFX("basic_rates"); SP(); | ||
| 82 | SF("enable_beacon"); | ||
| 83 | trace_seq_printf(s, "\n%*s", INDENT, ""); | ||
| 84 | SF("ht_operation_mode"); | ||
| 85 | |||
| 86 | return 0; | ||
| 87 | } | ||
| 88 | |||
| 89 | int PEVENT_PLUGIN_LOADER(struct pevent *pevent) | ||
| 90 | { | ||
| 91 | pevent_register_event_handler(pevent, -1, "mac80211", | ||
| 92 | "drv_bss_info_changed", | ||
| 93 | drv_bss_info_changed, NULL); | ||
| 94 | return 0; | ||
| 95 | } | ||
