bootchart: display each CPU utilization/wait

[elogind.git] / src / bootchart / bootchart.h

diff --git a/src/bootchart/bootchart.h b/src/bootchart/bootchart.h
index a9541caf4a09f2bfd1ca88891827d463f4ea5eff..26de0dd9f8fd3ae8817d1c6d3244df00049eabef 100644 (file)
--- a/src/bootchart/bootchart.h
+++ b/src/bootchart/bootchart.h
@@ -5,7 +5,7 @@
 /***
   This file is part of systemd.
 
-  Copyright (C) 2009-2013 Intel Coproration
+  Copyright (C) 2009-2013 Intel Corporation
 
   Authors:
     Auke Kok <auke-jan.h.kok@intel.com>
@@ -26,10 +26,10 @@
 
 #include <dirent.h>
 #include <stdbool.h>
+#include "list.h"
 
 #define MAXCPUS        16
 #define MAXPIDS     65535
-#define MAXSAMPLES   8192
 
 struct block_stat_struct {
         /* /proc/vmstat pgpgin & pgpgout */
@@ -43,17 +43,27 @@ struct cpu_stat_sample_struct {
         double waittime;
 };
 
-struct cpu_stat_struct {
-        /* per cpu array */
-        struct cpu_stat_sample_struct sample[MAXSAMPLES];
-};
-
 /* per process, per sample data we will log */
 struct ps_sched_struct {
         /* /proc/<n>/schedstat fields 1 & 2 */
         double runtime;
         double waittime;
         int pss;
+        struct list_sample_data *sampledata;
+        struct ps_sched_struct *next;
+        struct ps_sched_struct *prev;
+        struct ps_sched_struct *cross; /* cross pointer */
+        struct ps_struct *ps_new;
+};
+
+struct list_sample_data {
+        double runtime[MAXCPUS];
+        double waittime[MAXCPUS];
+        double sampletime;
+        int entropy_avail;
+        struct block_stat_struct blockstat;
+        LIST_FIELDS(struct list_sample_data, link); /* DLL */
+        int counter;
 };
 
 /* process info */
@@ -67,15 +77,16 @@ struct ps_struct {
         char name[256];
         int pid;
         int ppid;
+        char *cgroup;
 
         /* cache fd's */
         int sched;
         int schedstat;
         FILE *smaps;
 
-        /* index to first/last seen timestamps */
-        int first;
-        int last;
+        /* pointers to first/last seen timestamps */
+        struct ps_sched_struct *first;
+        struct ps_sched_struct *last;
 
         /* records actual start time, may be way before bootchart runs */
         double starttime;
@@ -100,13 +111,14 @@ extern double log_start;
 extern double sampletime[];
 extern struct ps_struct *ps_first;
 extern struct block_stat_struct blockstat[];
-extern struct cpu_stat_struct cpustat[];
 extern int pscount;
 extern bool arg_relative;
 extern bool arg_filter;
 extern bool arg_show_cmdline;
+extern bool arg_show_cgroup;
 extern bool arg_pss;
 extern bool arg_entropy;
+extern bool arg_percpu;
 extern bool initcall;
 extern int samples;
 extern int cpus;