5 files changed, 113 insertions, 20 deletions

diff --git a/Makefile b/Makefile
index 6538c97..e879e90 100644
--- a/Makefile
+++ b/Makefile
@@ -18,8 +18,11 @@ CFLAGS = -g -Wall $(CONFIG_FLAGS)
 %.o: %.c
         $(CC) -c $(CFLAGS) $(EXT) $(INCLUDES) $< -o $@
 
-TARGETS = libparsevent.a libtracecmd.a trace-cmd plugin_hrtimer.so plugin_mac80211.so \
-        plugin_sched_switch.so trace-graph trace-view kernelshark
+PLUGINS =  plugin_hrtimer.so plugin_mac80211.so plugin_sched_switch.so \
+        plugin_kmem.so
+
+TARGETS = libparsevent.a libtracecmd.a trace-cmd  $(PLUGINS) \
+        trace-graph trace-view kernelshark
 
 all: $(TARGETS)
 
@@ -99,19 +102,25 @@ libtracecmd.so: $(TCMD_LIB_OBJS)
 libtracecmd.a: $(TCMD_LIB_OBJS)
         $(RM) $@;  $(AR) rcs $@ $^
 
-plugin_hrtimer.o: plugin_hrtimer.c parse-events.h
+plugin_hrtimer.o: plugin_hrtimer.c parse-events.h trace-cmd.h
         $(CC) -c $(CFLAGS) -fPIC -o $@ $<
 
 plugin_hrtimer.so: plugin_hrtimer.o
         $(CC) -shared -nostartfiles -o $@ $<
 
-plugin_sched_switch.o: plugin_sched_switch.c parse-events.h
+plugin_kmem.o: plugin_kmem.c parse-events.h trace-cmd.h
+        $(CC) -c $(CFLAGS) -fPIC -o $@ $<
+
+plugin_kmem.so: plugin_kmem.o
+        $(CC) -shared -nostartfiles -o $@ $<
+
+plugin_sched_switch.o: plugin_sched_switch.c parse-events.h trace-cmd.h
         $(CC) -c $(CFLAGS) -fPIC -o $@ $<
 
 plugin_sched_switch.so: plugin_sched_switch.o
         $(CC) -shared -nostartfiles -o $@ $<
 
-plugin_mac80211.o: plugin_mac80211.c parse-events.h
+plugin_mac80211.o: plugin_mac80211.c parse-events.h trace-cmd.h
         $(CC) -c $(CFLAGS) -fPIC -o $@ $<
 
 plugin_mac80211.so: plugin_mac80211.o
