Merge branch 'perfcounters-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'perfcounters-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (58 commits)
  perf_counter: Fix perf_copy_attr() pointer arithmetic
  perf utils: Use a define for the maximum length of a trace event
  perf: Add timechart help text and add timechart to "perf help"
  tracing, x86, cpuidle: Move the end point of a C state in the power tracer
  perf utils: Be consistent about minimum text size in the svghelper
  perf timechart: Add "perf timechart record"
  perf: Add the timechart tool
  perf: Add a SVG helper library file
  tracing, perf: Convert the power tracer into an event tracer
  perf: Add a sample_event type to the event_union
  perf: Allow perf utilities to have "callback" options without arguments
  perf: Store trace event name/id pairs in perf.data
  perf: Add a timestamp to fork events
  sched_clock: Make it NMI safe
  perf_counter: Fix up swcounter throttling
  x86, perf_counter, bts: Optimize BTS overflow handling
  perf sched: Add --input=file option to builtin-sched.c
  perf trace: Sample timestamp and cpu when using record flag
  perf tools: Increase MAX_EVENT_LENGTH
  perf tools: Fix memory leak in read_ftrace_printk()
  ...

1 files changed, 35 insertions, 10 deletions

diff --git a/tools/perf/util/trace-event-parse.c b/tools/perf/util/trace-event-parse.c
index 629e602d9405..f6a8437141c8 100644
--- a/tools/perf/util/trace-event-parse.c
+++ b/tools/perf/util/trace-event-parse.c
@@ -1776,6 +1776,29 @@ static unsigned long long read_size(void *ptr, int size)
         }
 }
 
+unsigned long long
+raw_field_value(struct event *event, const char *name, void *data)
+{
+        struct format_field *field;
+
+        field = find_any_field(event, name);
+        if (!field)
+                return 0ULL;
+
+        return read_size(data + field->offset, field->size);
+}
+
+void *raw_field_ptr(struct event *event, const char *name, void *data)
+{
+        struct format_field *field;
+
+        field = find_any_field(event, name);
+        if (!field)
+                return NULL;
+
+        return data + field->offset;
+}
+
 static int get_common_info(const char *type, int *offset, int *size)
 {
         struct event *event;
@@ -1799,7 +1822,7 @@ static int get_common_info(const char *type, int *offset, int *size)
         return 0;
 }
 
-static int parse_common_type(void *data)
+int trace_parse_common_type(void *data)
 {
         static int type_offset;
         static int type_size;
@@ -1832,7 +1855,7 @@ static int parse_common_pid(void *data)
         return read_size(data + pid_offset, pid_size);
 }
 
-static struct event *find_event(int id)
+struct event *trace_find_event(int id)
 {
         struct event *event;
 
@@ -2420,8 +2443,8 @@ get_return_for_leaf(int cpu, int cur_pid, unsigned long long cur_func,
         int type;
         int pid;
 
-        type = parse_common_type(next->data);
-        event = find_event(type);
+        type = trace_parse_common_type(next->data);
+        event = trace_find_event(type);
         if (!event)
                 return NULL;
 
@@ -2502,8 +2525,8 @@ print_graph_entry_leaf(struct event *event, void *data, struct record *ret_rec)
         int type;
         int i;
 
-        type = parse_common_type(ret_rec->data);
-        ret_event = find_event(type);
+        type = trace_parse_common_type(ret_rec->data);
+        ret_event = trace_find_event(type);
 
         field = find_field(ret_event, "rettime");
         if (!field)
@@ -2696,11 +2719,13 @@ void print_event(int cpu, void *data, int size, unsigned long long nsecs,
         nsecs -= secs * NSECS_PER_SEC;
         usecs = nsecs / NSECS_PER_USEC;
 
-        type = parse_common_type(data);
+        type = trace_parse_common_type(data);
 
-        event = find_event(type);
-        if (!event)
-                die("ug! no event found for type %d", type);
+        event = trace_find_event(type);
+        if (!event) {
+                printf("ug! no event found for type %d\n", type);
+                return;
+        }
 
         pid = parse_common_pid(data);