perf/trace/scripting: workqueue-stats script cleanup

[safe/jmp/linux-2.6] / tools / perf / util / session.h

diff --git a/tools/perf/util/session.h b/tools/perf/util/session.h
index 568fd08..46190f9 100644 (file)
--- a/tools/perf/util/session.h
+++ b/tools/perf/util/session.h
@@ -1,6 +1,7 @@
 #ifndef __PERF_SESSION_H
 #define __PERF_SESSION_H
 
+#include "hist.h"
 #include "event.h"
 #include "header.h"
 #include "symbol.h"
@@ -26,12 +27,18 @@ struct perf_session {
        unsigned long           mmap_window;
        struct rb_root          threads;
        struct thread           *last_match;
+       struct machine          host_machine;
        struct rb_root          machines;
-       struct events_stats     events_stats;
-       struct rb_root          stats_by_id;
+       struct rb_root          hists_tree;
        unsigned long           event_total[PERF_RECORD_MAX];
        unsigned long           unknown_events;
-       struct rb_root          hists;
+       /*
+        * FIXME: should point to the first entry in hists_tree and
+        *        be a hists instance. Right now its only 'report'
+        *        that is using ->hists_tree while all the rest use
+        *        ->hists.
+        */
+       struct hists            hists;
        u64                     sample_type;
        int                     fd;
        bool                    fd_pipe;
@@ -113,18 +120,22 @@ int perf_session__browse_hists(struct rb_root *hists, u64 nr_hists,
 static inline
 struct machine *perf_session__find_host_machine(struct perf_session *self)
 {
-       return machines__find_host(&self->machines);
+       return &self->host_machine;
 }
 
 static inline
 struct machine *perf_session__find_machine(struct perf_session *self, pid_t pid)
 {
+       if (pid == HOST_KERNEL_ID)
+               return &self->host_machine;
        return machines__find(&self->machines, pid);
 }
 
 static inline
 struct machine *perf_session__findnew_machine(struct perf_session *self, pid_t pid)
 {
+       if (pid == HOST_KERNEL_ID)
+               return &self->host_machine;
        return machines__findnew(&self->machines, pid);
 }
 
@@ -132,14 +143,11 @@ static inline
 void perf_session__process_machines(struct perf_session *self,
                                    machine__process_t process)
 {
+       process(&self->host_machine, self);
        return machines__process(&self->machines, process, self);
 }
 
-static inline
-size_t perf_session__fprintf_dsos(struct perf_session *self, FILE *fp)
-{
-       return machines__fprintf_dsos(&self->machines, fp);
-}
+size_t perf_session__fprintf_dsos(struct perf_session *self, FILE *fp);
 
 static inline
 size_t perf_session__fprintf_dsos_buildid(struct perf_session *self, FILE *fp,