build-sys: add a makefile target to run all tests through valgrind

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

diff --git a/src/bootchart/bootchart.h b/src/bootchart/bootchart.h
index 9127f92302d258477a8e4bacad6a8da9ca74b578..968c38da26a9ad483eba7b5129186bfe871991a7 100644 (file)
--- a/src/bootchart/bootchart.h
+++ b/src/bootchart/bootchart.h
@@ -1,23 +1,35 @@
-/*
- * bootchart.h
- *
- * Copyright (C) 2009-2012 Intel Coproration
- *
- * Authors:
- *   Auke Kok <auke-jan.h.kok@intel.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; version 2
- * of the License.
- */
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+
+#pragma once
+
+/***
+  This file is part of systemd.
+
+  Copyright (C) 2009-2013 Intel Corporation
+
+  Authors:
+    Auke Kok <auke-jan.h.kok@intel.com>
+
+  systemd is free software; you can redistribute it and/or modify it
+  under the terms of the GNU Lesser General Public License as published by
+  the Free Software Foundation; either version 2.1 of the License, or
+  (at your option) any later version.
+
+  systemd is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public License
+  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+***/
 
 #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 */
@@ -31,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 */
@@ -52,7 +74,7 @@ struct ps_struct {
         struct ps_struct *next;       /* siblings */
 
         /* must match - otherwise it's a new process with same PID */
-        char name[16];
+        char name[256];
         int pid;
         int ppid;
 
@@ -61,9 +83,9 @@ struct ps_struct {
         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;
@@ -88,30 +110,24 @@ 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 int relative;
-extern int filter;
-extern int pss;
-extern int entropy;
-extern int initcall;
+extern bool arg_relative;
+extern bool arg_filter;
+extern bool arg_show_cmdline;
+extern bool arg_pss;
+extern bool arg_entropy;
+extern bool initcall;
 extern int samples;
 extern int cpus;
-extern int len;
-extern double hz;
-extern double scale_x;
-extern double scale_y;
+extern int arg_samples_len;
+extern double arg_hz;
+extern double arg_scale_x;
+extern double arg_scale_y;
 extern int overrun;
 extern double interval;
 
-extern char output_path[PATH_MAX];
-extern char init_path[PATH_MAX];
+extern char arg_output_path[PATH_MAX];
+extern char arg_init_path[PATH_MAX];
 
 extern FILE *of;
-extern DIR *proc;
-
-extern double gettime_ns(void);
-extern void log_uptime(void);
-extern void log_sample(int sample);
-
-extern void svg_do(void);
+extern int sysfd;