diff --git a/parse-events.c b/parse-events.c
index 53aad3e..406b28f 100644
--- a/parse-events.c
+++ b/parse-events.c
@@ -348,6 +348,27 @@ const char *pevent_find_function(struct pevent *pevent, unsigned long long addr)
 }
 
 /**
+ * pevent_find_function_address - find a function address by a given address
+ * @pevent: handle for the pevent
+ * @addr: the address to find the function with
+ *
+ * Returns the address the function starts at. This can be used in
+ * conjunction with pevent_find_function to print both the function
+ * name and the function offset.
+ */
+unsigned long long
+pevent_find_function_address(struct pevent *pevent, unsigned long long addr)
+{
+        struct func_map *map;
+
+        map = find_func(pevent, addr);
+        if (!map)
+                return 0;
+
+        return map->addr;
+}
+
+/**
  * pevent_register_function - register a function with a given address
  * @pevent: handle for the pevent
  * @function: the function name to register
@@ -3324,9 +3345,12 @@ const char *pevent_data_comm_from_pid(struct pevent *pevent, int pid)
 void pevent_event_info(struct trace_seq *s, struct event_format *event,
                        struct record *record)
 {
+        int print_pretty = 1;
+
         if (event->handler)
-                event->handler(s, record, event);
-        else
+                print_pretty = event->handler(s, record, event);
+
+        if (print_pretty)
                 pretty_print(s, record->data, record->size, event);
 
         trace_seq_terminate(s);
@@ -3342,6 +3366,7 @@ void pevent_print_event(struct pevent *pevent, struct trace_seq *s,
         const char *comm;
         void *data = record->data;
         int size = record->size;
+        int print_pretty = 1;
         int type;
         int pid;
         int len;
@@ -3376,8 +3401,9 @@ void pevent_print_event(struct pevent *pevent, struct trace_seq *s,
                 trace_seq_printf(s, "%.*s", 20 - len, spaces);
         
         if (event->handler)
-                event->handler(s, record, event);
-        else
+                print_pretty = event->handler(s, record, event);
+
+        if (print_pretty)
                 pretty_print(s, data, size, event);
 
         trace_seq_terminate(s);
diff --git a/parse-events.h b/parse-events.h
index bfbba5c..e148e7f 100644
--- a/parse-events.h
+++ b/parse-events.h
@@ -366,6 +366,8 @@ struct format_field *pevent_find_field(struct event_format *event, const char *n
 struct format_field *pevent_find_any_field(struct event_format *event, const char *name);
 
 const char *pevent_find_function(struct pevent *pevent, unsigned long long addr);
+unsigned long long
+pevent_find_function_address(struct pevent *pevent, unsigned long long addr);
 unsigned long long pevent_read_number(struct pevent *pevent, const void *ptr, int size);
 int pevent_read_number_field(struct format_field *field, const void *data,
                              unsigned long long *value);
diff --git a/plugin_kmem.c b/plugin_kmem.c
new file mode 100644
index 0000000..d707bf2
--- /dev/null
+++ b/plugin_kmem.c
@@ -0,0 +1,56 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "trace-cmd.h"
+
+static int call_site_handler(struct trace_seq *s, struct record *record,
+                             struct event_format *event)
+{
+        struct format_field *field;
+        unsigned long long val, addr;
+        void *data = record->data;
+        const char *func;
+
+        field = pevent_find_field(event, "call_site");
+        if (!field)
+                return 1;
+
+        if (pevent_read_number_field(field, data, &val))
+                return 1;
+
+        func = pevent_find_function(event->pevent, val);
+        if (!func)
+                return 1;
+        addr = pevent_find_function_address(event->pevent, val);
+
+        trace_seq_printf(s, "(%s+0x%x) ", func, (int)(val - addr));
+
+        return 1;
+}
+
+int PEVENT_PLUGIN_LOADER(struct pevent *pevent)
+{
+        pevent_register_event_handler(pevent, -1, "kmem", "kfree",
+                                      call_site_handler);
+
+        pevent_register_event_handler(pevent, -1, "kmem", "kmalloc",
+                                      call_site_handler);
+
+        pevent_register_event_handler(pevent, -1, "kmem", "kmalloc_node",
+                                      call_site_handler);
+
+        pevent_register_event_handler(pevent, -1, "kmem", "kmem_cache_alloc",
+                                      call_site_handler);
+
+        pevent_register_event_handler(pevent, -1, "kmem", "kmem_cache_alloc_node",
+                                      call_site_handler);
+
+        pevent_register_event_handler(pevent, -1, "kmem", "kfree",
+                                      call_site_handler);
+
+        pevent_register_event_handler(pevent, -1, "kmem", "kmem_cache_free",
+                                      call_site_handler);
+
+        return 0;
+}
diff --git a/trace-ftrace.c b/trace-ftrace.c
index 1b79ec7..8b0646b 100644
--- a/trace-ftrace.c
+++ b/trace-ftrace.c
@@ -229,7 +229,6 @@ fgraph_ent_handler(struct trace_seq *s, struct record *record,
         void *data = record->data;
         int size = record->size;
         int cpu = record->cpu;
-        int ret;
 
         if (get_field_val(s, data, event, "common_pid", &pid))
                 return trace_seq_putc(s, '!');
@@ -257,15 +256,15 @@ fgraph_ent_handler(struct trace_seq *s, struct record *record,
                  * We also do a new peek on this CPU to update the
                  * record cache.
                  */
-                ret = print_graph_entry_leaf(s, event, data, rec);
+                print_graph_entry_leaf(s, event, data, rec);
                 free_record(rec);
                 tracecmd_peek_data(tracecmd_curr_thread_handle, cpu);
         } else
-                ret = print_graph_nested(s, event, data);
+                print_graph_nested(s, event, data);
 
         free(data);
 
-        return ret;
+        return 0;
 }
 
 static int
@@ -298,7 +297,9 @@ fgraph_ret_handler(struct trace_seq *s, struct record *record,
         for (i = 0; i < (int)(depth * TRACE_GRAPH_INDENT); i++)
                 trace_seq_putc(s, ' ');
 
-        return trace_seq_putc(s, '}');
+        trace_seq_putc(s, '}');
+
+        return 0;
 }
 
 static int
@@ -309,16 +310,15 @@ trace_stack_handler(struct trace_seq *s, struct record *record,
         unsigned long long addr;
         const char *func;
         void *data = record->data;
-        int ret;
         int i;
 
         field = pevent_find_any_field(event, "caller");
         if (!field) {
                 trace_seq_printf(s, "<CANT FIND FIELD %s>", "caller");
-                return -1;
+                return 0;
         }
 
-        ret = trace_seq_puts(s, "<stack trace>\n");
+        trace_seq_puts(s, "<stack trace>\n");
 
         for (i = 0; i < field->size; i += long_size) {
                 addr = pevent_read_number(event->pevent,
@@ -330,12 +330,12 @@ trace_stack_handler(struct trace_seq *s, struct record *record,
 
                 func = pevent_find_function(event->pevent, addr);
                 if (func)
-                        ret = trace_seq_printf(s, "=> %s (%llx)\n", func, addr);
+                        trace_seq_printf(s, "=> %s (%llx)\n", func, addr);
                 else
-                        ret = trace_seq_printf(s, "=> %llx\n", addr);
+                        trace_seq_printf(s, "=> %llx\n", addr);
         }
 
-        return ret;
+        return 0;
 }
 
 int tracecmd_ftrace_overrides(struct tracecmd_input *handle)