chiark / gitweb /
Remove src/bootchart
authorAndy Wingo <wingo@pobox.com>
Sun, 19 Apr 2015 11:27:56 +0000 (13:27 +0200)
committerAndy Wingo <wingo@pobox.com>
Sun, 19 Apr 2015 11:27:56 +0000 (13:27 +0200)
src/bootchart/Makefile [deleted symlink]
src/bootchart/bootchart.c [deleted file]
src/bootchart/bootchart.conf [deleted file]
src/bootchart/bootchart.h [deleted file]
src/bootchart/store.c [deleted file]
src/bootchart/store.h [deleted file]
src/bootchart/svg.c [deleted file]
src/bootchart/svg.h [deleted file]

diff --git a/src/bootchart/Makefile b/src/bootchart/Makefile
deleted file mode 120000 (symlink)
index d0b0e8e..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../Makefile
\ No newline at end of file
diff --git a/src/bootchart/bootchart.c b/src/bootchart/bootchart.c
deleted file mode 100644 (file)
index 65cb322..0000000
+++ /dev/null
@@ -1,537 +0,0 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
-/***
-  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/>.
- ***/
-
-/***
-
-  Many thanks to those who contributed ideas and code:
-  - Ziga Mahkovec - Original bootchart author
-  - Anders Norgaard - PyBootchartgui
-  - Michael Meeks - bootchart2
-  - Scott James Remnant - Ubuntu C-based logger
-  - Arjan van der Ven - for the idea to merge bootgraph.pl functionality
-
- ***/
-
-#include <sys/resource.h>
-#include <stdio.h>
-#include <signal.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <time.h>
-#include <getopt.h>
-#include <limits.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <stdbool.h>
-#include "systemd/sd-journal.h"
-
-#include "util.h"
-#include "fileio.h"
-#include "macro.h"
-#include "conf-parser.h"
-#include "strxcpyx.h"
-#include "path-util.h"
-#include "store.h"
-#include "svg.h"
-#include "bootchart.h"
-#include "list.h"
-
-static int exiting = 0;
-
-#define DEFAULT_SAMPLES_LEN 500
-#define DEFAULT_HZ 25.0
-#define DEFAULT_SCALE_X 100.0 /* 100px = 1sec */
-#define DEFAULT_SCALE_Y 20.0  /* 16px = 1 process bar */
-#define DEFAULT_INIT ROOTLIBEXECDIR "/systemd"
-#define DEFAULT_OUTPUT "/run/log"
-
-/* graph defaults */
-bool arg_entropy = false;
-bool arg_initcall = true;
-bool arg_relative = false;
-bool arg_filter = true;
-bool arg_show_cmdline = false;
-bool arg_show_cgroup = false;
-bool arg_pss = false;
-bool arg_percpu = false;
-int arg_samples_len = DEFAULT_SAMPLES_LEN; /* we record len+1 (1 start sample) */
-double arg_hz = DEFAULT_HZ;
-double arg_scale_x = DEFAULT_SCALE_X;
-double arg_scale_y = DEFAULT_SCALE_Y;
-
-char arg_init_path[PATH_MAX] = DEFAULT_INIT;
-char arg_output_path[PATH_MAX] = DEFAULT_OUTPUT;
-
-static void signal_handler(int sig) {
-        exiting = 1;
-}
-
-#define BOOTCHART_CONF "/etc/systemd/bootchart.conf"
-
-#define BOOTCHART_MAX (16*1024*1024)
-
-static void parse_conf(void) {
-        char *init = NULL, *output = NULL;
-        const ConfigTableItem items[] = {
-                { "Bootchart", "Samples",          config_parse_int,    0, &arg_samples_len },
-                { "Bootchart", "Frequency",        config_parse_double, 0, &arg_hz          },
-                { "Bootchart", "Relative",         config_parse_bool,   0, &arg_relative    },
-                { "Bootchart", "Filter",           config_parse_bool,   0, &arg_filter      },
-                { "Bootchart", "Output",           config_parse_path,   0, &output          },
-                { "Bootchart", "Init",             config_parse_path,   0, &init            },
-                { "Bootchart", "PlotMemoryUsage",  config_parse_bool,   0, &arg_pss         },
-                { "Bootchart", "PlotEntropyGraph", config_parse_bool,   0, &arg_entropy     },
-                { "Bootchart", "ScaleX",           config_parse_double, 0, &arg_scale_x     },
-                { "Bootchart", "ScaleY",           config_parse_double, 0, &arg_scale_y     },
-                { "Bootchart", "ControlGroup",     config_parse_bool,   0, &arg_show_cgroup },
-                { "Bootchart", "PerCPU",           config_parse_bool,   0, &arg_percpu      },
-                { NULL, NULL, NULL, 0, NULL }
-        };
-
-        config_parse_many(BOOTCHART_CONF,
-                          CONF_DIRS_NULSTR("systemd/bootchart.conf"),
-                          NULL, config_item_table_lookup, items, true, NULL);
-
-        if (init != NULL)
-                strscpy(arg_init_path, sizeof(arg_init_path), init);
-        if (output != NULL)
-                strscpy(arg_output_path, sizeof(arg_output_path), output);
-}
-
-static void help(void) {
-        printf("Usage: %s [OPTIONS]\n\n"
-               "Options:\n"
-               "  -r --rel             Record time relative to recording\n"
-               "  -f --freq=FREQ       Sample frequency [%g]\n"
-               "  -n --samples=N       Stop sampling at [%d] samples\n"
-               "  -x --scale-x=N       Scale the graph horizontally [%g] \n"
-               "  -y --scale-y=N       Scale the graph vertically [%g] \n"
-               "  -p --pss             Enable PSS graph (CPU intensive)\n"
-               "  -e --entropy         Enable the entropy_avail graph\n"
-               "  -o --output=PATH     Path to output files [%s]\n"
-               "  -i --init=PATH       Path to init executable [%s]\n"
-               "  -F --no-filter       Disable filtering of unimportant or ephemeral processes\n"
-               "  -C --cmdline         Display full command lines with arguments\n"
-               "  -c --control-group   Display process control group\n"
-               "     --per-cpu         Draw each CPU utilization and wait bar also\n"
-               "  -h --help            Display this message\n\n"
-               "See bootchart.conf for more information.\n",
-               program_invocation_short_name,
-               DEFAULT_HZ,
-               DEFAULT_SAMPLES_LEN,
-               DEFAULT_SCALE_X,
-               DEFAULT_SCALE_Y,
-               DEFAULT_OUTPUT,
-               DEFAULT_INIT);
-}
-
-static int parse_argv(int argc, char *argv[]) {
-
-        enum {
-                ARG_PERCPU = 0x100,
-        };
-
-        static const struct option options[] = {
-                {"rel",           no_argument,        NULL,  'r'       },
-                {"freq",          required_argument,  NULL,  'f'       },
-                {"samples",       required_argument,  NULL,  'n'       },
-                {"pss",           no_argument,        NULL,  'p'       },
-                {"output",        required_argument,  NULL,  'o'       },
-                {"init",          required_argument,  NULL,  'i'       },
-                {"no-filter",     no_argument,        NULL,  'F'       },
-                {"cmdline",       no_argument,        NULL,  'C'       },
-                {"control-group", no_argument,        NULL,  'c'       },
-                {"help",          no_argument,        NULL,  'h'       },
-                {"scale-x",       required_argument,  NULL,  'x'       },
-                {"scale-y",       required_argument,  NULL,  'y'       },
-                {"entropy",       no_argument,        NULL,  'e'       },
-                {"per-cpu",       no_argument,        NULL,  ARG_PERCPU},
-                {}
-        };
-        int c, r;
-
-        if (getpid() == 1)
-                opterr = 0;
-
-        while ((c = getopt_long(argc, argv, "erpf:n:o:i:FCchx:y:", options, NULL)) >= 0)
-                switch (c) {
-
-                case 'r':
-                        arg_relative = true;
-                        break;
-                case 'f':
-                        r = safe_atod(optarg, &arg_hz);
-                        if (r < 0)
-                                log_warning_errno(r, "failed to parse --freq/-f argument '%s': %m",
-                                                  optarg);
-                        break;
-                case 'F':
-                        arg_filter = false;
-                        break;
-                case 'C':
-                        arg_show_cmdline = true;
-                        break;
-                case 'c':
-                        arg_show_cgroup = true;
-                        break;
-                case 'n':
-                        r = safe_atoi(optarg, &arg_samples_len);
-                        if (r < 0)
-                                log_warning_errno(r, "failed to parse --samples/-n argument '%s': %m",
-                                                  optarg);
-                        break;
-                case 'o':
-                        path_kill_slashes(optarg);
-                        strscpy(arg_output_path, sizeof(arg_output_path), optarg);
-                        break;
-                case 'i':
-                        path_kill_slashes(optarg);
-                        strscpy(arg_init_path, sizeof(arg_init_path), optarg);
-                        break;
-                case 'p':
-                        arg_pss = true;
-                        break;
-                case 'x':
-                        r = safe_atod(optarg, &arg_scale_x);
-                        if (r < 0)
-                                log_warning_errno(r, "failed to parse --scale-x/-x argument '%s': %m",
-                                                  optarg);
-                        break;
-                case 'y':
-                        r = safe_atod(optarg, &arg_scale_y);
-                        if (r < 0)
-                                log_warning_errno(r, "failed to parse --scale-y/-y argument '%s': %m",
-                                                  optarg);
-                        break;
-                case 'e':
-                        arg_entropy = true;
-                        break;
-                case ARG_PERCPU:
-                        arg_percpu = true;
-                        break;
-                case 'h':
-                        help();
-                        return 0;
-                case '?':
-                        if (getpid() != 1)
-                                return -EINVAL;
-                        else
-                                return 0;
-                default:
-                        assert_not_reached("Unhandled option code.");
-                }
-
-        if (arg_hz <= 0) {
-                log_error("Frequency needs to be > 0");
-                return -EINVAL;
-        }
-
-        return 1;
-}
-
-static int do_journal_append(char *file) {
-        _cleanup_free_ char *bootchart_message = NULL;
-        _cleanup_free_ char *bootchart_file = NULL;
-        _cleanup_free_ char *p = NULL;
-        _cleanup_close_ int fd = -1;
-        struct iovec iovec[5];
-        int r, j = 0;
-        ssize_t n;
-
-        bootchart_file = strappend("BOOTCHART_FILE=", file);
-        if (!bootchart_file)
-                return log_oom();
-
-        IOVEC_SET_STRING(iovec[j++], bootchart_file);
-        IOVEC_SET_STRING(iovec[j++], "MESSAGE_ID=9f26aa562cf440c2b16c773d0479b518");
-        IOVEC_SET_STRING(iovec[j++], "PRIORITY=7");
-        bootchart_message = strjoin("MESSAGE=Bootchart created: ", file, NULL);
-        if (!bootchart_message)
-                return log_oom();
-
-        IOVEC_SET_STRING(iovec[j++], bootchart_message);
-
-        p = malloc(10 + BOOTCHART_MAX);
-        if (!p)
-                return log_oom();
-
-        memcpy(p, "BOOTCHART=", 10);
-
-        fd = open(file, O_RDONLY|O_CLOEXEC);
-        if (fd < 0)
-                return log_error_errno(errno, "Failed to open bootchart data \"%s\": %m", file);
-
-        n = loop_read(fd, p + 10, BOOTCHART_MAX, false);
-        if (n < 0)
-                return log_error_errno(n, "Failed to read bootchart data: %m");
-
-        iovec[j].iov_base = p;
-        iovec[j].iov_len = 10 + n;
-        j++;
-
-        r = sd_journal_sendv(iovec, j);
-        if (r < 0)
-                log_error_errno(r, "Failed to send bootchart: %m");
-
-        return 0;
-}
-
-int main(int argc, char *argv[]) {
-        static struct list_sample_data *sampledata;
-        _cleanup_closedir_ DIR *proc = NULL;
-        _cleanup_free_ char *build = NULL;
-        _cleanup_fclose_ FILE *of = NULL;
-        _cleanup_close_ int sysfd = -1;
-        struct ps_struct *ps_first;
-        double graph_start;
-        double log_start;
-        double interval;
-        char output_file[PATH_MAX];
-        char datestr[200];
-        int pscount = 0;
-        int n_cpus = 0;
-        int overrun = 0;
-        time_t t = 0;
-        int r, samples;
-        struct ps_struct *ps;
-        struct rlimit rlim;
-        struct list_sample_data *head;
-        struct sigaction sig = {
-                .sa_handler = signal_handler,
-        };
-
-        parse_conf();
-
-        r = parse_argv(argc, argv);
-        if (r < 0)
-                return EXIT_FAILURE;
-
-        if (r == 0)
-                return EXIT_SUCCESS;
-
-        /*
-         * If the kernel executed us through init=/usr/lib/systemd/systemd-bootchart, then
-         * fork:
-         * - parent execs executable specified via init_path[] (/usr/lib/systemd/systemd by default) as pid=1
-         * - child logs data
-         */
-        if (getpid() == 1) {
-                if (fork()) {
-                        /* parent */
-                        execl(arg_init_path, arg_init_path, NULL);
-                }
-        }
-        argv[0][0] = '@';
-
-        rlim.rlim_cur = 4096;
-        rlim.rlim_max = 4096;
-        (void) setrlimit(RLIMIT_NOFILE, &rlim);
-
-        /* start with empty ps LL */
-        ps_first = new0(struct ps_struct, 1);
-        if (!ps_first) {
-                log_oom();
-                return EXIT_FAILURE;
-        }
-
-        /* handle TERM/INT nicely */
-        sigaction(SIGHUP, &sig, NULL);
-
-        interval = (1.0 / arg_hz) * 1000000000.0;
-
-        if (arg_relative)
-                graph_start = log_start = gettime_ns();
-        else {
-                struct timespec n;
-                double uptime;
-
-                clock_gettime(CLOCK_BOOTTIME, &n);
-                uptime = (n.tv_sec + (n.tv_nsec / (double) NSEC_PER_SEC));
-
-                log_start = gettime_ns();
-                graph_start = log_start - uptime;
-        }
-
-        if (graph_start < 0.0) {
-                log_error("Failed to setup graph start time.\n\n"
-                          "The system uptime probably includes time that the system was suspended. "
-                          "Use --rel to bypass this issue.");
-                return EXIT_FAILURE;
-        }
-
-        LIST_HEAD_INIT(head);
-
-        /* main program loop */
-        for (samples = 0; !exiting && samples < arg_samples_len; samples++) {
-                int res;
-                double sample_stop;
-                struct timespec req;
-                time_t newint_s;
-                long newint_ns;
-                double elapsed;
-                double timeleft;
-
-                sampledata = new0(struct list_sample_data, 1);
-                if (sampledata == NULL) {
-                        log_oom();
-                        return EXIT_FAILURE;
-                }
-
-                sampledata->sampletime = gettime_ns();
-                sampledata->counter = samples;
-
-                if (sysfd < 0)
-                        sysfd = open("/sys", O_RDONLY|O_CLOEXEC);
-
-                if (!build) {
-                        if (parse_env_file("/etc/os-release", NEWLINE, "PRETTY_NAME", &build, NULL) == -ENOENT)
-                                parse_env_file("/usr/lib/os-release", NEWLINE, "PRETTY_NAME", &build, NULL);
-                }
-
-                if (proc)
-                        rewinddir(proc);
-                else
-                        proc = opendir("/proc");
-
-                /* wait for /proc to become available, discarding samples */
-                if (proc) {
-                        r = log_sample(proc, samples, ps_first, &sampledata, &pscount, &n_cpus);
-                        if (r < 0)
-                                return EXIT_FAILURE;
-                }
-
-                sample_stop = gettime_ns();
-
-                elapsed = (sample_stop - sampledata->sampletime) * 1000000000.0;
-                timeleft = interval - elapsed;
-
-                newint_s = (time_t)(timeleft / 1000000000.0);
-                newint_ns = (long)(timeleft - (newint_s * 1000000000.0));
-
-                /*
-                 * check if we have not consumed our entire timeslice. If we
-                 * do, don't sleep and take a new sample right away.
-                 * we'll lose all the missed samples and overrun our total
-                 * time
-                 */
-                if (newint_ns > 0 || newint_s > 0) {
-                        req.tv_sec = newint_s;
-                        req.tv_nsec = newint_ns;
-
-                        res = nanosleep(&req, NULL);
-                        if (res) {
-                                if (errno == EINTR) {
-                                        /* caught signal, probably HUP! */
-                                        break;
-                                }
-                                log_error_errno(errno, "nanosleep() failed: %m");
-                                return EXIT_FAILURE;
-                        }
-                } else {
-                        overrun++;
-                        /* calculate how many samples we lost and scrap them */
-                        arg_samples_len -= (int)(newint_ns / interval);
-                }
-                LIST_PREPEND(link, head, sampledata);
-        }
-
-        /* do some cleanup, close fd's */
-        ps = ps_first;
-        while (ps->next_ps) {
-                ps = ps->next_ps;
-                ps->schedstat = safe_close(ps->schedstat);
-                ps->sched = safe_close(ps->sched);
-                if (ps->smaps) {
-                        fclose(ps->smaps);
-                        ps->smaps = NULL;
-                }
-        }
-
-        if (!of) {
-                t = time(NULL);
-                r = strftime(datestr, sizeof(datestr), "%Y%m%d-%H%M", localtime(&t));
-                assert_se(r > 0);
-
-                snprintf(output_file, PATH_MAX, "%s/bootchart-%s.svg", arg_output_path, datestr);
-                of = fopen(output_file, "we");
-        }
-
-        if (!of) {
-                log_error("Error opening output file '%s': %m\n", output_file);
-                return EXIT_FAILURE;
-        }
-
-        r = svg_do(of, strna(build), head, ps_first,
-                   samples, pscount, n_cpus, graph_start,
-                   log_start, interval, overrun);
-
-        if (r < 0) {
-                log_error_errno(r, "Error generating svg file: %m\n");
-                return EXIT_FAILURE;
-        }
-
-        log_info("systemd-bootchart wrote %s\n", output_file);
-
-        r = do_journal_append(output_file);
-        if (r < 0)
-                return EXIT_FAILURE;
-
-        /* nitpic cleanups */
-        ps = ps_first->next_ps;
-        while (ps->next_ps) {
-                struct ps_struct *old;
-
-                old = ps;
-                old->sample = ps->first;
-                ps = ps->next_ps;
-                while (old->sample->next) {
-                        struct ps_sched_struct *oldsample = old->sample;
-
-                        old->sample = old->sample->next;
-                        free(oldsample);
-                }
-                free(old->cgroup);
-                free(old->sample);
-                free(old);
-        }
-
-        free(ps->cgroup);
-        free(ps->sample);
-        free(ps);
-
-        sampledata = head;
-        while (sampledata->link_prev) {
-                struct list_sample_data *old_sampledata = sampledata;
-                sampledata = sampledata->link_prev;
-                free(old_sampledata);
-        }
-        free(sampledata);
-
-        /* don't complain when overrun once, happens most commonly on 1st sample */
-        if (overrun > 1)
-                log_warning("systemd-boochart: sample time overrun %i times\n", overrun);
-
-        return 0;
-}
diff --git a/src/bootchart/bootchart.conf b/src/bootchart/bootchart.conf
deleted file mode 100644 (file)
index 4f5e509..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-#  This file is part of systemd.
-#
-#  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.
-#
-# Entries in this file show the compile time defaults.
-# You can change settings by editing this file.
-# Defaults can be restored by simply deleting this file.
-#
-# See bootchart.conf(5) for details.
-
-[Bootchart]
-#Samples=500
-#Frequency=25
-#Relative=no
-#Filter=yes
-#Output=<folder name, defaults to /run/log>
-#Init=/path/to/init-binary
-#PlotMemoryUsage=no
-#PlotEntropyGraph=no
-#ScaleX=100
-#ScaleY=20
-#ControlGroup=no
-#PerCPU=no
diff --git a/src/bootchart/bootchart.h b/src/bootchart/bootchart.h
deleted file mode 100644 (file)
index bdb4b00..0000000
+++ /dev/null
@@ -1,120 +0,0 @@
-/*-*- 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 <stdbool.h>
-#include "list.h"
-
-#define MAXCPUS        16
-#define MAXPIDS     65535
-
-struct block_stat_struct {
-        /* /proc/vmstat pgpgin & pgpgout */
-        int bi;
-        int bo;
-};
-
-struct cpu_stat_sample_struct {
-        /* /proc/schedstat fields 10 & 11 (after name) */
-        double runtime;
-        double waittime;
-};
-
-/* 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 */
-struct ps_struct {
-        struct ps_struct *next_ps;    /* SLL pointer */
-        struct ps_struct *parent;     /* ppid ref */
-        struct ps_struct *children;   /* children */
-        struct ps_struct *next;       /* siblings */
-
-        /* must match - otherwise it's a new process with same PID */
-        char name[256];
-        int pid;
-        int ppid;
-        char *cgroup;
-
-        /* cache fd's */
-        int sched;
-        int schedstat;
-        FILE *smaps;
-
-        /* 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;
-
-        /* record human readable total cpu time */
-        double total;
-
-        /* largest PSS size found */
-        int pss_max;
-
-        /* for drawing connection lines later */
-        double pos_x;
-        double pos_y;
-
-        struct ps_sched_struct *sample;
-};
-
-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 arg_initcall;
-extern int  arg_samples_len;
-extern double arg_hz;
-extern double arg_scale_x;
-extern double arg_scale_y;
-
-extern char arg_output_path[PATH_MAX];
-extern char arg_init_path[PATH_MAX];
diff --git a/src/bootchart/store.c b/src/bootchart/store.c
deleted file mode 100644 (file)
index f19427e..0000000
+++ /dev/null
@@ -1,508 +0,0 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
-/***
-  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 <unistd.h>
-#include <stdlib.h>
-#include <limits.h>
-#include <stdio.h>
-#include <string.h>
-#include <dirent.h>
-#include <fcntl.h>
-#include <time.h>
-
-#include "util.h"
-#include "time-util.h"
-#include "strxcpyx.h"
-#include "store.h"
-#include "bootchart.h"
-#include "cgroup-util.h"
-
-/*
- * Alloc a static 4k buffer for stdio - primarily used to increase
- * PSS buffering from the default 1k stdin buffer to reduce
- * read() overhead.
- */
-static char smaps_buf[4096];
-static int skip = 0;
-
-double gettime_ns(void) {
-        struct timespec n;
-
-        clock_gettime(CLOCK_MONOTONIC, &n);
-
-        return (n.tv_sec + (n.tv_nsec / (double) NSEC_PER_SEC));
-}
-
-static char *bufgetline(char *buf) {
-        char *c;
-
-        if (!buf)
-                return NULL;
-
-        c = strchr(buf, '\n');
-        if (c)
-                c++;
-
-        return c;
-}
-
-static int pid_cmdline_strscpy(int procfd, char *buffer, size_t buf_len, int pid) {
-        char filename[PATH_MAX];
-        _cleanup_close_ int fd = -1;
-        ssize_t n;
-
-        sprintf(filename, "%d/cmdline", pid);
-        fd = openat(procfd, filename, O_RDONLY|O_CLOEXEC);
-        if (fd < 0)
-                return -errno;
-
-        n = read(fd, buffer, buf_len-1);
-        if (n > 0) {
-                int i;
-                for (i = 0; i < n; i++)
-                        if (buffer[i] == '\0')
-                                buffer[i] = ' ';
-                buffer[n] = '\0';
-        }
-
-        return 0;
-}
-
-int log_sample(DIR *proc,
-               int sample,
-               struct ps_struct *ps_first,
-               struct list_sample_data **ptr,
-               int *pscount,
-               int *cpus) {
-
-        static int vmstat = -1;
-        static int schedstat = -1;
-        char buf[4096];
-        char key[256];
-        char val[256];
-        char rt[256];
-        char wt[256];
-        char *m;
-        int c;
-        int p;
-        int mod;
-        static int e_fd = -1;
-        ssize_t s;
-        ssize_t n;
-        struct dirent *ent;
-        int fd;
-        struct list_sample_data *sampledata;
-        struct ps_sched_struct *ps_prev = NULL;
-        int procfd;
-
-        sampledata = *ptr;
-
-        procfd = dirfd(proc);
-        if (procfd < 0)
-                return -errno;
-
-        if (vmstat < 0) {
-                /* block stuff */
-                vmstat = openat(procfd, "vmstat", O_RDONLY|O_CLOEXEC);
-                if (vmstat < 0)
-                        return log_error_errno(errno, "Failed to open /proc/vmstat: %m");
-        }
-
-        n = pread(vmstat, buf, sizeof(buf) - 1, 0);
-        if (n <= 0) {
-                vmstat = safe_close(vmstat);
-                if (n < 0)
-                        return -errno;
-                return -ENODATA;
-        }
-
-        buf[n] = '\0';
-
-        m = buf;
-        while (m) {
-                if (sscanf(m, "%s %s", key, val) < 2)
-                        goto vmstat_next;
-                if (streq(key, "pgpgin"))
-                        sampledata->blockstat.bi = atoi(val);
-                if (streq(key, "pgpgout")) {
-                        sampledata->blockstat.bo = atoi(val);
-                        break;
-                }
-vmstat_next:
-                m = bufgetline(m);
-                if (!m)
-                        break;
-        }
-
-        if (schedstat < 0) {
-                /* overall CPU utilization */
-                schedstat = openat(procfd, "schedstat", O_RDONLY|O_CLOEXEC);
-                if (schedstat < 0)
-                        return log_error_errno(errno, "Failed to open /proc/schedstat (requires CONFIG_SCHEDSTATS=y in kernel config): %m");
-        }
-
-        n = pread(schedstat, buf, sizeof(buf) - 1, 0);
-        if (n <= 0) {
-                schedstat = safe_close(schedstat);
-                if (n < 0)
-                        return -errno;
-                return -ENODATA;
-        }
-
-        buf[n] = '\0';
-
-        m = buf;
-        while (m) {
-                int r;
-
-                if (sscanf(m, "%s %*s %*s %*s %*s %*s %*s %s %s", key, rt, wt) < 3)
-                        goto schedstat_next;
-
-                if (strstr(key, "cpu")) {
-                        r = safe_atoi((const char*)(key+3), &c);
-                        if (r < 0 || c > MAXCPUS -1)
-                                /* Oops, we only have room for MAXCPUS data */
-                                break;
-                        sampledata->runtime[c] = atoll(rt);
-                        sampledata->waittime[c] = atoll(wt);
-
-                        if (c == *cpus)
-                                *cpus = c + 1;
-                }
-schedstat_next:
-                m = bufgetline(m);
-                if (!m)
-                        break;
-        }
-
-        if (arg_entropy) {
-                if (e_fd < 0) {
-                        e_fd = openat(procfd, "sys/kernel/random/entropy_avail", O_RDONLY|O_CLOEXEC);
-                        if (e_fd < 0)
-                                return log_error_errno(errno, "Failed to open /proc/sys/kernel/random/entropy_avail: %m");
-                }
-
-                n = pread(e_fd, buf, sizeof(buf) - 1, 0);
-                if (n <= 0) {
-                        e_fd = safe_close(e_fd);
-                } else {
-                        buf[n] = '\0';
-                        sampledata->entropy_avail = atoi(buf);
-                }
-        }
-
-        while ((ent = readdir(proc)) != NULL) {
-                char filename[PATH_MAX];
-                int pid;
-                struct ps_struct *ps;
-
-                if ((ent->d_name[0] < '0') || (ent->d_name[0] > '9'))
-                        continue;
-
-                pid = atoi(ent->d_name);
-
-                if (pid >= MAXPIDS)
-                        continue;
-
-                ps = ps_first;
-                while (ps->next_ps) {
-                        ps = ps->next_ps;
-                        if (ps->pid == pid)
-                                break;
-                }
-
-                /* end of our LL? then append a new record */
-                if (ps->pid != pid) {
-                        _cleanup_fclose_ FILE *st = NULL;
-                        char t[32];
-                        struct ps_struct *parent;
-                        int r;
-
-                        ps->next_ps = new0(struct ps_struct, 1);
-                        if (!ps->next_ps)
-                                return log_oom();
-
-                        ps = ps->next_ps;
-                        ps->pid = pid;
-                        ps->sched = -1;
-                        ps->schedstat = -1;
-
-                        ps->sample = new0(struct ps_sched_struct, 1);
-                        if (!ps->sample)
-                                return log_oom();
-
-                        ps->sample->sampledata = sampledata;
-
-                        (*pscount)++;
-
-                        /* mark our first sample */
-                        ps->first = ps->last = ps->sample;
-                        ps->sample->runtime = atoll(rt);
-                        ps->sample->waittime = atoll(wt);
-
-                        /* get name, start time */
-                        if (ps->sched < 0) {
-                                sprintf(filename, "%d/sched", pid);
-                                ps->sched = openat(procfd, filename, O_RDONLY|O_CLOEXEC);
-                                if (ps->sched < 0)
-                                        continue;
-                        }
-
-                        s = pread(ps->sched, buf, sizeof(buf) - 1, 0);
-                        if (s <= 0) {
-                                ps->sched = safe_close(ps->sched);
-                                continue;
-                        }
-                        buf[s] = '\0';
-
-                        if (!sscanf(buf, "%s %*s %*s", key))
-                                continue;
-
-                        strscpy(ps->name, sizeof(ps->name), key);
-
-                        /* cmdline */
-                        if (arg_show_cmdline)
-                                pid_cmdline_strscpy(procfd, ps->name, sizeof(ps->name), pid);
-
-                        /* discard line 2 */
-                        m = bufgetline(buf);
-                        if (!m)
-                                continue;
-
-                        m = bufgetline(m);
-                        if (!m)
-                                continue;
-
-                        if (!sscanf(m, "%*s %*s %s", t))
-                                continue;
-
-                        r = safe_atod(t, &ps->starttime);
-                        if (r < 0)
-                                continue;
-
-                        ps->starttime /= 1000.0;
-
-                        if (arg_show_cgroup)
-                                /* if this fails, that's OK */
-                                cg_pid_get_path(SYSTEMD_CGROUP_CONTROLLER,
-                                                ps->pid, &ps->cgroup);
-
-                        /* ppid */
-                        sprintf(filename, "%d/stat", pid);
-                        fd = openat(procfd, filename, O_RDONLY|O_CLOEXEC);
-                        if (fd < 0)
-                                continue;
-
-                        st = fdopen(fd, "re");
-                        if (!st) {
-                                close(fd);
-                                continue;
-                        }
-
-                        if (!fscanf(st, "%*s %*s %*s %i", &p))
-                                continue;
-
-                        ps->ppid = p;
-
-                        /*
-                         * setup child pointers
-                         *
-                         * these are used to paint the tree coherently later
-                         * each parent has a LL of children, and a LL of siblings
-                         */
-                        if (pid == 1)
-                                continue; /* nothing to do for init atm */
-
-                        /* kthreadd has ppid=0, which breaks our tree ordering */
-                        if (ps->ppid == 0)
-                                ps->ppid = 1;
-
-                        parent = ps_first;
-                        while ((parent->next_ps && parent->pid != ps->ppid))
-                                parent = parent->next_ps;
-
-                        if (parent->pid != ps->ppid) {
-                                /* orphan */
-                                ps->ppid = 1;
-                                parent = ps_first->next_ps;
-                        }
-
-                        ps->parent = parent;
-
-                        if (!parent->children) {
-                                /* it's the first child */
-                                parent->children = ps;
-                        } else {
-                                /* walk all children and append */
-                                struct ps_struct *children;
-                                children = parent->children;
-                                while (children->next)
-                                        children = children->next;
-
-                                children->next = ps;
-                        }
-                }
-
-                /* else -> found pid, append data in ps */
-
-                /* below here is all continuous logging parts - we get here on every
-                 * iteration */
-
-                /* rt, wt */
-                if (ps->schedstat < 0) {
-                        sprintf(filename, "%d/schedstat", pid);
-                        ps->schedstat = openat(procfd, filename, O_RDONLY|O_CLOEXEC);
-                        if (ps->schedstat < 0)
-                                continue;
-                }
-
-                s = pread(ps->schedstat, buf, sizeof(buf) - 1, 0);
-                if (s <= 0) {
-                        /* clean up our file descriptors - assume that the process exited */
-                        close(ps->schedstat);
-                        ps->schedstat = -1;
-                        ps->sched = safe_close(ps->sched);
-                        continue;
-                }
-
-                buf[s] = '\0';
-
-                if (!sscanf(buf, "%s %s %*s", rt, wt))
-                        continue;
-
-                ps->sample->next = new0(struct ps_sched_struct, 1);
-                if (!ps->sample->next)
-                        return log_oom();
-
-                ps->sample->next->prev = ps->sample;
-                ps->sample = ps->sample->next;
-                ps->last = ps->sample;
-                ps->sample->runtime = atoll(rt);
-                ps->sample->waittime = atoll(wt);
-                ps->sample->sampledata = sampledata;
-                ps->sample->ps_new = ps;
-                if (ps_prev)
-                        ps_prev->cross = ps->sample;
-
-                ps_prev = ps->sample;
-                ps->total = (ps->last->runtime - ps->first->runtime)
-                            / 1000000000.0;
-
-                if (!arg_pss)
-                        goto catch_rename;
-
-                /* Pss */
-                if (!ps->smaps) {
-                        sprintf(filename, "%d/smaps", pid);
-                        fd = openat(procfd, filename, O_RDONLY|O_CLOEXEC);
-                        if (fd < 0)
-                                continue;
-                        ps->smaps = fdopen(fd, "re");
-                        if (!ps->smaps) {
-                                close(fd);
-                                continue;
-                        }
-                        setvbuf(ps->smaps, smaps_buf, _IOFBF, sizeof(smaps_buf));
-                } else {
-                        rewind(ps->smaps);
-                }
-
-                /* test to see if we need to skip another field */
-                if (skip == 0) {
-                        if (fgets(buf, sizeof(buf), ps->smaps) == NULL) {
-                                continue;
-                        }
-                        if (fread(buf, 1, 28 * 15, ps->smaps) != (28 * 15)) {
-                                continue;
-                        }
-                        if (buf[392] == 'V') {
-                                skip = 2;
-                        }
-                        else {
-                                skip = 1;
-                        }
-                        rewind(ps->smaps);
-                }
-
-                while (1) {
-                        int pss_kb;
-
-                        /* skip one line, this contains the object mapped. */
-                        if (fgets(buf, sizeof(buf), ps->smaps) == NULL) {
-                                break;
-                        }
-                        /* then there's a 28 char 14 line block */
-                        if (fread(buf, 1, 28 * 14, ps->smaps) != 28 * 14) {
-                                break;
-                        }
-                        pss_kb = atoi(&buf[61]);
-                        ps->sample->pss += pss_kb;
-
-                        /* skip one more line if this is a newer kernel */
-                        if (skip == 2) {
-                               if (fgets(buf, sizeof(buf), ps->smaps) == NULL)
-                                       break;
-                        }
-                }
-
-                if (ps->sample->pss > ps->pss_max)
-                        ps->pss_max = ps->sample->pss;
-
-catch_rename:
-                /* catch process rename, try to randomize time */
-                mod = (arg_hz < 4.0) ? 4.0 : (arg_hz / 4.0);
-                if (((sample - ps->pid) + pid) % (int)(mod) == 0) {
-
-                        /* re-fetch name */
-                        /* get name, start time */
-                        if (!ps->sched) {
-                                sprintf(filename, "%d/sched", pid);
-                                ps->sched = openat(procfd, filename, O_RDONLY|O_CLOEXEC);
-                                if (ps->sched < 0)
-                                        continue;
-                        }
-
-                        s = pread(ps->sched, buf, sizeof(buf) - 1, 0);
-                        if (s <= 0) {
-                                /* clean up file descriptors */
-                                ps->sched = safe_close(ps->sched);
-                                ps->schedstat = safe_close(ps->schedstat);
-                                continue;
-                        }
-
-                        buf[s] = '\0';
-
-                        if (!sscanf(buf, "%s %*s %*s", key))
-                                continue;
-
-                        strscpy(ps->name, sizeof(ps->name), key);
-
-                        /* cmdline */
-                        if (arg_show_cmdline)
-                                pid_cmdline_strscpy(procfd, ps->name, sizeof(ps->name), pid);
-                }
-        }
-
-        return 0;
-}
diff --git a/src/bootchart/store.h b/src/bootchart/store.h
deleted file mode 100644 (file)
index bbb4796..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-/*-*- 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 "bootchart.h"
-
-double gettime_ns(void);
-void log_uptime(void);
-int log_sample(DIR *proc,
-               int sample,
-               struct ps_struct *ps_first,
-               struct list_sample_data **ptr,
-               int *pscount,
-               int *cpus);
diff --git a/src/bootchart/svg.c b/src/bootchart/svg.c
deleted file mode 100644 (file)
index c63fd04..0000000
+++ /dev/null
@@ -1,1383 +0,0 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
-/***
-  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 <stdio.h>
-#include <string.h>
-#include <time.h>
-#include <limits.h>
-#include <unistd.h>
-#include <sys/utsname.h>
-#include <fcntl.h>
-
-#include "util.h"
-#include "fileio.h"
-#include "macro.h"
-#include "store.h"
-#include "svg.h"
-#include "bootchart.h"
-#include "list.h"
-#include "utf8.h"
-
-#define time_to_graph(t) ((t) * arg_scale_x)
-#define ps_to_graph(n) ((n) * arg_scale_y)
-#define kb_to_graph(m) ((m) * arg_scale_y * 0.0001)
-#define to_color(n) (192.0 - ((n) * 192.0))
-
-static const char * const colorwheel[12] = {
-        "rgb(255,32,32)",  // red
-        "rgb(32,192,192)", // cyan
-        "rgb(255,128,32)", // orange
-        "rgb(128,32,192)", // blue-violet
-        "rgb(255,255,32)", // yellow
-        "rgb(192,32,128)", // red-violet
-        "rgb(32,255,32)",  // green
-        "rgb(255,64,32)",  // red-orange
-        "rgb(32,32,255)",  // blue
-        "rgb(255,192,32)", // yellow-orange
-        "rgb(192,32,192)", // violet
-        "rgb(32,192,32)"   // yellow-green
-};
-
-static double idletime = -1.0;
-static int pfiltered = 0;
-static int pcount = 0;
-static int kcount = 0;
-static double psize = 0;
-static double ksize = 0;
-static double esize = 0;
-static struct list_sample_data *sampledata;
-static struct list_sample_data *prev_sampledata;
-
-static void svg_header(FILE *of, struct list_sample_data *head, double graph_start) {
-        double w;
-        double h;
-        struct list_sample_data *sampledata_last;
-
-        assert(head);
-
-        sampledata = head;
-        LIST_FIND_TAIL(link, sampledata, head);
-        sampledata_last = head;
-        LIST_FOREACH_BEFORE(link, sampledata, head) {
-                sampledata_last = sampledata;
-        }
-
-        /* min width is about 1600px due to the label */
-        w = 150.0 + 10.0 + time_to_graph(sampledata_last->sampletime - graph_start);
-        w = ((w < 1600.0) ? 1600.0 : w);
-
-        /* height is variable based on pss, psize, ksize */
-        h = 400.0 + (arg_scale_y * 30.0) /* base graphs and title */
-            + (arg_pss ? (100.0 * arg_scale_y) + (arg_scale_y * 7.0) : 0.0) /* pss estimate */
-            + psize + ksize + esize;
-
-        fprintf(of, "<?xml version=\"1.0\" standalone=\"no\"?>\n");
-        fprintf(of, "<!DOCTYPE svg PUBLIC \"-//W3C//DTD SVG 1.1//EN\" ");
-        fprintf(of, "\"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd\">\n");
-
-        //fprintf(of, "<g transform=\"translate(10,%d)\">\n", 1000 + 150 + (pcount * 20));
-        fprintf(of, "<svg width=\"%.0fpx\" height=\"%.0fpx\" version=\"1.1\" ", w, h);
-        fprintf(of, "xmlns=\"http://www.w3.org/2000/svg\">\n\n");
-
-        /* write some basic info as a comment, including some help */
-        fprintf(of, "<!-- This file is a bootchart SVG file. It is best rendered in a browser -->\n");
-        fprintf(of, "<!-- such as Chrome, Chromium, or Firefox. Other applications that       -->\n");
-        fprintf(of, "<!-- render these files properly but more slowly are ImageMagick, gimp,  -->\n");
-        fprintf(of, "<!-- inkscape, etc. To display the files on your system, just point      -->\n");
-        fprintf(of, "<!-- your browser to file:///run/log/ and click. This bootchart was      -->\n\n");
-
-        fprintf(of, "<!-- generated by bootchart version %s, running with options:  -->\n", VERSION);
-        fprintf(of, "<!-- hz=\"%f\" n=\"%d\" -->\n", arg_hz, arg_samples_len);
-        fprintf(of, "<!-- x=\"%f\" y=\"%f\" -->\n", arg_scale_x, arg_scale_y);
-        fprintf(of, "<!-- rel=\"%d\" f=\"%d\" -->\n", arg_relative, arg_filter);
-        fprintf(of, "<!-- p=\"%d\" e=\"%d\" -->\n", arg_pss, arg_entropy);
-        fprintf(of, "<!-- o=\"%s\" i=\"%s\" -->\n\n", arg_output_path, arg_init_path);
-
-        /* style sheet */
-        fprintf(of, "<defs>\n  <style type=\"text/css\">\n    <![CDATA[\n");
-
-        fprintf(of, "      rect       { stroke-width: 1; }\n");
-        fprintf(of, "      rect.bg    { fill: rgb(255,255,255); }\n");
-        fprintf(of, "      rect.cpu   { fill: rgb(64,64,240); stroke-width: 0; fill-opacity: 0.7; }\n");
-        fprintf(of, "      rect.wait  { fill: rgb(240,240,0); stroke-width: 0; fill-opacity: 0.7; }\n");
-        fprintf(of, "      rect.bi    { fill: rgb(240,128,128); stroke-width: 0; fill-opacity: 0.7; }\n");
-        fprintf(of, "      rect.bo    { fill: rgb(192,64,64); stroke-width: 0; fill-opacity: 0.7; }\n");
-        fprintf(of, "      rect.ps    { fill: rgb(192,192,192); stroke: rgb(128,128,128); fill-opacity: 0.7; }\n");
-        fprintf(of, "      rect.krnl  { fill: rgb(240,240,0); stroke: rgb(128,128,128); fill-opacity: 0.7; }\n");
-        fprintf(of, "      rect.box   { fill: rgb(240,240,240); stroke: rgb(192,192,192); }\n");
-        fprintf(of, "      rect.clrw  { stroke-width: 0; fill-opacity: 0.7;}\n");
-        fprintf(of, "      line       { stroke: rgb(64,64,64); stroke-width: 1; }\n");
-        fprintf(of, "//    line.sec1  { }\n");
-        fprintf(of, "      line.sec5  { stroke-width: 2; }\n");
-        fprintf(of, "      line.sec01 { stroke: rgb(224,224,224); stroke-width: 1; }\n");
-        fprintf(of, "      line.dot   { stroke-dasharray: 2 4; }\n");
-        fprintf(of, "      line.idle  { stroke: rgb(64,64,64); stroke-dasharray: 10 6; stroke-opacity: 0.7; }\n");
-
-        fprintf(of, "      .run       { font-size: 8; font-style: italic; }\n");
-        fprintf(of, "      text       { font-family: Verdana, Helvetica; font-size: 10; }\n");
-        fprintf(of, "      text.sec   { font-size: 8; }\n");
-        fprintf(of, "      text.t1    { font-size: 24; }\n");
-        fprintf(of, "      text.t2    { font-size: 12; }\n");
-        fprintf(of, "      text.idle  { font-size: 18; }\n");
-
-        fprintf(of, "    ]]>\n   </style>\n</defs>\n\n");
-}
-
-static int svg_title(FILE *of, const char *build, int pscount, double log_start, int overrun) {
-        _cleanup_free_ char *cmdline = NULL;
-        _cleanup_free_ char *model = NULL;
-        _cleanup_free_ char *buf = NULL;
-        char date[256] = "Unknown";
-        char *cpu;
-        char *c;
-        time_t t;
-        int r;
-        struct utsname uts;
-
-        r = read_one_line_file("/proc/cmdline", &cmdline);
-        if (r < 0) {
-                log_error_errno(r, "Unable to read cmdline: %m\n");
-                return r;
-        }
-
-        /* extract root fs so we can find disk model name in sysfs */
-        /* FIXME: this works only in the simple case */
-        c = strstr(cmdline, "root=/dev/");
-        if (c) {
-                char rootbdev[4];
-                char filename[32];
-
-                strncpy(rootbdev, &c[10], sizeof(rootbdev) - 1);
-                rootbdev[3] = '\0';
-                snprintf(filename, sizeof(filename), "/sys/block/%s/device/model", rootbdev);
-
-                r = read_one_line_file(filename, &model);
-                if (r < 0)
-                        log_warning("Error reading disk model for %s: %m\n", rootbdev);
-        }
-
-        /* various utsname parameters */
-        r = uname(&uts);
-        if (r < 0) {
-                log_error("Error getting uname info\n");
-                return -errno;
-        }
-
-        /* date */
-        t = time(NULL);
-        r = strftime(date, sizeof(date), "%a, %d %b %Y %H:%M:%S %z", localtime(&t));
-        assert_se(r > 0);
-
-        /* CPU type */
-        r = read_full_file("/proc/cpuinfo", &buf, NULL);
-        if (r < 0)
-                return log_error_errno(r, "Unable to read cpuinfo: %m\n");
-
-        cpu = strstr(buf, "model name");
-        if (!cpu) {
-                log_error("Unable to read module name from cpuinfo.\n");
-                return -ENOENT;
-        }
-
-        cpu += 13;
-        c = strchr(cpu, '\n');
-        if (c)
-                *c = '\0';
-
-        fprintf(of, "<text class=\"t1\" x=\"0\" y=\"30\">Bootchart for %s - %s</text>\n",
-                uts.nodename, date);
-        fprintf(of, "<text class=\"t2\" x=\"20\" y=\"50\">System: %s %s %s %s</text>\n",
-                uts.sysname, uts.release, uts.version, uts.machine);
-        fprintf(of, "<text class=\"t2\" x=\"20\" y=\"65\">CPU: %s</text>\n", cpu);
-        fprintf(of, "<text class=\"t2\" x=\"20\" y=\"80\">Disk: %s</text>\n", model);
-        fprintf(of, "<text class=\"t2\" x=\"20\" y=\"95\">Boot options: %s</text>\n", cmdline);
-        fprintf(of, "<text class=\"t2\" x=\"20\" y=\"110\">Build: %s</text>\n", build);
-        fprintf(of, "<text class=\"t2\" x=\"20\" y=\"125\">Log start time: %.03fs</text>\n", log_start);
-        fprintf(of, "<text class=\"t2\" x=\"20\" y=\"140\">Idle time: ");
-
-        if (idletime >= 0.0)
-                fprintf(of, "%.03fs", idletime);
-        else
-                fprintf(of, "Not detected");
-
-        fprintf(of, "</text>\n");
-        fprintf(of, "<text class=\"sec\" x=\"20\" y=\"155\">Graph data: %.03f samples/sec, recorded %i total, dropped %i samples, %i processes, %i filtered</text>\n",
-                arg_hz, arg_samples_len, overrun, pscount, pfiltered);
-
-        return 0;
-}
-
-static void svg_graph_box(FILE *of, struct list_sample_data *head, int height, double graph_start) {
-        double d = 0.0;
-        int i = 0;
-        double finalsample = 0.0;
-        struct list_sample_data *sampledata_last;
-
-        sampledata_last = head;
-        LIST_FOREACH_BEFORE(link, sampledata, head) {
-                sampledata_last = sampledata;
-        }
-
-        finalsample = sampledata_last->sampletime;
-
-        /* outside box, fill */
-        fprintf(of, "<rect class=\"box\" x=\"%.03f\" y=\"0\" width=\"%.03f\" height=\"%.03f\" />\n",
-                time_to_graph(0.0),
-                time_to_graph(finalsample - graph_start),
-                ps_to_graph(height));
-
-        for (d = graph_start; d <= finalsample;
-             d += (arg_scale_x < 2.0 ? 60.0 : arg_scale_x < 10.0 ? 1.0 : 0.1)) {
-                /* lines for each second */
-                if (i % 50 == 0)
-                        fprintf(of, "  <line class=\"sec5\" x1=\"%.03f\" y1=\"0\" x2=\"%.03f\" y2=\"%.03f\" />\n",
-                                time_to_graph(d - graph_start),
-                                time_to_graph(d - graph_start),
-                                ps_to_graph(height));
-                else if (i % 10 == 0)
-                        fprintf(of, "  <line class=\"sec1\" x1=\"%.03f\" y1=\"0\" x2=\"%.03f\" y2=\"%.03f\" />\n",
-                                time_to_graph(d - graph_start),
-                                time_to_graph(d - graph_start),
-                                ps_to_graph(height));
-                else
-                        fprintf(of, "  <line class=\"sec01\" x1=\"%.03f\" y1=\"0\" x2=\"%.03f\" y2=\"%.03f\" />\n",
-                                time_to_graph(d - graph_start),
-                                time_to_graph(d - graph_start),
-                                ps_to_graph(height));
-
-                /* time label */
-                if (i % 10 == 0)
-                        fprintf(of, "  <text class=\"sec\" x=\"%.03f\" y=\"%.03f\" >%.01fs</text>\n",
-                                time_to_graph(d - graph_start),
-                                -5.0, d - graph_start);
-
-                i++;
-        }
-}
-
-/* xml comments must not contain "--" */
-static char* xml_comment_encode(const char* name) {
-        char *enc_name, *p;
-
-        enc_name = strdup(name);
-        if (!enc_name)
-                return NULL;
-
-        for (p = enc_name; *p; p++)
-                if (p[0] == '-' && p[1] == '-')
-                        p[1] = '_';
-
-        return enc_name;
-}
-
-static void svg_pss_graph(FILE *of,
-                          struct list_sample_data *head,
-                          struct ps_struct *ps_first,
-                          double graph_start) {
-        struct ps_struct *ps;
-        int i;
-        struct list_sample_data *sampledata_last;
-
-        sampledata_last = head;
-        LIST_FOREACH_BEFORE(link, sampledata, head) {
-                sampledata_last = sampledata;
-        }
-
-
-        fprintf(of, "\n\n<!-- Pss memory size graph -->\n");
-
-        fprintf(of, "\n  <text class=\"t2\" x=\"5\" y=\"-15\">Memory allocation - Pss</text>\n");
-
-        /* vsize 1000 == 1000mb */
-        svg_graph_box(of, head, 100, graph_start);
-        /* draw some hlines for usable memory sizes */
-        for (i = 100000; i < 1000000; i += 100000) {
-                fprintf(of, "  <line class=\"sec01\" x1=\"%.03f\" y1=\"%.0f\" x2=\"%.03f\" y2=\"%.0f\"/>\n",
-                        time_to_graph(.0),
-                        kb_to_graph(i),
-                        time_to_graph(sampledata_last->sampletime - graph_start),
-                        kb_to_graph(i));
-                fprintf(of, "  <text class=\"sec\" x=\"%.03f\" y=\"%.0f\">%dM</text>\n",
-                        time_to_graph(sampledata_last->sampletime - graph_start) + 5,
-                        kb_to_graph(i), (1000000 - i) / 1000);
-        }
-        fprintf(of, "\n");
-
-        /* now plot the graph itself */
-        i = 1;
-        prev_sampledata = head;
-        LIST_FOREACH_BEFORE(link, sampledata, head) {
-                int bottom;
-                int top;
-                struct ps_sched_struct *cross_place;
-
-                bottom = 0;
-                top = 0;
-
-                /* put all the small pss blocks into the bottom */
-                ps = ps_first;
-                while (ps->next_ps) {
-                        ps = ps->next_ps;
-                        if (!ps)
-                                continue;
-                        ps->sample = ps->first;
-                        while (ps->sample->next) {
-                                ps->sample = ps->sample->next;
-                                if (ps->sample->sampledata == sampledata)
-                                        break;
-                        }
-                        if (ps->sample->sampledata == sampledata) {
-                                if (ps->sample->pss <= (100 * arg_scale_y))
-                                        top += ps->sample->pss;
-                                break;
-                        }
-                }
-                while (ps->sample->cross) {
-                        cross_place = ps->sample->cross;
-                        ps = ps->sample->cross->ps_new;
-                        ps->sample = cross_place;
-                        if (ps->sample->pss <= (100 * arg_scale_y))
-                                top += ps->sample->pss;
-                }
-
-                fprintf(of, "    <rect class=\"clrw\" style=\"fill: %s\" x=\"%.03f\" y=\"%.03f\" width=\"%.03f\" height=\"%.03f\" />\n",
-                        "rgb(64,64,64)",
-                        time_to_graph(prev_sampledata->sampletime - graph_start),
-                        kb_to_graph(1000000.0 - top),
-                        time_to_graph(sampledata->sampletime - prev_sampledata->sampletime),
-                        kb_to_graph(top - bottom));
-                bottom = top;
-
-                /* now plot the ones that are of significant size */
-                ps = ps_first;
-                while (ps->next_ps) {
-                        ps = ps->next_ps;
-                        if (!ps)
-                                continue;
-                        ps->sample = ps->first;
-                        while (ps->sample->next) {
-                                ps->sample = ps->sample->next;
-                                if (ps->sample->sampledata == sampledata)
-                                        break;
-                        }
-                        /* don't draw anything smaller than 2mb */
-                        if (ps->sample->sampledata != sampledata)
-                                continue;
-                        if (ps->sample->pss > (100 * arg_scale_y)) {
-                                top = bottom + ps->sample->pss;
-                                fprintf(of, "    <rect class=\"clrw\" style=\"fill: %s\" x=\"%.03f\" y=\"%.03f\" width=\"%.03f\" height=\"%.03f\" />\n",
-                                        colorwheel[ps->pid % 12],
-                                        time_to_graph(prev_sampledata->sampletime - graph_start),
-                                        kb_to_graph(1000000.0 - top),
-                                        time_to_graph(sampledata->sampletime - prev_sampledata->sampletime),
-                                        kb_to_graph(top - bottom));
-                                bottom = top;
-                        }
-                        break;
-                }
-
-                while ((cross_place = ps->sample->cross)) {
-                        ps = ps->sample->cross->ps_new;
-                        ps->sample = cross_place;
-                        if (ps->sample->pss > (100 * arg_scale_y)) {
-                                top = bottom + ps->sample->pss;
-                                fprintf(of, "    <rect class=\"clrw\" style=\"fill: %s\" x=\"%.03f\" y=\"%.03f\" width=\"%.03f\" height=\"%.03f\" />\n",
-                                        colorwheel[ps->pid % 12],
-                                        time_to_graph(prev_sampledata->sampletime - graph_start),
-                                        kb_to_graph(1000000.0 - top),
-                                        time_to_graph(sampledata->sampletime - prev_sampledata->sampletime),
-                                        kb_to_graph(top - bottom));
-                                bottom = top;
-                        }
-                }
-
-                prev_sampledata = sampledata;
-                i++;
-        }
-
-        /* overlay all the text labels */
-        i = 1;
-        LIST_FOREACH_BEFORE(link, sampledata, head) {
-                int bottom;
-                int top = 0;
-                struct ps_sched_struct *prev_sample;
-                struct ps_sched_struct *cross_place;
-
-                /* put all the small pss blocks into the bottom */
-                ps = ps_first->next_ps;
-                while (ps->next_ps) {
-                        ps = ps->next_ps;
-                        if (!ps)
-                                continue;
-
-                        ps->sample = ps->first;
-                        while (ps->sample->next) {
-                                ps->sample = ps->sample->next;
-                                if (ps->sample->sampledata == sampledata)
-                                        break;
-                        }
-
-                        if (ps->sample->sampledata == sampledata) {
-                                if (ps->sample->pss <= (100 * arg_scale_y))
-                                        top += ps->sample->pss;
-
-                                break;
-                        }
-                }
-
-                while ((cross_place = ps->sample->cross)) {
-                        ps = ps->sample->cross->ps_new;
-                        ps->sample = cross_place;
-                        if (ps->sample->pss <= (100 * arg_scale_y))
-                                top += ps->sample->pss;
-                }
-                bottom = top;
-
-                /* now plot the ones that are of significant size */
-                ps = ps_first;
-                while (ps->next_ps) {
-                        prev_sample = ps->sample;
-                        ps = ps->next_ps;
-                        if (!ps)
-                                continue;
-                        ps->sample = ps->first;
-                        while (ps->sample->next) {
-                                prev_sample = ps->sample;
-                                ps->sample = ps->sample->next;
-                                if (ps->sample->sampledata == sampledata)
-                                        break;
-                        }
-                        /* don't draw anything smaller than 2mb */
-                        if (ps->sample->sampledata == sampledata) {
-                                if (ps->sample->pss > (100 * arg_scale_y)) {
-                                        top = bottom + ps->sample->pss;
-                                        /* draw a label with the process / PID */
-                                        if ((i == 1) || (prev_sample->pss <= (100 * arg_scale_y)))
-                                                fprintf(of, "  <text x=\"%.03f\" y=\"%.03f\"><![CDATA[%s]]> [%i]</text>\n",
-                                                        time_to_graph(sampledata->sampletime - graph_start),
-                                                        kb_to_graph(1000000.0 - bottom - ((top -  bottom) / 2)),
-                                                        ps->name, ps->pid);
-                                        bottom = top;
-                                }
-                                break;
-                        }
-                }
-                while ((cross_place = ps->sample->cross)) {
-                        ps = ps->sample->cross->ps_new;
-                        ps->sample = cross_place;
-                        prev_sample = ps->sample->prev;
-                        if (ps->sample->pss > (100 * arg_scale_y)) {
-                                top = bottom + ps->sample->pss;
-                                /* draw a label with the process / PID */
-                                if ((i == 1) || (prev_sample->pss <= (100 * arg_scale_y)))
-                                        fprintf(of, "  <text x=\"%.03f\" y=\"%.03f\"><![CDATA[%s]]> [%i]</text>\n",
-                                                time_to_graph(sampledata->sampletime - graph_start),
-                                                kb_to_graph(1000000.0 - bottom - ((top -  bottom) / 2)),
-                                                ps->name, ps->pid);
-                                bottom = top;
-                        }
-                }
-
-                i++;
-        }
-
-        /* debug output - full data dump */
-        fprintf(of, "\n\n<!-- PSS map - csv format -->\n");
-        ps = ps_first;
-        while (ps->next_ps) {
-                _cleanup_free_ char *enc_name = NULL;
-                ps = ps->next_ps;
-                if (!ps)
-                        continue;
-
-                enc_name = xml_comment_encode(ps->name);
-                if (!enc_name)
-                        continue;
-
-                fprintf(of, "<!-- %s [%d] pss=", enc_name, ps->pid);
-
-                ps->sample = ps->first;
-                while (ps->sample->next) {
-                        ps->sample = ps->sample->next;
-                        fprintf(of, "%d," , ps->sample->pss);
-                }
-
-                fprintf(of, " -->\n");
-        }
-
-}
-
-static void svg_io_bi_bar(FILE *of,
-                          struct list_sample_data *head,
-                          int n_samples,
-                          double graph_start,
-                          double interval) {
-
-        double max = 0.0;
-        double range;
-        int max_here = 0;
-        int i;
-        int k;
-        struct list_sample_data *start_sampledata;
-        struct list_sample_data *stop_sampledata;
-
-        fprintf(of, "<!-- IO utilization graph - In -->\n");
-        fprintf(of, "<text class=\"t2\" x=\"5\" y=\"-15\">IO utilization - read</text>\n");
-
-        /*
-         * calculate rounding range
-         *
-         * We need to round IO data since IO block data is not updated on
-         * each poll. Applying a smoothing function loses some burst data,
-         * so keep the smoothing range short.
-         */
-        range = 0.25 / (1.0 / arg_hz);
-        if (range < 2.0)
-                range = 2.0; /* no smoothing */
-
-        /* surrounding box */
-        svg_graph_box(of, head, 5, graph_start);
-
-        /* find the max IO first */
-        i = 1;
-        LIST_FOREACH_BEFORE(link, sampledata, head) {
-                int start;
-                int stop;
-                int diff;
-                double tot;
-
-                start = MAX(i - ((range / 2) - 1), 0);
-                stop = MIN(i + (range / 2), n_samples - 1);
-                diff = (stop - start);
-
-                start_sampledata = sampledata;
-                stop_sampledata = sampledata;
-
-                for (k = 0; k < ((range/2) - 1) && start_sampledata->link_next; k++)
-                        start_sampledata = start_sampledata->link_next;
-
-                for (k = 0; k < (range/2) && stop_sampledata->link_prev; k++)
-                        stop_sampledata = stop_sampledata->link_prev;
-
-                tot = (double)(stop_sampledata->blockstat.bi - start_sampledata->blockstat.bi) / diff;
-
-                if (tot > max) {
-                        max = tot;
-                        max_here = i;
-                }
-
-                tot = (double)(stop_sampledata->blockstat.bo - start_sampledata->blockstat.bo) / diff;
-
-                if (tot > max)
-                        max = tot;
-
-                i++;
-        }
-
-        /* plot bi */
-        i = 1;
-        prev_sampledata = head;
-        LIST_FOREACH_BEFORE(link, sampledata, head) {
-                int start;
-                int stop;
-                int diff;
-                double tot;
-                double pbi = 0;
-
-                start = MAX(i - ((range / 2) - 1), 0);
-                stop = MIN(i + (range / 2), n_samples);
-                diff = (stop - start);
-
-                start_sampledata = sampledata;
-                stop_sampledata = sampledata;
-
-                for (k = 0; k < ((range/2)-1) && start_sampledata->link_next; k++)
-                        start_sampledata = start_sampledata->link_next;
-
-                for (k = 0; k < (range/2) && stop_sampledata->link_prev; k++)
-                        stop_sampledata = stop_sampledata->link_prev;
-
-                tot = (double)(stop_sampledata->blockstat.bi - start_sampledata->blockstat.bi) / diff;
-
-                if (max > 0)
-                        pbi = tot / max;
-
-                if (pbi > 0.001)
-                        fprintf(of, "<rect class=\"bi\" x=\"%.03f\" y=\"%.03f\" width=\"%.03f\" height=\"%.03f\" />\n",
-                                time_to_graph(prev_sampledata->sampletime - graph_start),
-                                (arg_scale_y * 5) - (pbi * (arg_scale_y * 5)),
-                                time_to_graph(sampledata->sampletime - prev_sampledata->sampletime),
-                                pbi * (arg_scale_y * 5));
-
-                /* labels around highest value */
-                if (i == max_here) {
-                        fprintf(of, "  <text class=\"sec\" x=\"%.03f\" y=\"%.03f\">%0.2fmb/sec</text>\n",
-                                time_to_graph(sampledata->sampletime - graph_start) + 5,
-                                ((arg_scale_y * 5) - (pbi * (arg_scale_y * 5))) + 15,
-                                max / 1024.0 / (interval / 1000000000.0));
-                }
-
-                i++;
-                prev_sampledata = sampledata;
-        }
-}
-
-static void svg_io_bo_bar(FILE *of,
-                          struct list_sample_data *head,
-                          int n_samples,
-                          double graph_start,
-                          double interval) {
-        double max = 0.0;
-        double range;
-        int max_here = 0;
-        int i;
-        int k;
-        struct list_sample_data *start_sampledata;
-        struct list_sample_data *stop_sampledata;
-
-        fprintf(of, "<!-- IO utilization graph - out -->\n");
-        fprintf(of, "<text class=\"t2\" x=\"5\" y=\"-15\">IO utilization - write</text>\n");
-
-        /*
-         * calculate rounding range
-         *
-         * We need to round IO data since IO block data is not updated on
-         * each poll. Applying a smoothing function loses some burst data,
-         * so keep the smoothing range short.
-         */
-        range = 0.25 / (1.0 / arg_hz);
-        if (range < 2.0)
-                range = 2.0; /* no smoothing */
-
-        /* surrounding box */
-        svg_graph_box(of, head, 5, graph_start);
-
-        /* find the max IO first */
-        i = 0;
-        LIST_FOREACH_BEFORE(link, sampledata, head) {
-                int start;
-                int stop;
-                int diff;
-                double tot;
-
-                start = MAX(i - ((range / 2) - 1), 0);
-                stop = MIN(i + (range / 2), n_samples - 1);
-                diff = (stop - start);
-
-                start_sampledata = sampledata;
-                stop_sampledata = sampledata;
-
-                for (k = 0; k < (range/2) - 1 && start_sampledata->link_next; k++)
-                        start_sampledata = start_sampledata->link_next;
-
-                for (k = 0; k < (range/2) && stop_sampledata->link_prev; k++)
-                        stop_sampledata = stop_sampledata->link_prev;
-
-                tot = (double)(stop_sampledata->blockstat.bi - start_sampledata->blockstat.bi) / diff;
-                if (tot > max)
-                        max = tot;
-
-                tot = (double)(stop_sampledata->blockstat.bo - start_sampledata->blockstat.bo) / diff;
-                if (tot > max) {
-                        max = tot;
-                        max_here = i;
-                }
-
-                i++;
-        }
-
-        /* plot bo */
-        prev_sampledata = head;
-        i = 1;
-
-        LIST_FOREACH_BEFORE(link, sampledata, head) {
-                int start, stop, diff;
-                double tot, pbo;
-
-                pbo = 0;
-
-                start = MAX(i - ((range / 2) - 1), 0);
-                stop = MIN(i + (range / 2), n_samples);
-                diff = (stop - start);
-
-                start_sampledata = sampledata;
-                stop_sampledata = sampledata;
-
-                for (k = 0; k < ((range/2)-1) && start_sampledata->link_next; k++)
-                        start_sampledata = start_sampledata->link_next;
-
-                for (k = 0; k < (range/2) && stop_sampledata->link_prev; k++)
-                        stop_sampledata = stop_sampledata->link_prev;
-
-                tot = (double)(stop_sampledata->blockstat.bo - start_sampledata->blockstat.bo)
-                        / diff;
-
-                if (max > 0)
-                        pbo = tot / max;
-
-                if (pbo > 0.001)
-                        fprintf(of, "<rect class=\"bo\" x=\"%.03f\" y=\"%.03f\" width=\"%.03f\" height=\"%.03f\" />\n",
-                                time_to_graph(prev_sampledata->sampletime - graph_start),
-                                (arg_scale_y * 5) - (pbo * (arg_scale_y * 5)),
-                                time_to_graph(sampledata->sampletime - prev_sampledata->sampletime),
-                                pbo * (arg_scale_y * 5));
-
-                /* labels around highest bo value */
-                if (i == max_here) {
-                        fprintf(of, "  <text class=\"sec\" x=\"%.03f\" y=\"%.03f\">%0.2fmb/sec</text>\n",
-                                time_to_graph(sampledata->sampletime - graph_start) + 5,
-                                ((arg_scale_y * 5) - (pbo * (arg_scale_y * 5))),
-                                max / 1024.0 / (interval / 1000000000.0));
-                }
-
-                i++;
-                prev_sampledata = sampledata;
-        }
-}
-
-static void svg_cpu_bar(FILE *of, struct list_sample_data *head, int n_cpus, int cpu_num, double graph_start) {
-
-        fprintf(of, "<!-- CPU utilization graph -->\n");
-
-        if (cpu_num < 0)
-                fprintf(of, "<text class=\"t2\" x=\"5\" y=\"-15\">CPU[overall] utilization</text>\n");
-        else
-                fprintf(of, "<text class=\"t2\" x=\"5\" y=\"-15\">CPU[%d] utilization</text>\n", cpu_num);
-
-        /* surrounding box */
-        svg_graph_box(of, head, 5, graph_start);
-
-        /* bars for each sample, proportional to the CPU util. */
-        prev_sampledata = head;
-        LIST_FOREACH_BEFORE(link, sampledata, head) {
-                int c;
-                double trt;
-                double ptrt;
-
-                ptrt = trt = 0.0;
-
-                if (cpu_num < 0)
-                        for (c = 0; c < n_cpus; c++)
-                                trt += sampledata->runtime[c] - prev_sampledata->runtime[c];
-                else
-                        trt = sampledata->runtime[cpu_num] - prev_sampledata->runtime[cpu_num];
-
-                trt = trt / 1000000000.0;
-
-                if (cpu_num < 0)
-                        trt = trt / (double)n_cpus;
-
-                if (trt > 0.0)
-                        ptrt = trt / (sampledata->sampletime - prev_sampledata->sampletime);
-
-                if (ptrt > 1.0)
-                        ptrt = 1.0;
-
-                if (ptrt > 0.001)
-                        fprintf(of, "<rect class=\"cpu\" x=\"%.03f\" y=\"%.03f\" width=\"%.03f\" height=\"%.03f\" />\n",
-                                time_to_graph(prev_sampledata->sampletime - graph_start),
-                                (arg_scale_y * 5) - (ptrt * (arg_scale_y * 5)),
-                                time_to_graph(sampledata->sampletime - prev_sampledata->sampletime),
-                                ptrt * (arg_scale_y * 5));
-
-                prev_sampledata = sampledata;
-        }
-}
-
-static void svg_wait_bar(FILE *of, struct list_sample_data *head, int n_cpus, int cpu_num, double graph_start) {
-
-        fprintf(of, "<!-- Wait time aggregation box -->\n");
-
-        if (cpu_num < 0)
-                fprintf(of, "<text class=\"t2\" x=\"5\" y=\"-15\">CPU[overall] wait</text>\n");
-        else
-                fprintf(of, "<text class=\"t2\" x=\"5\" y=\"-15\">CPU[%d] wait</text>\n", cpu_num);
-
-        /* surrounding box */
-        svg_graph_box(of, head, 5, graph_start);
-
-        /* bars for each sample, proportional to the CPU util. */
-        prev_sampledata = head;
-        LIST_FOREACH_BEFORE(link, sampledata, head) {
-                int c;
-                double twt;
-                double ptwt;
-
-                ptwt = twt = 0.0;
-
-                if (cpu_num < 0)
-                        for (c = 0; c < n_cpus; c++)
-                                twt += sampledata->waittime[c] - prev_sampledata->waittime[c];
-                else
-                        twt = sampledata->waittime[cpu_num] - prev_sampledata->waittime[cpu_num];
-
-                twt = twt / 1000000000.0;
-
-                if (cpu_num < 0)
-                        twt = twt / (double)n_cpus;
-
-                if (twt > 0.0)
-                        ptwt = twt / (sampledata->sampletime - prev_sampledata->sampletime);
-
-                if (ptwt > 1.0)
-                        ptwt = 1.0;
-
-                if (ptwt > 0.001)
-                        fprintf(of, "<rect class=\"wait\" x=\"%.03f\" y=\"%.03f\" width=\"%.03f\" height=\"%.03f\" />\n",
-                                time_to_graph(prev_sampledata->sampletime - graph_start),
-                                ((arg_scale_y * 5) - (ptwt * (arg_scale_y * 5))),
-                                time_to_graph(sampledata->sampletime - prev_sampledata->sampletime),
-                                ptwt * (arg_scale_y * 5));
-
-                prev_sampledata = sampledata;
-        }
-}
-
-static void svg_entropy_bar(FILE *of, struct list_sample_data *head, double graph_start) {
-
-        fprintf(of, "<!-- entropy pool graph -->\n");
-
-        fprintf(of, "<text class=\"t2\" x=\"5\" y=\"-15\">Entropy pool size</text>\n");
-        /* surrounding box */
-        svg_graph_box(of, head, 5, graph_start);
-
-        /* bars for each sample, scale 0-4096 */
-        prev_sampledata = head;
-        LIST_FOREACH_BEFORE(link, sampledata, head) {
-                fprintf(of, "<rect class=\"cpu\" x=\"%.03f\" y=\"%.03f\" width=\"%.03f\" height=\"%.03f\" />\n",
-                        time_to_graph(prev_sampledata->sampletime - graph_start),
-                        ((arg_scale_y * 5) - ((sampledata->entropy_avail / 4096.) * (arg_scale_y * 5))),
-                        time_to_graph(sampledata->sampletime - prev_sampledata->sampletime),
-                        (sampledata->entropy_avail / 4096.) * (arg_scale_y * 5));
-                prev_sampledata = sampledata;
-        }
-}
-
-static struct ps_struct *get_next_ps(struct ps_struct *ps, struct ps_struct *ps_first) {
-        /*
-         * walk the list of processes and return the next one to be
-         * painted
-         */
-        if (ps == ps_first)
-                return ps->next_ps;
-
-        /* go deep */
-        if (ps->children)
-                return ps->children;
-
-        /* find siblings */
-        if (ps->next)
-                return ps->next;
-
-        /* go back for parent siblings */
-        while (1) {
-                if (ps->parent && ps->parent->next)
-                        return ps->parent->next;
-
-                ps = ps->parent;
-                if (!ps)
-                        return ps;
-        }
-
-        return NULL;
-}
-
-static bool ps_filter(struct ps_struct *ps) {
-        if (!arg_filter)
-                return false;
-
-        /* can't draw data when there is only 1 sample (need start + stop) */
-        if (ps->first == ps->last)
-                return true;
-
-        /* don't filter kthreadd */
-        if (ps->pid == 2)
-                return false;
-
-        /* drop stuff that doesn't use any real CPU time */
-        if (ps->total <= 0.001)
-                return true;
-
-        return 0;
-}
-
-static void svg_do_initcall(FILE *of, struct list_sample_data *head, int count_only, double graph_start) {
-        _cleanup_pclose_ FILE *f = NULL;
-        double t;
-        char func[256];
-        int ret;
-        int usecs;
-
-        /* can't plot initcall when disabled or in relative mode */
-        if (!arg_initcall || arg_relative) {
-                kcount = 0;
-                return;
-        }
-
-        if (!count_only) {
-                fprintf(of, "<!-- initcall -->\n");
-                fprintf(of, "<text class=\"t2\" x=\"5\" y=\"-15\">Kernel init threads</text>\n");
-                /* surrounding box */
-                svg_graph_box(of, head, kcount, graph_start);
-        }
-
-        kcount = 0;
-
-        /*
-         * Initcall graphing - parses dmesg buffer and displays kernel threads
-         * This somewhat uses the same methods and scaling to show processes
-         * but looks a lot simpler. It's overlaid entirely onto the PS graph
-         * when appropriate.
-         */
-
-        f = popen("dmesg", "r");
-        if (!f)
-                return;
-
-        while (!feof(f)) {
-                int c;
-                int z = 0;
-                char l[256];
-
-                if (fgets(l, sizeof(l) - 1, f) == NULL)
-                        continue;
-
-                c = sscanf(l, "[%lf] initcall %s %*s %d %*s %d %*s",
-                           &t, func, &ret, &usecs);
-                if (c != 4) {
-                        /* also parse initcalls done by module loading */
-                        c = sscanf(l, "[%lf] initcall %s %*s %*s %d %*s %d %*s",
-                                   &t, func, &ret, &usecs);
-                        if (c != 4)
-                                continue;
-                }
-
-                /* chop the +0xXX/0xXX stuff */
-                while(func[z] != '+')
-                        z++;
-                func[z] = 0;
-
-                if (count_only) {
-                        /* filter out irrelevant stuff */
-                        if (usecs >= 1000)
-                                kcount++;
-                        continue;
-                }
-
-                fprintf(of, "<!-- thread=\"%s\" time=\"%.3f\" elapsed=\"%d\" result=\"%d\" -->\n",
-                        func, t, usecs, ret);
-
-                if (usecs < 1000)
-                        continue;
-
-                /* rect */
-                fprintf(of, "  <rect class=\"krnl\" x=\"%.03f\" y=\"%.03f\" width=\"%.03f\" height=\"%.03f\" />\n",
-                        time_to_graph(t - (usecs / 1000000.0)),
-                        ps_to_graph(kcount),
-                        time_to_graph(usecs / 1000000.0),
-                        ps_to_graph(1));
-
-                /* label */
-                fprintf(of, "  <text x=\"%.03f\" y=\"%.03f\">%s <tspan class=\"run\">%.03fs</tspan></text>\n",
-                        time_to_graph(t - (usecs / 1000000.0)) + 5,
-                        ps_to_graph(kcount) + 15,
-                        func, usecs / 1000000.0);
-
-                kcount++;
-        }
-}
-
-static void svg_ps_bars(FILE *of,
-                        struct list_sample_data *head,
-                        int n_samples,
-                        int n_cpus,
-                        struct ps_struct *ps_first,
-                        double graph_start,
-                        double interval) {
-
-        struct ps_struct *ps;
-        int i = 0;
-        int j = 0;
-        int pid;
-        double w = 0.0;
-
-        fprintf(of, "<!-- Process graph -->\n");
-        fprintf(of, "<text class=\"t2\" x=\"5\" y=\"-15\">Processes</text>\n");
-
-        /* surrounding box */
-        svg_graph_box(of, head, pcount, graph_start);
-
-        /* pass 2 - ps boxes */
-        ps = ps_first;
-        while ((ps = get_next_ps(ps, ps_first))) {
-                _cleanup_free_ char *enc_name = NULL, *escaped = NULL;
-                double endtime;
-                double starttime;
-                int t;
-
-                if (!utf8_is_printable(ps->name, strlen(ps->name)))
-                        escaped = utf8_escape_non_printable(ps->name);
-
-                enc_name = xml_comment_encode(escaped ? escaped : ps->name);
-                if (!enc_name)
-                        continue;
-
-                /* leave some trace of what we actually filtered etc. */
-                fprintf(of, "<!-- %s [%i] ppid=%i runtime=%.03fs -->\n", enc_name, ps->pid,
-                        ps->ppid, ps->total);
-
-                starttime = ps->first->sampledata->sampletime;
-
-                if (!ps_filter(ps)) {
-                        /* remember where _to_ our children need to draw a line */
-                        ps->pos_x = time_to_graph(starttime - graph_start);
-                        ps->pos_y = ps_to_graph(j+1); /* bottom left corner */
-                } else if (ps->parent){
-                        /* hook children to our parent coords instead */
-                        ps->pos_x = ps->parent->pos_x;
-                        ps->pos_y = ps->parent->pos_y;
-
-                        /* if this is the last child, we might still need to draw a connecting line */
-                        if ((!ps->next) && (ps->parent))
-                                fprintf(of, "  <line class=\"dot\" x1=\"%.03f\" y1=\"%.03f\" x2=\"%.03f\" y2=\"%.03f\" />\n",
-                                        ps->parent->pos_x,
-                                        ps_to_graph(j-1) + 10.0, /* whee, use the last value here */
-                                        ps->parent->pos_x,
-                                        ps->parent->pos_y);
-                        continue;
-                }
-
-                endtime = ps->last->sampledata->sampletime;
-                fprintf(of, "  <rect class=\"ps\" x=\"%.03f\" y=\"%.03f\" width=\"%.03f\" height=\"%.03f\" />\n",
-                        time_to_graph(starttime - graph_start),
-                        ps_to_graph(j),
-                        time_to_graph(ps->last->sampledata->sampletime - starttime),
-                        ps_to_graph(1));
-
-                /* paint cpu load over these */
-                ps->sample = ps->first;
-                t = 1;
-                while (ps->sample->next) {
-                        double rt, prt;
-                        double wt, wrt;
-                        struct ps_sched_struct *prev;
-
-                        prev = ps->sample;
-                        ps->sample = ps->sample->next;
-
-                        /* calculate over interval */
-                        rt = ps->sample->runtime - prev->runtime;
-                        wt = ps->sample->waittime - prev->waittime;
-
-                        prt = (rt / 1000000000) / (ps->sample->sampledata->sampletime - prev->sampledata->sampletime);
-                        wrt = (wt / 1000000000) / (ps->sample->sampledata->sampletime - prev->sampledata->sampletime);
-
-                        /* this can happen if timekeeping isn't accurate enough */
-                        if (prt > 1.0)
-                                prt = 1.0;
-                        if (wrt > 1.0)
-                                wrt = 1.0;
-
-                        if ((prt < 0.1) && (wrt < 0.1)) /* =~ 26 (color threshold) */
-                                continue;
-
-                        fprintf(of, "    <rect class=\"wait\" x=\"%.03f\" y=\"%.03f\" width=\"%.03f\" height=\"%.03f\" />\n",
-                                time_to_graph(prev->sampledata->sampletime - graph_start),
-                                ps_to_graph(j),
-                                time_to_graph(ps->sample->sampledata->sampletime - prev->sampledata->sampletime),
-                                ps_to_graph(wrt));
-
-                        /* draw cpu over wait - TODO figure out how/why run + wait > interval */
-                        fprintf(of, "    <rect class=\"cpu\" x=\"%.03f\" y=\"%.03f\" width=\"%.03f\" height=\"%.03f\" />\n",
-                                time_to_graph(prev->sampledata->sampletime - graph_start),
-                                ps_to_graph(j + (1.0 - prt)),
-                                time_to_graph(ps->sample->sampledata->sampletime - prev->sampledata->sampletime),
-                                ps_to_graph(prt));
-                        t++;
-                }
-
-                /* determine where to display the process name */
-                if ((endtime - starttime) < 1.5)
-                        /* too small to fit label inside the box */
-                        w = endtime;
-                else
-                        w = starttime;
-
-                /* text label of process name */
-                fprintf(of, "  <text x=\"%.03f\" y=\"%.03f\"><![CDATA[%s]]> [%i]<tspan class=\"run\">%.03fs</tspan> %s</text>\n",
-                        time_to_graph(w - graph_start) + 5.0,
-                        ps_to_graph(j) + 14.0,
-                        escaped ? escaped : ps->name,
-                        ps->pid,
-                        (ps->last->runtime - ps->first->runtime) / 1000000000.0,
-                        arg_show_cgroup ? ps->cgroup : "");
-                /* paint lines to the parent process */
-                if (ps->parent) {
-                        /* horizontal part */
-                        fprintf(of, "  <line class=\"dot\" x1=\"%.03f\" y1=\"%.03f\" x2=\"%.03f\" y2=\"%.03f\" />\n",
-                                time_to_graph(starttime - graph_start),
-                                ps_to_graph(j) + 10.0,
-                                ps->parent->pos_x,
-                                ps_to_graph(j) + 10.0);
-
-                        /* one vertical line connecting all the horizontal ones up */
-                        if (!ps->next)
-                                fprintf(of, "  <line class=\"dot\" x1=\"%.03f\" y1=\"%.03f\" x2=\"%.03f\" y2=\"%.03f\" />\n",
-                                        ps->parent->pos_x,
-                                        ps_to_graph(j) + 10.0,
-                                        ps->parent->pos_x,
-                                        ps->parent->pos_y);
-                }
-
-                j++; /* count boxes */
-
-                fprintf(of, "\n");
-        }
-
-        /* last pass - determine when idle */
-        pid = getpid();
-        /* make sure we start counting from the point where we actually have
-         * data: assume that bootchart's first sample is when data started
-         */
-
-        ps = ps_first;
-        while (ps->next_ps) {
-                ps = ps->next_ps;
-                if (ps->pid == pid)
-                        break;
-        }
-
-        /* need to know last node first */
-        ps->sample = ps->first;
-        i = ps->sample->next->sampledata->counter;
-
-        while (ps->sample->next && i<(n_samples-(arg_hz/2))) {
-                double crt;
-                double brt;
-                int c;
-                int ii;
-                struct ps_sched_struct *sample_hz;
-
-                ps->sample = ps->sample->next;
-                sample_hz = ps->sample;
-                for (ii = 0; (ii < (int)arg_hz/2) && sample_hz->next; ii++)
-                        sample_hz = sample_hz->next;
-
-                /* subtract bootchart cpu utilization from total */
-                crt = 0.0;
-                for (c = 0; c < n_cpus; c++)
-                        crt += sample_hz->sampledata->runtime[c] - ps->sample->sampledata->runtime[c];
-
-                brt = sample_hz->runtime - ps->sample->runtime;
-                /*
-                 * our definition of "idle":
-                 *
-                 * if for (hz / 2) we've used less CPU than (interval / 2) ...
-                 * defaults to 4.0%, which experimentally, is where atom idles
-                 */
-                if ((crt - brt) < (interval / 2.0)) {
-                        idletime = ps->sample->sampledata->sampletime - graph_start;
-                        fprintf(of, "\n<!-- idle detected at %.03f seconds -->\n", idletime);
-                        fprintf(of, "<line class=\"idle\" x1=\"%.03f\" y1=\"%.03f\" x2=\"%.03f\" y2=\"%.03f\" />\n",
-                                time_to_graph(idletime),
-                                -arg_scale_y,
-                                time_to_graph(idletime),
-                                ps_to_graph(pcount) + arg_scale_y);
-                        fprintf(of, "<text class=\"idle\" x=\"%.03f\" y=\"%.03f\">%.01fs</text>\n",
-                                time_to_graph(idletime) + 5.0,
-                                ps_to_graph(pcount) + arg_scale_y,
-                                idletime);
-                        break;
-                }
-
-                i++;
-        }
-}
-
-static void svg_top_ten_cpu(FILE *of, struct ps_struct *ps_first) {
-        struct ps_struct *top[10];
-        struct ps_struct emptyps = {};
-        struct ps_struct *ps;
-        int n, m;
-
-        for (n = 0; n < (int) ELEMENTSOF(top); n++)
-                top[n] = &emptyps;
-
-        /* walk all ps's and setup ptrs */
-        ps = ps_first;
-        while ((ps = get_next_ps(ps, ps_first))) {
-                for (n = 0; n < 10; n++) {
-                        if (ps->total <= top[n]->total)
-                                continue;
-                        /* cascade insert */
-                        for (m = 9; m > n; m--)
-                                top[m] = top[m-1];
-                        top[n] = ps;
-                        break;
-                }
-        }
-
-        fprintf(of, "<text class=\"t2\" x=\"20\" y=\"0\">Top CPU consumers:</text>\n");
-        for (n = 0; n < 10; n++)
-                fprintf(of, "<text class=\"t3\" x=\"20\" y=\"%d\">%3.03fs - <![CDATA[%s]]> [%d]</text>\n",
-                        20 + (n * 13),
-                        top[n]->total,
-                        top[n]->name,
-                        top[n]->pid);
-}
-
-static void svg_top_ten_pss(FILE *of, struct ps_struct *ps_first) {
-        struct ps_struct *top[10];
-        struct ps_struct emptyps = {};
-        struct ps_struct *ps;
-        int n, m;
-
-        for (n = 0; n < (int) ELEMENTSOF(top); n++)
-                top[n] = &emptyps;
-
-        /* walk all ps's and setup ptrs */
-        ps = ps_first;
-        while ((ps = get_next_ps(ps, ps_first))) {
-                for (n = 0; n < 10; n++) {
-                        if (ps->pss_max <= top[n]->pss_max)
-                                continue;
-
-                        /* cascade insert */
-                        for (m = 9; m > n; m--)
-                                top[m] = top[m-1];
-                        top[n] = ps;
-                        break;
-                }
-        }
-
-        fprintf(of, "<text class=\"t2\" x=\"20\" y=\"0\">Top PSS consumers:</text>\n");
-        for (n = 0; n < 10; n++)
-                fprintf(of, "<text class=\"t3\" x=\"20\" y=\"%d\">%dK - <![CDATA[%s]]> [%d]</text>\n",
-                        20 + (n * 13),
-                        top[n]->pss_max,
-                        top[n]->name,
-                        top[n]->pid);
-}
-
-int svg_do(FILE *of,
-           const char *build,
-           struct list_sample_data *head,
-           struct ps_struct *ps_first,
-           int n_samples,
-           int pscount,
-           int n_cpus,
-           double graph_start,
-           double log_start,
-           double interval,
-           int overrun) {
-
-        struct ps_struct *ps;
-        double offset = 7;
-        int r, c;
-
-        ps = ps_first;
-
-        /* count initcall thread count first */
-        svg_do_initcall(of, head, 1, graph_start);
-        ksize = kcount ? ps_to_graph(kcount) + (arg_scale_y * 2) : 0;
-
-        /* then count processes */
-        while ((ps = get_next_ps(ps, ps_first))) {
-                if (!ps_filter(ps))
-                        pcount++;
-                else
-                        pfiltered++;
-        }
-        psize = ps_to_graph(pcount) + (arg_scale_y * 2);
-
-        esize = (arg_entropy ? arg_scale_y * 7 : 0);
-
-        /* after this, we can draw the header with proper sizing */
-        svg_header(of, head, graph_start);
-        fprintf(of, "<rect class=\"bg\" width=\"100%%\" height=\"100%%\" />\n\n");
-
-        fprintf(of, "<g transform=\"translate(10,400)\">\n");
-        svg_io_bi_bar(of, head, n_samples, graph_start, interval);
-        fprintf(of, "</g>\n\n");
-
-        fprintf(of, "<g transform=\"translate(10,%.03f)\">\n", 400.0 + (arg_scale_y * offset));
-        svg_io_bo_bar(of, head, n_samples, graph_start, interval);
-        fprintf(of, "</g>\n\n");
-
-        for (c = -1; c < (arg_percpu ? n_cpus : 0); c++) {
-                offset += 7;
-                fprintf(of, "<g transform=\"translate(10,%.03f)\">\n", 400.0 + (arg_scale_y * offset));
-                svg_cpu_bar(of, head, n_cpus, c, graph_start);
-                fprintf(of, "</g>\n\n");
-
-                offset += 7;
-                fprintf(of, "<g transform=\"translate(10,%.03f)\">\n", 400.0 + (arg_scale_y * offset));
-                svg_wait_bar(of, head, n_cpus, c, graph_start);
-                fprintf(of, "</g>\n\n");
-        }
-
-        if (kcount) {
-                offset += 7;
-                fprintf(of, "<g transform=\"translate(10,%.03f)\">\n", 400.0 + (arg_scale_y * offset));
-                svg_do_initcall(of, head, 0, graph_start);
-                fprintf(of, "</g>\n\n");
-        }
-
-        offset += 7;
-        fprintf(of, "<g transform=\"translate(10,%.03f)\">\n", 400.0 + (arg_scale_y * offset) + ksize);
-        svg_ps_bars(of, head, n_samples, n_cpus, ps_first, graph_start, interval);
-        fprintf(of, "</g>\n\n");
-
-        fprintf(of, "<g transform=\"translate(10,  0)\">\n");
-        r = svg_title(of, build, pscount, log_start, overrun);
-        fprintf(of, "</g>\n\n");
-
-        if (r < 0)
-                return r;
-
-        fprintf(of, "<g transform=\"translate(10,200)\">\n");
-        svg_top_ten_cpu(of, ps_first);
-        fprintf(of, "</g>\n\n");
-
-        if (arg_entropy) {
-                fprintf(of, "<g transform=\"translate(10,%.03f)\">\n", 400.0 + (arg_scale_y * offset) + ksize + psize);
-                svg_entropy_bar(of, head, graph_start);
-                fprintf(of, "</g>\n\n");
-        }
-
-        if (arg_pss) {
-                fprintf(of, "<g transform=\"translate(10,%.03f)\">\n", 400.0 + (arg_scale_y * offset) + ksize + psize + esize);
-                svg_pss_graph(of, head, ps_first, graph_start);
-                fprintf(of, "</g>\n\n");
-
-                fprintf(of, "<g transform=\"translate(410,200)\">\n");
-                svg_top_ten_pss(of, ps_first);
-                fprintf(of, "</g>\n\n");
-        }
-
-        /* fprintf footer */
-        fprintf(of, "\n</svg>\n");
-
-        return 0;
-}
diff --git a/src/bootchart/svg.h b/src/bootchart/svg.h
deleted file mode 100644 (file)
index 75efa22..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-/*-*- 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/>.
-***/
-
-int svg_do(FILE *of,
-           const char *build,
-           struct list_sample_data *head,
-           struct ps_struct *ps_first,
-           int n_samples,
-           int pscount,
-           int n_cpus,
-           double graph_start,
-           double log_start,
-           double interval,
-           int overrun);