bootchart: kill a bunch of global variables
This code is in a confusingly bad shape. Kill a bunch of global variables and pass needed variables around in function calls.
This commit is contained in:
+37
-18
@@ -58,14 +58,6 @@
|
|||||||
#include "bootchart.h"
|
#include "bootchart.h"
|
||||||
#include "list.h"
|
#include "list.h"
|
||||||
|
|
||||||
double graph_start;
|
|
||||||
double log_start;
|
|
||||||
struct ps_struct *ps_first;
|
|
||||||
int pscount;
|
|
||||||
int cpus;
|
|
||||||
double interval;
|
|
||||||
FILE *of = NULL;
|
|
||||||
int overrun = 0;
|
|
||||||
static int exiting = 0;
|
static int exiting = 0;
|
||||||
|
|
||||||
#define DEFAULT_SAMPLES_LEN 500
|
#define DEFAULT_SAMPLES_LEN 500
|
||||||
@@ -77,20 +69,17 @@ static int exiting = 0;
|
|||||||
|
|
||||||
/* graph defaults */
|
/* graph defaults */
|
||||||
bool arg_entropy = false;
|
bool arg_entropy = false;
|
||||||
bool initcall = true;
|
bool arg_initcall = true;
|
||||||
bool arg_relative = false;
|
bool arg_relative = false;
|
||||||
bool arg_filter = true;
|
bool arg_filter = true;
|
||||||
bool arg_show_cmdline = false;
|
bool arg_show_cmdline = false;
|
||||||
bool arg_show_cgroup = false;
|
bool arg_show_cgroup = false;
|
||||||
bool arg_pss = false;
|
bool arg_pss = false;
|
||||||
bool arg_percpu = false;
|
bool arg_percpu = false;
|
||||||
int samples;
|
|
||||||
int arg_samples_len = DEFAULT_SAMPLES_LEN; /* we record len+1 (1 start sample) */
|
int arg_samples_len = DEFAULT_SAMPLES_LEN; /* we record len+1 (1 start sample) */
|
||||||
double arg_hz = DEFAULT_HZ;
|
double arg_hz = DEFAULT_HZ;
|
||||||
double arg_scale_x = DEFAULT_SCALE_X;
|
double arg_scale_x = DEFAULT_SCALE_X;
|
||||||
double arg_scale_y = DEFAULT_SCALE_Y;
|
double arg_scale_y = DEFAULT_SCALE_Y;
|
||||||
static struct list_sample_data *sampledata;
|
|
||||||
struct list_sample_data *head;
|
|
||||||
|
|
||||||
char arg_init_path[PATH_MAX] = DEFAULT_INIT;
|
char arg_init_path[PATH_MAX] = DEFAULT_INIT;
|
||||||
char arg_output_path[PATH_MAX] = DEFAULT_OUTPUT;
|
char arg_output_path[PATH_MAX] = DEFAULT_OUTPUT;
|
||||||
@@ -315,6 +304,11 @@ int main(int argc, char *argv[]) {
|
|||||||
_cleanup_free_ char *build = NULL;
|
_cleanup_free_ char *build = NULL;
|
||||||
_cleanup_close_ int sysfd = -1;
|
_cleanup_close_ int sysfd = -1;
|
||||||
_cleanup_closedir_ DIR *proc = NULL;
|
_cleanup_closedir_ DIR *proc = NULL;
|
||||||
|
_cleanup_fclose_ FILE *of = NULL;
|
||||||
|
double graph_start;
|
||||||
|
double log_start;
|
||||||
|
double interval;
|
||||||
|
struct ps_struct *ps_first;
|
||||||
struct sigaction sig = {
|
struct sigaction sig = {
|
||||||
.sa_handler = signal_handler,
|
.sa_handler = signal_handler,
|
||||||
};
|
};
|
||||||
@@ -323,7 +317,13 @@ int main(int argc, char *argv[]) {
|
|||||||
char datestr[200];
|
char datestr[200];
|
||||||
time_t t = 0;
|
time_t t = 0;
|
||||||
int r;
|
int r;
|
||||||
|
int pscount = 0;
|
||||||
|
int n_cpus = 0;
|
||||||
|
int overrun = 0;
|
||||||
|
int samples;
|
||||||
struct rlimit rlim;
|
struct rlimit rlim;
|
||||||
|
struct list_sample_data *head;
|
||||||
|
static struct list_sample_data *sampledata;
|
||||||
|
|
||||||
parse_conf();
|
parse_conf();
|
||||||
|
|
||||||
@@ -364,7 +364,18 @@ int main(int argc, char *argv[]) {
|
|||||||
|
|
||||||
interval = (1.0 / arg_hz) * 1000000000.0;
|
interval = (1.0 / arg_hz) * 1000000000.0;
|
||||||
|
|
||||||
log_uptime();
|
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) {
|
if (graph_start < 0.0) {
|
||||||
log_error("Failed to setup graph start time.\n\n"
|
log_error("Failed to setup graph start time.\n\n"
|
||||||
@@ -409,7 +420,7 @@ int main(int argc, char *argv[]) {
|
|||||||
|
|
||||||
/* wait for /proc to become available, discarding samples */
|
/* wait for /proc to become available, discarding samples */
|
||||||
if (proc) {
|
if (proc) {
|
||||||
r = log_sample(proc, samples, &sampledata);
|
r = log_sample(proc, samples, ps_first, &sampledata, &pscount, &n_cpus);
|
||||||
if (r < 0)
|
if (r < 0)
|
||||||
return EXIT_FAILURE;
|
return EXIT_FAILURE;
|
||||||
}
|
}
|
||||||
@@ -475,7 +486,18 @@ int main(int argc, char *argv[]) {
|
|||||||
return EXIT_FAILURE;
|
return EXIT_FAILURE;
|
||||||
}
|
}
|
||||||
|
|
||||||
r = svg_do(strna(build));
|
r = svg_do(of,
|
||||||
|
strna(build),
|
||||||
|
head,
|
||||||
|
ps_first,
|
||||||
|
samples,
|
||||||
|
pscount,
|
||||||
|
n_cpus,
|
||||||
|
graph_start,
|
||||||
|
log_start,
|
||||||
|
interval,
|
||||||
|
overrun);
|
||||||
|
|
||||||
if (r < 0) {
|
if (r < 0) {
|
||||||
log_error_errno(r, "Error generating svg file: %m\n");
|
log_error_errno(r, "Error generating svg file: %m\n");
|
||||||
return EXIT_FAILURE;
|
return EXIT_FAILURE;
|
||||||
@@ -485,9 +507,6 @@ int main(int argc, char *argv[]) {
|
|||||||
|
|
||||||
do_journal_append(output_file);
|
do_journal_append(output_file);
|
||||||
|
|
||||||
if (of)
|
|
||||||
fclose(of);
|
|
||||||
|
|
||||||
/* nitpic cleanups */
|
/* nitpic cleanups */
|
||||||
ps = ps_first->next_ps;
|
ps = ps_first->next_ps;
|
||||||
while (ps->next_ps) {
|
while (ps->next_ps) {
|
||||||
|
|||||||
@@ -103,14 +103,6 @@ struct ps_struct {
|
|||||||
struct ps_sched_struct *sample;
|
struct ps_sched_struct *sample;
|
||||||
};
|
};
|
||||||
|
|
||||||
extern int entropy_avail[];
|
|
||||||
|
|
||||||
extern double graph_start;
|
|
||||||
extern double log_start;
|
|
||||||
extern double sampletime[];
|
|
||||||
extern struct ps_struct *ps_first;
|
|
||||||
extern struct block_stat_struct blockstat[];
|
|
||||||
extern int pscount;
|
|
||||||
extern bool arg_relative;
|
extern bool arg_relative;
|
||||||
extern bool arg_filter;
|
extern bool arg_filter;
|
||||||
extern bool arg_show_cmdline;
|
extern bool arg_show_cmdline;
|
||||||
@@ -118,17 +110,11 @@ extern bool arg_show_cgroup;
|
|||||||
extern bool arg_pss;
|
extern bool arg_pss;
|
||||||
extern bool arg_entropy;
|
extern bool arg_entropy;
|
||||||
extern bool arg_percpu;
|
extern bool arg_percpu;
|
||||||
extern bool initcall;
|
extern bool arg_initcall;
|
||||||
extern int samples;
|
|
||||||
extern int cpus;
|
|
||||||
extern int arg_samples_len;
|
extern int arg_samples_len;
|
||||||
extern double arg_hz;
|
extern double arg_hz;
|
||||||
extern double arg_scale_x;
|
extern double arg_scale_x;
|
||||||
extern double arg_scale_y;
|
extern double arg_scale_y;
|
||||||
extern int overrun;
|
|
||||||
extern double interval;
|
|
||||||
|
|
||||||
extern char arg_output_path[PATH_MAX];
|
extern char arg_output_path[PATH_MAX];
|
||||||
extern char arg_init_path[PATH_MAX];
|
extern char arg_init_path[PATH_MAX];
|
||||||
|
|
||||||
extern FILE *of;
|
|
||||||
|
|||||||
+11
-23
@@ -54,24 +54,6 @@ double gettime_ns(void) {
|
|||||||
return (n.tv_sec + (n.tv_nsec / (double) NSEC_PER_SEC));
|
return (n.tv_sec + (n.tv_nsec / (double) NSEC_PER_SEC));
|
||||||
}
|
}
|
||||||
|
|
||||||
static double gettime_up(void) {
|
|
||||||
struct timespec n;
|
|
||||||
|
|
||||||
clock_gettime(CLOCK_BOOTTIME, &n);
|
|
||||||
return (n.tv_sec + (n.tv_nsec / (double) NSEC_PER_SEC));
|
|
||||||
}
|
|
||||||
|
|
||||||
void log_uptime(void) {
|
|
||||||
if (arg_relative)
|
|
||||||
graph_start = log_start = gettime_ns();
|
|
||||||
else {
|
|
||||||
double uptime = gettime_up();
|
|
||||||
|
|
||||||
log_start = gettime_ns();
|
|
||||||
graph_start = log_start - uptime;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static char *bufgetline(char *buf) {
|
static char *bufgetline(char *buf) {
|
||||||
char *c;
|
char *c;
|
||||||
|
|
||||||
@@ -105,7 +87,13 @@ static int pid_cmdline_strscpy(int procfd, char *buffer, size_t buf_len, int pid
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
int log_sample(DIR *proc, int sample, struct list_sample_data **ptr) {
|
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 vmstat = -1;
|
||||||
static int schedstat = -1;
|
static int schedstat = -1;
|
||||||
char buf[4096];
|
char buf[4096];
|
||||||
@@ -195,8 +183,8 @@ vmstat_next:
|
|||||||
sampledata->runtime[c] = atoll(rt);
|
sampledata->runtime[c] = atoll(rt);
|
||||||
sampledata->waittime[c] = atoll(wt);
|
sampledata->waittime[c] = atoll(wt);
|
||||||
|
|
||||||
if (c == cpus)
|
if (c == *cpus)
|
||||||
cpus = c + 1;
|
*cpus = c + 1;
|
||||||
}
|
}
|
||||||
schedstat_next:
|
schedstat_next:
|
||||||
m = bufgetline(m);
|
m = bufgetline(m);
|
||||||
@@ -263,7 +251,7 @@ schedstat_next:
|
|||||||
|
|
||||||
ps->sample->sampledata = sampledata;
|
ps->sample->sampledata = sampledata;
|
||||||
|
|
||||||
pscount++;
|
(*pscount)++;
|
||||||
|
|
||||||
/* mark our first sample */
|
/* mark our first sample */
|
||||||
ps->first = ps->last = ps->sample;
|
ps->first = ps->last = ps->sample;
|
||||||
@@ -480,7 +468,7 @@ schedstat_next:
|
|||||||
catch_rename:
|
catch_rename:
|
||||||
/* catch process rename, try to randomize time */
|
/* catch process rename, try to randomize time */
|
||||||
mod = (arg_hz < 4.0) ? 4.0 : (arg_hz / 4.0);
|
mod = (arg_hz < 4.0) ? 4.0 : (arg_hz / 4.0);
|
||||||
if (((samples - ps->pid) + pid) % (int)(mod) == 0) {
|
if (((sample - ps->pid) + pid) % (int)(mod) == 0) {
|
||||||
|
|
||||||
/* re-fetch name */
|
/* re-fetch name */
|
||||||
/* get name, start time */
|
/* get name, start time */
|
||||||
|
|||||||
@@ -29,4 +29,9 @@
|
|||||||
|
|
||||||
double gettime_ns(void);
|
double gettime_ns(void);
|
||||||
void log_uptime(void);
|
void log_uptime(void);
|
||||||
int log_sample(DIR *proc, int sample, struct list_sample_data **ptr);
|
int log_sample(DIR *proc,
|
||||||
|
int sample,
|
||||||
|
struct ps_struct *ps_first,
|
||||||
|
struct list_sample_data **ptr,
|
||||||
|
int *pscount,
|
||||||
|
int *cpus);
|
||||||
|
|||||||
+227
-219
@@ -44,10 +44,6 @@
|
|||||||
#define kb_to_graph(m) ((m) * arg_scale_y * 0.0001)
|
#define kb_to_graph(m) ((m) * arg_scale_y * 0.0001)
|
||||||
#define to_color(n) (192.0 - ((n) * 192.0))
|
#define to_color(n) (192.0 - ((n) * 192.0))
|
||||||
|
|
||||||
static char str[8092];
|
|
||||||
|
|
||||||
#define svg(a...) do { snprintf(str, 8092, ## a); fputs(str, of); fflush(of); } while (0)
|
|
||||||
|
|
||||||
static const char * const colorwheel[12] = {
|
static const char * const colorwheel[12] = {
|
||||||
"rgb(255,32,32)", // red
|
"rgb(255,32,32)", // red
|
||||||
"rgb(32,192,192)", // cyan
|
"rgb(32,192,192)", // cyan
|
||||||
@@ -72,9 +68,8 @@ static double ksize = 0;
|
|||||||
static double esize = 0;
|
static double esize = 0;
|
||||||
static struct list_sample_data *sampledata;
|
static struct list_sample_data *sampledata;
|
||||||
static struct list_sample_data *prev_sampledata;
|
static struct list_sample_data *prev_sampledata;
|
||||||
extern struct list_sample_data *head;
|
|
||||||
|
|
||||||
static void svg_header(void) {
|
static void svg_header(FILE *of, struct list_sample_data *head, double graph_start) {
|
||||||
double w;
|
double w;
|
||||||
double h;
|
double h;
|
||||||
struct list_sample_data *sampledata_last;
|
struct list_sample_data *sampledata_last;
|
||||||
@@ -97,60 +92,59 @@ static void svg_header(void) {
|
|||||||
+ (arg_pss ? (100.0 * arg_scale_y) + (arg_scale_y * 7.0) : 0.0) /* pss estimate */
|
+ (arg_pss ? (100.0 * arg_scale_y) + (arg_scale_y * 7.0) : 0.0) /* pss estimate */
|
||||||
+ psize + ksize + esize;
|
+ psize + ksize + esize;
|
||||||
|
|
||||||
svg("<?xml version=\"1.0\" standalone=\"no\"?>\n");
|
fprintf(of, "<?xml version=\"1.0\" standalone=\"no\"?>\n");
|
||||||
svg("<!DOCTYPE svg PUBLIC \"-//W3C//DTD SVG 1.1//EN\" ");
|
fprintf(of, "<!DOCTYPE svg PUBLIC \"-//W3C//DTD SVG 1.1//EN\" ");
|
||||||
svg("\"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd\">\n");
|
fprintf(of, "\"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd\">\n");
|
||||||
|
|
||||||
//svg("<g transform=\"translate(10,%d)\">\n", 1000 + 150 + (pcount * 20));
|
//fprintf(of, "<g transform=\"translate(10,%d)\">\n", 1000 + 150 + (pcount * 20));
|
||||||
svg("<svg width=\"%.0fpx\" height=\"%.0fpx\" version=\"1.1\" ",
|
fprintf(of, "<svg width=\"%.0fpx\" height=\"%.0fpx\" version=\"1.1\" ", w, h);
|
||||||
w, h);
|
fprintf(of, "xmlns=\"http://www.w3.org/2000/svg\">\n\n");
|
||||||
svg("xmlns=\"http://www.w3.org/2000/svg\">\n\n");
|
|
||||||
|
|
||||||
/* write some basic info as a comment, including some help */
|
/* write some basic info as a comment, including some help */
|
||||||
svg("<!-- This file is a bootchart SVG file. It is best rendered in a browser -->\n");
|
fprintf(of, "<!-- This file is a bootchart SVG file. It is best rendered in a browser -->\n");
|
||||||
svg("<!-- such as Chrome, Chromium, or Firefox. Other applications that -->\n");
|
fprintf(of, "<!-- such as Chrome, Chromium, or Firefox. Other applications that -->\n");
|
||||||
svg("<!-- render these files properly but more slowly are ImageMagick, gimp, -->\n");
|
fprintf(of, "<!-- render these files properly but more slowly are ImageMagick, gimp, -->\n");
|
||||||
svg("<!-- inkscape, etc. To display the files on your system, just point -->\n");
|
fprintf(of, "<!-- inkscape, etc. To display the files on your system, just point -->\n");
|
||||||
svg("<!-- your browser to file:///run/log/ and click. This bootchart was -->\n\n");
|
fprintf(of, "<!-- your browser to file:///run/log/ and click. This bootchart was -->\n\n");
|
||||||
|
|
||||||
svg("<!-- generated by bootchart version %s, running with options: -->\n", VERSION);
|
fprintf(of, "<!-- generated by bootchart version %s, running with options: -->\n", VERSION);
|
||||||
svg("<!-- hz=\"%f\" n=\"%d\" -->\n", arg_hz, arg_samples_len);
|
fprintf(of, "<!-- hz=\"%f\" n=\"%d\" -->\n", arg_hz, arg_samples_len);
|
||||||
svg("<!-- x=\"%f\" y=\"%f\" -->\n", arg_scale_x, arg_scale_y);
|
fprintf(of, "<!-- x=\"%f\" y=\"%f\" -->\n", arg_scale_x, arg_scale_y);
|
||||||
svg("<!-- rel=\"%d\" f=\"%d\" -->\n", arg_relative, arg_filter);
|
fprintf(of, "<!-- rel=\"%d\" f=\"%d\" -->\n", arg_relative, arg_filter);
|
||||||
svg("<!-- p=\"%d\" e=\"%d\" -->\n", arg_pss, arg_entropy);
|
fprintf(of, "<!-- p=\"%d\" e=\"%d\" -->\n", arg_pss, arg_entropy);
|
||||||
svg("<!-- o=\"%s\" i=\"%s\" -->\n\n", arg_output_path, arg_init_path);
|
fprintf(of, "<!-- o=\"%s\" i=\"%s\" -->\n\n", arg_output_path, arg_init_path);
|
||||||
|
|
||||||
/* style sheet */
|
/* style sheet */
|
||||||
svg("<defs>\n <style type=\"text/css\">\n <![CDATA[\n");
|
fprintf(of, "<defs>\n <style type=\"text/css\">\n <![CDATA[\n");
|
||||||
|
|
||||||
svg(" rect { stroke-width: 1; }\n");
|
fprintf(of, " rect { stroke-width: 1; }\n");
|
||||||
svg(" rect.bg { fill: rgb(255,255,255); }\n");
|
fprintf(of, " rect.bg { fill: rgb(255,255,255); }\n");
|
||||||
svg(" rect.cpu { fill: rgb(64,64,240); stroke-width: 0; fill-opacity: 0.7; }\n");
|
fprintf(of, " rect.cpu { fill: rgb(64,64,240); stroke-width: 0; fill-opacity: 0.7; }\n");
|
||||||
svg(" rect.wait { fill: rgb(240,240,0); 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");
|
||||||
svg(" rect.bi { fill: rgb(240,128,128); 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");
|
||||||
svg(" rect.bo { fill: rgb(192,64,64); 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");
|
||||||
svg(" rect.ps { fill: rgb(192,192,192); stroke: rgb(128,128,128); fill-opacity: 0.7; }\n");
|
fprintf(of, " rect.ps { fill: rgb(192,192,192); stroke: rgb(128,128,128); fill-opacity: 0.7; }\n");
|
||||||
svg(" rect.krnl { fill: rgb(240,240,0); 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");
|
||||||
svg(" rect.box { fill: rgb(240,240,240); stroke: rgb(192,192,192); }\n");
|
fprintf(of, " rect.box { fill: rgb(240,240,240); stroke: rgb(192,192,192); }\n");
|
||||||
svg(" rect.clrw { stroke-width: 0; fill-opacity: 0.7;}\n");
|
fprintf(of, " rect.clrw { stroke-width: 0; fill-opacity: 0.7;}\n");
|
||||||
svg(" line { stroke: rgb(64,64,64); stroke-width: 1; }\n");
|
fprintf(of, " line { stroke: rgb(64,64,64); stroke-width: 1; }\n");
|
||||||
svg("// line.sec1 { }\n");
|
fprintf(of, "// line.sec1 { }\n");
|
||||||
svg(" line.sec5 { stroke-width: 2; }\n");
|
fprintf(of, " line.sec5 { stroke-width: 2; }\n");
|
||||||
svg(" line.sec01 { stroke: rgb(224,224,224); stroke-width: 1; }\n");
|
fprintf(of, " line.sec01 { stroke: rgb(224,224,224); stroke-width: 1; }\n");
|
||||||
svg(" line.dot { stroke-dasharray: 2 4; }\n");
|
fprintf(of, " line.dot { stroke-dasharray: 2 4; }\n");
|
||||||
svg(" line.idle { stroke: rgb(64,64,64); stroke-dasharray: 10 6; stroke-opacity: 0.7; }\n");
|
fprintf(of, " line.idle { stroke: rgb(64,64,64); stroke-dasharray: 10 6; stroke-opacity: 0.7; }\n");
|
||||||
|
|
||||||
svg(" .run { font-size: 8; font-style: italic; }\n");
|
fprintf(of, " .run { font-size: 8; font-style: italic; }\n");
|
||||||
svg(" text { font-family: Verdana, Helvetica; font-size: 10; }\n");
|
fprintf(of, " text { font-family: Verdana, Helvetica; font-size: 10; }\n");
|
||||||
svg(" text.sec { font-size: 8; }\n");
|
fprintf(of, " text.sec { font-size: 8; }\n");
|
||||||
svg(" text.t1 { font-size: 24; }\n");
|
fprintf(of, " text.t1 { font-size: 24; }\n");
|
||||||
svg(" text.t2 { font-size: 12; }\n");
|
fprintf(of, " text.t2 { font-size: 12; }\n");
|
||||||
svg(" text.idle { font-size: 18; }\n");
|
fprintf(of, " text.idle { font-size: 18; }\n");
|
||||||
|
|
||||||
svg(" ]]>\n </style>\n</defs>\n\n");
|
fprintf(of, " ]]>\n </style>\n</defs>\n\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
static int svg_title(const char *build) {
|
static int svg_title(FILE *of, const char *build, int pscount, double log_start, int overrun) {
|
||||||
_cleanup_free_ char *cmdline = NULL;
|
_cleanup_free_ char *cmdline = NULL;
|
||||||
_cleanup_free_ char *model = NULL;
|
_cleanup_free_ char *model = NULL;
|
||||||
_cleanup_free_ char *buf = NULL;
|
_cleanup_free_ char *buf = NULL;
|
||||||
@@ -179,10 +173,8 @@ static int svg_title(const char *build) {
|
|||||||
snprintf(filename, sizeof(filename), "/sys/block/%s/device/model", rootbdev);
|
snprintf(filename, sizeof(filename), "/sys/block/%s/device/model", rootbdev);
|
||||||
|
|
||||||
r = read_one_line_file(filename, &model);
|
r = read_one_line_file(filename, &model);
|
||||||
if (r < 0) {
|
if (r < 0)
|
||||||
log_error("Error reading disk model for %s: %m\n", rootbdev);
|
log_warning("Error reading disk model for %s: %m\n", rootbdev);
|
||||||
return r;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* various utsname parameters */
|
/* various utsname parameters */
|
||||||
@@ -215,33 +207,30 @@ static int svg_title(const char *build) {
|
|||||||
if (c)
|
if (c)
|
||||||
*c = '\0';
|
*c = '\0';
|
||||||
|
|
||||||
svg("<text class=\"t1\" x=\"0\" y=\"30\">Bootchart for %s - %s</text>\n",
|
fprintf(of, "<text class=\"t1\" x=\"0\" y=\"30\">Bootchart for %s - %s</text>\n",
|
||||||
uts.nodename, date);
|
uts.nodename, date);
|
||||||
svg("<text class=\"t2\" x=\"20\" y=\"50\">System: %s %s %s %s</text>\n",
|
fprintf(of, "<text class=\"t2\" x=\"20\" y=\"50\">System: %s %s %s %s</text>\n",
|
||||||
uts.sysname, uts.release, uts.version, uts.machine);
|
uts.sysname, uts.release, uts.version, uts.machine);
|
||||||
svg("<text class=\"t2\" x=\"20\" y=\"65\">CPU: %s</text>\n",
|
fprintf(of, "<text class=\"t2\" x=\"20\" y=\"65\">CPU: %s</text>\n", cpu);
|
||||||
cpu);
|
fprintf(of, "<text class=\"t2\" x=\"20\" y=\"80\">Disk: %s</text>\n", model);
|
||||||
svg("<text class=\"t2\" x=\"20\" y=\"80\">Disk: %s</text>\n",
|
fprintf(of, "<text class=\"t2\" x=\"20\" y=\"95\">Boot options: %s</text>\n", cmdline);
|
||||||
model);
|
fprintf(of, "<text class=\"t2\" x=\"20\" y=\"110\">Build: %s</text>\n", build);
|
||||||
svg("<text class=\"t2\" x=\"20\" y=\"95\">Boot options: %s</text>\n",
|
fprintf(of, "<text class=\"t2\" x=\"20\" y=\"125\">Log start time: %.03fs</text>\n", log_start);
|
||||||
cmdline);
|
fprintf(of, "<text class=\"t2\" x=\"20\" y=\"140\">Idle time: ");
|
||||||
svg("<text class=\"t2\" x=\"20\" y=\"110\">Build: %s</text>\n",
|
|
||||||
build);
|
|
||||||
svg("<text class=\"t2\" x=\"20\" y=\"125\">Log start time: %.03fs</text>\n", log_start);
|
|
||||||
svg("<text class=\"t2\" x=\"20\" y=\"140\">Idle time: ");
|
|
||||||
|
|
||||||
if (idletime >= 0.0)
|
if (idletime >= 0.0)
|
||||||
svg("%.03fs", idletime);
|
fprintf(of, "%.03fs", idletime);
|
||||||
else
|
else
|
||||||
svg("Not detected");
|
fprintf(of, "Not detected");
|
||||||
svg("</text>\n");
|
|
||||||
svg("<text class=\"sec\" x=\"20\" y=\"155\">Graph data: %.03f samples/sec, recorded %i total, dropped %i samples, %i processes, %i filtered</text>\n",
|
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);
|
arg_hz, arg_samples_len, overrun, pscount, pfiltered);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void svg_graph_box(int height) {
|
static void svg_graph_box(FILE *of, struct list_sample_data *head, int height, double graph_start) {
|
||||||
double d = 0.0;
|
double d = 0.0;
|
||||||
int i = 0;
|
int i = 0;
|
||||||
double finalsample = 0.0;
|
double finalsample = 0.0;
|
||||||
@@ -255,7 +244,7 @@ static void svg_graph_box(int height) {
|
|||||||
finalsample = sampledata_last->sampletime;
|
finalsample = sampledata_last->sampletime;
|
||||||
|
|
||||||
/* outside box, fill */
|
/* outside box, fill */
|
||||||
svg("<rect class=\"box\" x=\"%.03f\" y=\"0\" width=\"%.03f\" height=\"%.03f\" />\n",
|
fprintf(of, "<rect class=\"box\" x=\"%.03f\" y=\"0\" width=\"%.03f\" height=\"%.03f\" />\n",
|
||||||
time_to_graph(0.0),
|
time_to_graph(0.0),
|
||||||
time_to_graph(finalsample - graph_start),
|
time_to_graph(finalsample - graph_start),
|
||||||
ps_to_graph(height));
|
ps_to_graph(height));
|
||||||
@@ -264,27 +253,26 @@ static void svg_graph_box(int height) {
|
|||||||
d += (arg_scale_x < 2.0 ? 60.0 : arg_scale_x < 10.0 ? 1.0 : 0.1)) {
|
d += (arg_scale_x < 2.0 ? 60.0 : arg_scale_x < 10.0 ? 1.0 : 0.1)) {
|
||||||
/* lines for each second */
|
/* lines for each second */
|
||||||
if (i % 50 == 0)
|
if (i % 50 == 0)
|
||||||
svg(" <line class=\"sec5\" x1=\"%.03f\" y1=\"0\" x2=\"%.03f\" y2=\"%.03f\" />\n",
|
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),
|
||||||
time_to_graph(d - graph_start),
|
time_to_graph(d - graph_start),
|
||||||
ps_to_graph(height));
|
ps_to_graph(height));
|
||||||
else if (i % 10 == 0)
|
else if (i % 10 == 0)
|
||||||
svg(" <line class=\"sec1\" x1=\"%.03f\" y1=\"0\" x2=\"%.03f\" y2=\"%.03f\" />\n",
|
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),
|
||||||
time_to_graph(d - graph_start),
|
time_to_graph(d - graph_start),
|
||||||
ps_to_graph(height));
|
ps_to_graph(height));
|
||||||
else
|
else
|
||||||
svg(" <line class=\"sec01\" x1=\"%.03f\" y1=\"0\" x2=\"%.03f\" y2=\"%.03f\" />\n",
|
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),
|
||||||
time_to_graph(d - graph_start),
|
time_to_graph(d - graph_start),
|
||||||
ps_to_graph(height));
|
ps_to_graph(height));
|
||||||
|
|
||||||
/* time label */
|
/* time label */
|
||||||
if (i % 10 == 0)
|
if (i % 10 == 0)
|
||||||
svg(" <text class=\"sec\" x=\"%.03f\" y=\"%.03f\" >%.01fs</text>\n",
|
fprintf(of, " <text class=\"sec\" x=\"%.03f\" y=\"%.03f\" >%.01fs</text>\n",
|
||||||
time_to_graph(d - graph_start),
|
time_to_graph(d - graph_start),
|
||||||
-5.0,
|
-5.0, d - graph_start);
|
||||||
d - graph_start);
|
|
||||||
|
|
||||||
i++;
|
i++;
|
||||||
}
|
}
|
||||||
@@ -305,7 +293,10 @@ static char* xml_comment_encode(const char* name) {
|
|||||||
return enc_name;
|
return enc_name;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void svg_pss_graph(void) {
|
static void svg_pss_graph(FILE *of,
|
||||||
|
struct list_sample_data *head,
|
||||||
|
struct ps_struct *ps_first,
|
||||||
|
double graph_start) {
|
||||||
struct ps_struct *ps;
|
struct ps_struct *ps;
|
||||||
int i;
|
int i;
|
||||||
struct list_sample_data *sampledata_last;
|
struct list_sample_data *sampledata_last;
|
||||||
@@ -316,24 +307,24 @@ static void svg_pss_graph(void) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
svg("\n\n<!-- Pss memory size graph -->\n");
|
fprintf(of, "\n\n<!-- Pss memory size graph -->\n");
|
||||||
|
|
||||||
svg("\n <text class=\"t2\" x=\"5\" y=\"-15\">Memory allocation - Pss</text>\n");
|
fprintf(of, "\n <text class=\"t2\" x=\"5\" y=\"-15\">Memory allocation - Pss</text>\n");
|
||||||
|
|
||||||
/* vsize 1000 == 1000mb */
|
/* vsize 1000 == 1000mb */
|
||||||
svg_graph_box(100);
|
svg_graph_box(of, head, 100, graph_start);
|
||||||
/* draw some hlines for usable memory sizes */
|
/* draw some hlines for usable memory sizes */
|
||||||
for (i = 100000; i < 1000000; i += 100000) {
|
for (i = 100000; i < 1000000; i += 100000) {
|
||||||
svg(" <line class=\"sec01\" x1=\"%.03f\" y1=\"%.0f\" x2=\"%.03f\" y2=\"%.0f\"/>\n",
|
fprintf(of, " <line class=\"sec01\" x1=\"%.03f\" y1=\"%.0f\" x2=\"%.03f\" y2=\"%.0f\"/>\n",
|
||||||
time_to_graph(.0),
|
time_to_graph(.0),
|
||||||
kb_to_graph(i),
|
kb_to_graph(i),
|
||||||
time_to_graph(sampledata_last->sampletime - graph_start),
|
time_to_graph(sampledata_last->sampletime - graph_start),
|
||||||
kb_to_graph(i));
|
kb_to_graph(i));
|
||||||
svg(" <text class=\"sec\" x=\"%.03f\" y=\"%.0f\">%dM</text>\n",
|
fprintf(of, " <text class=\"sec\" x=\"%.03f\" y=\"%.0f\">%dM</text>\n",
|
||||||
time_to_graph(sampledata_last->sampletime - graph_start) + 5,
|
time_to_graph(sampledata_last->sampletime - graph_start) + 5,
|
||||||
kb_to_graph(i), (1000000 - i) / 1000);
|
kb_to_graph(i), (1000000 - i) / 1000);
|
||||||
}
|
}
|
||||||
svg("\n");
|
fprintf(of, "\n");
|
||||||
|
|
||||||
/* now plot the graph itself */
|
/* now plot the graph itself */
|
||||||
i = 1;
|
i = 1;
|
||||||
@@ -372,7 +363,7 @@ static void svg_pss_graph(void) {
|
|||||||
top += ps->sample->pss;
|
top += ps->sample->pss;
|
||||||
}
|
}
|
||||||
|
|
||||||
svg(" <rect class=\"clrw\" style=\"fill: %s\" x=\"%.03f\" y=\"%.03f\" width=\"%.03f\" height=\"%.03f\" />\n",
|
fprintf(of, " <rect class=\"clrw\" style=\"fill: %s\" x=\"%.03f\" y=\"%.03f\" width=\"%.03f\" height=\"%.03f\" />\n",
|
||||||
"rgb(64,64,64)",
|
"rgb(64,64,64)",
|
||||||
time_to_graph(prev_sampledata->sampletime - graph_start),
|
time_to_graph(prev_sampledata->sampletime - graph_start),
|
||||||
kb_to_graph(1000000.0 - top),
|
kb_to_graph(1000000.0 - top),
|
||||||
@@ -396,7 +387,7 @@ static void svg_pss_graph(void) {
|
|||||||
if (ps->sample->sampledata == sampledata) {
|
if (ps->sample->sampledata == sampledata) {
|
||||||
if (ps->sample->pss > (100 * arg_scale_y)) {
|
if (ps->sample->pss > (100 * arg_scale_y)) {
|
||||||
top = bottom + ps->sample->pss;
|
top = bottom + ps->sample->pss;
|
||||||
svg(" <rect class=\"clrw\" style=\"fill: %s\" x=\"%.03f\" y=\"%.03f\" width=\"%.03f\" height=\"%.03f\" />\n",
|
fprintf(of, " <rect class=\"clrw\" style=\"fill: %s\" x=\"%.03f\" y=\"%.03f\" width=\"%.03f\" height=\"%.03f\" />\n",
|
||||||
colorwheel[ps->pid % 12],
|
colorwheel[ps->pid % 12],
|
||||||
time_to_graph(prev_sampledata->sampletime - graph_start),
|
time_to_graph(prev_sampledata->sampletime - graph_start),
|
||||||
kb_to_graph(1000000.0 - top),
|
kb_to_graph(1000000.0 - top),
|
||||||
@@ -412,7 +403,7 @@ static void svg_pss_graph(void) {
|
|||||||
ps->sample = cross_place;
|
ps->sample = cross_place;
|
||||||
if (ps->sample->pss > (100 * arg_scale_y)) {
|
if (ps->sample->pss > (100 * arg_scale_y)) {
|
||||||
top = bottom + ps->sample->pss;
|
top = bottom + ps->sample->pss;
|
||||||
svg(" <rect class=\"clrw\" style=\"fill: %s\" x=\"%.03f\" y=\"%.03f\" width=\"%.03f\" height=\"%.03f\" />\n",
|
fprintf(of, " <rect class=\"clrw\" style=\"fill: %s\" x=\"%.03f\" y=\"%.03f\" width=\"%.03f\" height=\"%.03f\" />\n",
|
||||||
colorwheel[ps->pid % 12],
|
colorwheel[ps->pid % 12],
|
||||||
time_to_graph(prev_sampledata->sampletime - graph_start),
|
time_to_graph(prev_sampledata->sampletime - graph_start),
|
||||||
kb_to_graph(1000000.0 - top),
|
kb_to_graph(1000000.0 - top),
|
||||||
@@ -479,7 +470,7 @@ static void svg_pss_graph(void) {
|
|||||||
top = bottom + ps->sample->pss;
|
top = bottom + ps->sample->pss;
|
||||||
/* draw a label with the process / PID */
|
/* draw a label with the process / PID */
|
||||||
if ((i == 1) || (prev_sample->pss <= (100 * arg_scale_y)))
|
if ((i == 1) || (prev_sample->pss <= (100 * arg_scale_y)))
|
||||||
svg(" <text x=\"%.03f\" y=\"%.03f\"><![CDATA[%s]]> [%i]</text>\n",
|
fprintf(of, " <text x=\"%.03f\" y=\"%.03f\"><![CDATA[%s]]> [%i]</text>\n",
|
||||||
time_to_graph(sampledata->sampletime - graph_start),
|
time_to_graph(sampledata->sampletime - graph_start),
|
||||||
kb_to_graph(1000000.0 - bottom - ((top - bottom) / 2)),
|
kb_to_graph(1000000.0 - bottom - ((top - bottom) / 2)),
|
||||||
ps->name,
|
ps->name,
|
||||||
@@ -497,11 +488,10 @@ static void svg_pss_graph(void) {
|
|||||||
top = bottom + ps->sample->pss;
|
top = bottom + ps->sample->pss;
|
||||||
/* draw a label with the process / PID */
|
/* draw a label with the process / PID */
|
||||||
if ((i == 1) || (prev_sample->pss <= (100 * arg_scale_y)))
|
if ((i == 1) || (prev_sample->pss <= (100 * arg_scale_y)))
|
||||||
svg(" <text x=\"%.03f\" y=\"%.03f\"><![CDATA[%s]]> [%i]</text>\n",
|
fprintf(of, " <text x=\"%.03f\" y=\"%.03f\"><![CDATA[%s]]> [%i]</text>\n",
|
||||||
time_to_graph(sampledata->sampletime - graph_start),
|
time_to_graph(sampledata->sampletime - graph_start),
|
||||||
kb_to_graph(1000000.0 - bottom - ((top - bottom) / 2)),
|
kb_to_graph(1000000.0 - bottom - ((top - bottom) / 2)),
|
||||||
ps->name,
|
ps->name, ps->pid);
|
||||||
ps->pid);
|
|
||||||
bottom = top;
|
bottom = top;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -509,7 +499,7 @@ static void svg_pss_graph(void) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* debug output - full data dump */
|
/* debug output - full data dump */
|
||||||
svg("\n\n<!-- PSS map - csv format -->\n");
|
fprintf(of, "\n\n<!-- PSS map - csv format -->\n");
|
||||||
ps = ps_first;
|
ps = ps_first;
|
||||||
while (ps->next_ps) {
|
while (ps->next_ps) {
|
||||||
_cleanup_free_ char *enc_name = NULL;
|
_cleanup_free_ char *enc_name = NULL;
|
||||||
@@ -521,19 +511,24 @@ static void svg_pss_graph(void) {
|
|||||||
if (!enc_name)
|
if (!enc_name)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
svg("<!-- %s [%d] pss=", enc_name, ps->pid);
|
fprintf(of, "<!-- %s [%d] pss=", enc_name, ps->pid);
|
||||||
|
|
||||||
ps->sample = ps->first;
|
ps->sample = ps->first;
|
||||||
while (ps->sample->next) {
|
while (ps->sample->next) {
|
||||||
ps->sample = ps->sample->next;
|
ps->sample = ps->sample->next;
|
||||||
svg("%d," , ps->sample->pss);
|
fprintf(of, "%d," , ps->sample->pss);
|
||||||
}
|
}
|
||||||
svg(" -->\n");
|
fprintf(of, " -->\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void svg_io_bi_bar(void) {
|
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 max = 0.0;
|
||||||
double range;
|
double range;
|
||||||
int max_here = 0;
|
int max_here = 0;
|
||||||
@@ -542,9 +537,8 @@ static void svg_io_bi_bar(void) {
|
|||||||
struct list_sample_data *start_sampledata;
|
struct list_sample_data *start_sampledata;
|
||||||
struct list_sample_data *stop_sampledata;
|
struct list_sample_data *stop_sampledata;
|
||||||
|
|
||||||
svg("<!-- IO utilization graph - In -->\n");
|
fprintf(of, "<!-- IO utilization graph - In -->\n");
|
||||||
|
fprintf(of, "<text class=\"t2\" x=\"5\" y=\"-15\">IO utilization - read</text>\n");
|
||||||
svg("<text class=\"t2\" x=\"5\" y=\"-15\">IO utilization - read</text>\n");
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* calculate rounding range
|
* calculate rounding range
|
||||||
@@ -558,7 +552,7 @@ static void svg_io_bi_bar(void) {
|
|||||||
range = 2.0; /* no smoothing */
|
range = 2.0; /* no smoothing */
|
||||||
|
|
||||||
/* surrounding box */
|
/* surrounding box */
|
||||||
svg_graph_box(5);
|
svg_graph_box(of, head, 5, graph_start);
|
||||||
|
|
||||||
/* find the max IO first */
|
/* find the max IO first */
|
||||||
i = 1;
|
i = 1;
|
||||||
@@ -569,7 +563,7 @@ static void svg_io_bi_bar(void) {
|
|||||||
double tot;
|
double tot;
|
||||||
|
|
||||||
start = MAX(i - ((range / 2) - 1), 0);
|
start = MAX(i - ((range / 2) - 1), 0);
|
||||||
stop = MIN(i + (range / 2), samples - 1);
|
stop = MIN(i + (range / 2), n_samples - 1);
|
||||||
diff = (stop - start);
|
diff = (stop - start);
|
||||||
|
|
||||||
start_sampledata = sampledata;
|
start_sampledata = sampledata;
|
||||||
@@ -608,7 +602,7 @@ static void svg_io_bi_bar(void) {
|
|||||||
double pbi = 0;
|
double pbi = 0;
|
||||||
|
|
||||||
start = MAX(i - ((range / 2) - 1), 0);
|
start = MAX(i - ((range / 2) - 1), 0);
|
||||||
stop = MIN(i + (range / 2), samples);
|
stop = MIN(i + (range / 2), n_samples);
|
||||||
diff = (stop - start);
|
diff = (stop - start);
|
||||||
|
|
||||||
start_sampledata = sampledata;
|
start_sampledata = sampledata;
|
||||||
@@ -626,7 +620,7 @@ static void svg_io_bi_bar(void) {
|
|||||||
pbi = tot / max;
|
pbi = tot / max;
|
||||||
|
|
||||||
if (pbi > 0.001)
|
if (pbi > 0.001)
|
||||||
svg("<rect class=\"bi\" x=\"%.03f\" y=\"%.03f\" width=\"%.03f\" height=\"%.03f\" />\n",
|
fprintf(of, "<rect class=\"bi\" x=\"%.03f\" y=\"%.03f\" width=\"%.03f\" height=\"%.03f\" />\n",
|
||||||
time_to_graph(prev_sampledata->sampletime - graph_start),
|
time_to_graph(prev_sampledata->sampletime - graph_start),
|
||||||
(arg_scale_y * 5) - (pbi * (arg_scale_y * 5)),
|
(arg_scale_y * 5) - (pbi * (arg_scale_y * 5)),
|
||||||
time_to_graph(sampledata->sampletime - prev_sampledata->sampletime),
|
time_to_graph(sampledata->sampletime - prev_sampledata->sampletime),
|
||||||
@@ -634,7 +628,7 @@ static void svg_io_bi_bar(void) {
|
|||||||
|
|
||||||
/* labels around highest value */
|
/* labels around highest value */
|
||||||
if (i == max_here) {
|
if (i == max_here) {
|
||||||
svg(" <text class=\"sec\" x=\"%.03f\" y=\"%.03f\">%0.2fmb/sec</text>\n",
|
fprintf(of, " <text class=\"sec\" x=\"%.03f\" y=\"%.03f\">%0.2fmb/sec</text>\n",
|
||||||
time_to_graph(sampledata->sampletime - graph_start) + 5,
|
time_to_graph(sampledata->sampletime - graph_start) + 5,
|
||||||
((arg_scale_y * 5) - (pbi * (arg_scale_y * 5))) + 15,
|
((arg_scale_y * 5) - (pbi * (arg_scale_y * 5))) + 15,
|
||||||
max / 1024.0 / (interval / 1000000000.0));
|
max / 1024.0 / (interval / 1000000000.0));
|
||||||
@@ -644,7 +638,11 @@ static void svg_io_bi_bar(void) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static void svg_io_bo_bar(void) {
|
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 max = 0.0;
|
||||||
double range;
|
double range;
|
||||||
int max_here = 0;
|
int max_here = 0;
|
||||||
@@ -653,9 +651,8 @@ static void svg_io_bo_bar(void) {
|
|||||||
struct list_sample_data *start_sampledata;
|
struct list_sample_data *start_sampledata;
|
||||||
struct list_sample_data *stop_sampledata;
|
struct list_sample_data *stop_sampledata;
|
||||||
|
|
||||||
svg("<!-- IO utilization graph - out -->\n");
|
fprintf(of, "<!-- IO utilization graph - out -->\n");
|
||||||
|
fprintf(of, "<text class=\"t2\" x=\"5\" y=\"-15\">IO utilization - write</text>\n");
|
||||||
svg("<text class=\"t2\" x=\"5\" y=\"-15\">IO utilization - write</text>\n");
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* calculate rounding range
|
* calculate rounding range
|
||||||
@@ -669,7 +666,7 @@ static void svg_io_bo_bar(void) {
|
|||||||
range = 2.0; /* no smoothing */
|
range = 2.0; /* no smoothing */
|
||||||
|
|
||||||
/* surrounding box */
|
/* surrounding box */
|
||||||
svg_graph_box(5);
|
svg_graph_box(of, head, 5, graph_start);
|
||||||
|
|
||||||
/* find the max IO first */
|
/* find the max IO first */
|
||||||
i = 0;
|
i = 0;
|
||||||
@@ -680,7 +677,7 @@ static void svg_io_bo_bar(void) {
|
|||||||
double tot;
|
double tot;
|
||||||
|
|
||||||
start = MAX(i - ((range / 2) - 1), 0);
|
start = MAX(i - ((range / 2) - 1), 0);
|
||||||
stop = MIN(i + (range / 2), samples - 1);
|
stop = MIN(i + (range / 2), n_samples - 1);
|
||||||
diff = (stop - start);
|
diff = (stop - start);
|
||||||
|
|
||||||
start_sampledata = sampledata;
|
start_sampledata = sampledata;
|
||||||
@@ -717,7 +714,7 @@ static void svg_io_bo_bar(void) {
|
|||||||
pbo = 0;
|
pbo = 0;
|
||||||
|
|
||||||
start = MAX(i - ((range / 2) - 1), 0);
|
start = MAX(i - ((range / 2) - 1), 0);
|
||||||
stop = MIN(i + (range / 2), samples);
|
stop = MIN(i + (range / 2), n_samples);
|
||||||
diff = (stop - start);
|
diff = (stop - start);
|
||||||
|
|
||||||
start_sampledata = sampledata;
|
start_sampledata = sampledata;
|
||||||
@@ -735,7 +732,7 @@ static void svg_io_bo_bar(void) {
|
|||||||
pbo = tot / max;
|
pbo = tot / max;
|
||||||
|
|
||||||
if (pbo > 0.001)
|
if (pbo > 0.001)
|
||||||
svg("<rect class=\"bo\" x=\"%.03f\" y=\"%.03f\" width=\"%.03f\" height=\"%.03f\" />\n",
|
fprintf(of, "<rect class=\"bo\" x=\"%.03f\" y=\"%.03f\" width=\"%.03f\" height=\"%.03f\" />\n",
|
||||||
time_to_graph(prev_sampledata->sampletime - graph_start),
|
time_to_graph(prev_sampledata->sampletime - graph_start),
|
||||||
(arg_scale_y * 5) - (pbo * (arg_scale_y * 5)),
|
(arg_scale_y * 5) - (pbo * (arg_scale_y * 5)),
|
||||||
time_to_graph(sampledata->sampletime - prev_sampledata->sampletime),
|
time_to_graph(sampledata->sampletime - prev_sampledata->sampletime),
|
||||||
@@ -743,7 +740,7 @@ static void svg_io_bo_bar(void) {
|
|||||||
|
|
||||||
/* labels around highest bo value */
|
/* labels around highest bo value */
|
||||||
if (i == max_here) {
|
if (i == max_here) {
|
||||||
svg(" <text class=\"sec\" x=\"%.03f\" y=\"%.03f\">%0.2fmb/sec</text>\n",
|
fprintf(of, " <text class=\"sec\" x=\"%.03f\" y=\"%.03f\">%0.2fmb/sec</text>\n",
|
||||||
time_to_graph(sampledata->sampletime - graph_start) + 5,
|
time_to_graph(sampledata->sampletime - graph_start) + 5,
|
||||||
((arg_scale_y * 5) - (pbo * (arg_scale_y * 5))),
|
((arg_scale_y * 5) - (pbo * (arg_scale_y * 5))),
|
||||||
max / 1024.0 / (interval / 1000000000.0));
|
max / 1024.0 / (interval / 1000000000.0));
|
||||||
@@ -753,16 +750,16 @@ static void svg_io_bo_bar(void) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static void svg_cpu_bar(int cpu_num) {
|
static void svg_cpu_bar(FILE *of, struct list_sample_data *head, int n_cpus, int cpu_num, double graph_start) {
|
||||||
|
|
||||||
svg("<!-- CPU utilization graph -->\n");
|
fprintf(of, "<!-- CPU utilization graph -->\n");
|
||||||
|
|
||||||
if (cpu_num < 0)
|
if (cpu_num < 0)
|
||||||
svg("<text class=\"t2\" x=\"5\" y=\"-15\">CPU[overall] utilization</text>\n");
|
fprintf(of, "<text class=\"t2\" x=\"5\" y=\"-15\">CPU[overall] utilization</text>\n");
|
||||||
else
|
else
|
||||||
svg("<text class=\"t2\" x=\"5\" y=\"-15\">CPU[%d] utilization</text>\n", cpu_num);
|
fprintf(of, "<text class=\"t2\" x=\"5\" y=\"-15\">CPU[%d] utilization</text>\n", cpu_num);
|
||||||
/* surrounding box */
|
/* surrounding box */
|
||||||
svg_graph_box(5);
|
svg_graph_box(of, head, 5, graph_start);
|
||||||
|
|
||||||
/* bars for each sample, proportional to the CPU util. */
|
/* bars for each sample, proportional to the CPU util. */
|
||||||
prev_sampledata = head;
|
prev_sampledata = head;
|
||||||
@@ -774,7 +771,7 @@ static void svg_cpu_bar(int cpu_num) {
|
|||||||
ptrt = trt = 0.0;
|
ptrt = trt = 0.0;
|
||||||
|
|
||||||
if (cpu_num < 0)
|
if (cpu_num < 0)
|
||||||
for (c = 0; c < cpus; c++)
|
for (c = 0; c < n_cpus; c++)
|
||||||
trt += sampledata->runtime[c] - prev_sampledata->runtime[c];
|
trt += sampledata->runtime[c] - prev_sampledata->runtime[c];
|
||||||
else
|
else
|
||||||
trt = sampledata->runtime[cpu_num] - prev_sampledata->runtime[cpu_num];
|
trt = sampledata->runtime[cpu_num] - prev_sampledata->runtime[cpu_num];
|
||||||
@@ -782,7 +779,7 @@ static void svg_cpu_bar(int cpu_num) {
|
|||||||
trt = trt / 1000000000.0;
|
trt = trt / 1000000000.0;
|
||||||
|
|
||||||
if (cpu_num < 0)
|
if (cpu_num < 0)
|
||||||
trt = trt / (double)cpus;
|
trt = trt / (double)n_cpus;
|
||||||
|
|
||||||
if (trt > 0.0)
|
if (trt > 0.0)
|
||||||
ptrt = trt / (sampledata->sampletime - prev_sampledata->sampletime);
|
ptrt = trt / (sampledata->sampletime - prev_sampledata->sampletime);
|
||||||
@@ -791,7 +788,7 @@ static void svg_cpu_bar(int cpu_num) {
|
|||||||
ptrt = 1.0;
|
ptrt = 1.0;
|
||||||
|
|
||||||
if (ptrt > 0.001) {
|
if (ptrt > 0.001) {
|
||||||
svg("<rect class=\"cpu\" x=\"%.03f\" y=\"%.03f\" width=\"%.03f\" height=\"%.03f\" />\n",
|
fprintf(of, "<rect class=\"cpu\" x=\"%.03f\" y=\"%.03f\" width=\"%.03f\" height=\"%.03f\" />\n",
|
||||||
time_to_graph(prev_sampledata->sampletime - graph_start),
|
time_to_graph(prev_sampledata->sampletime - graph_start),
|
||||||
(arg_scale_y * 5) - (ptrt * (arg_scale_y * 5)),
|
(arg_scale_y * 5) - (ptrt * (arg_scale_y * 5)),
|
||||||
time_to_graph(sampledata->sampletime - prev_sampledata->sampletime),
|
time_to_graph(sampledata->sampletime - prev_sampledata->sampletime),
|
||||||
@@ -801,17 +798,17 @@ static void svg_cpu_bar(int cpu_num) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static void svg_wait_bar(int cpu_num) {
|
static void svg_wait_bar(FILE *of, struct list_sample_data *head, int n_cpus, int cpu_num, double graph_start) {
|
||||||
|
|
||||||
svg("<!-- Wait time aggregation box -->\n");
|
fprintf(of, "<!-- Wait time aggregation box -->\n");
|
||||||
|
|
||||||
if (cpu_num < 0)
|
if (cpu_num < 0)
|
||||||
svg("<text class=\"t2\" x=\"5\" y=\"-15\">CPU[overall] wait</text>\n");
|
fprintf(of, "<text class=\"t2\" x=\"5\" y=\"-15\">CPU[overall] wait</text>\n");
|
||||||
else
|
else
|
||||||
svg("<text class=\"t2\" x=\"5\" y=\"-15\">CPU[%d] wait</text>\n", cpu_num);
|
fprintf(of, "<text class=\"t2\" x=\"5\" y=\"-15\">CPU[%d] wait</text>\n", cpu_num);
|
||||||
|
|
||||||
/* surrounding box */
|
/* surrounding box */
|
||||||
svg_graph_box(5);
|
svg_graph_box(of, head, 5, graph_start);
|
||||||
|
|
||||||
/* bars for each sample, proportional to the CPU util. */
|
/* bars for each sample, proportional to the CPU util. */
|
||||||
prev_sampledata = head;
|
prev_sampledata = head;
|
||||||
@@ -823,7 +820,7 @@ static void svg_wait_bar(int cpu_num) {
|
|||||||
ptwt = twt = 0.0;
|
ptwt = twt = 0.0;
|
||||||
|
|
||||||
if (cpu_num < 0)
|
if (cpu_num < 0)
|
||||||
for (c = 0; c < cpus; c++)
|
for (c = 0; c < n_cpus; c++)
|
||||||
twt += sampledata->waittime[c] - prev_sampledata->waittime[c];
|
twt += sampledata->waittime[c] - prev_sampledata->waittime[c];
|
||||||
else
|
else
|
||||||
twt = sampledata->waittime[cpu_num] - prev_sampledata->waittime[cpu_num];
|
twt = sampledata->waittime[cpu_num] - prev_sampledata->waittime[cpu_num];
|
||||||
@@ -831,7 +828,7 @@ static void svg_wait_bar(int cpu_num) {
|
|||||||
twt = twt / 1000000000.0;
|
twt = twt / 1000000000.0;
|
||||||
|
|
||||||
if (cpu_num < 0)
|
if (cpu_num < 0)
|
||||||
twt = twt / (double)cpus;
|
twt = twt / (double)n_cpus;
|
||||||
|
|
||||||
if (twt > 0.0)
|
if (twt > 0.0)
|
||||||
ptwt = twt / (sampledata->sampletime - prev_sampledata->sampletime);
|
ptwt = twt / (sampledata->sampletime - prev_sampledata->sampletime);
|
||||||
@@ -840,7 +837,7 @@ static void svg_wait_bar(int cpu_num) {
|
|||||||
ptwt = 1.0;
|
ptwt = 1.0;
|
||||||
|
|
||||||
if (ptwt > 0.001) {
|
if (ptwt > 0.001) {
|
||||||
svg("<rect class=\"wait\" x=\"%.03f\" y=\"%.03f\" width=\"%.03f\" height=\"%.03f\" />\n",
|
fprintf(of, "<rect class=\"wait\" x=\"%.03f\" y=\"%.03f\" width=\"%.03f\" height=\"%.03f\" />\n",
|
||||||
time_to_graph(prev_sampledata->sampletime - graph_start),
|
time_to_graph(prev_sampledata->sampletime - graph_start),
|
||||||
((arg_scale_y * 5) - (ptwt * (arg_scale_y * 5))),
|
((arg_scale_y * 5) - (ptwt * (arg_scale_y * 5))),
|
||||||
time_to_graph(sampledata->sampletime - prev_sampledata->sampletime),
|
time_to_graph(sampledata->sampletime - prev_sampledata->sampletime),
|
||||||
@@ -850,19 +847,18 @@ static void svg_wait_bar(int cpu_num) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static void svg_entropy_bar(void) {
|
static void svg_entropy_bar(FILE *of, struct list_sample_data *head, double graph_start) {
|
||||||
|
|
||||||
svg("<!-- entropy pool graph -->\n");
|
fprintf(of, "<!-- entropy pool graph -->\n");
|
||||||
|
|
||||||
svg("<text class=\"t2\" x=\"5\" y=\"-15\">Entropy pool size</text>\n");
|
fprintf(of, "<text class=\"t2\" x=\"5\" y=\"-15\">Entropy pool size</text>\n");
|
||||||
/* surrounding box */
|
/* surrounding box */
|
||||||
svg_graph_box(5);
|
svg_graph_box(of, head, 5, graph_start);
|
||||||
|
|
||||||
/* bars for each sample, scale 0-4096 */
|
/* bars for each sample, scale 0-4096 */
|
||||||
prev_sampledata = head;
|
prev_sampledata = head;
|
||||||
LIST_FOREACH_BEFORE(link, sampledata, head) {
|
LIST_FOREACH_BEFORE(link, sampledata, head) {
|
||||||
/* svg("<!-- entropy %.03f %i -->\n", sampletime[i], entropy_avail[i]); */
|
fprintf(of, "<rect class=\"cpu\" x=\"%.03f\" y=\"%.03f\" width=\"%.03f\" height=\"%.03f\" />\n",
|
||||||
svg("<rect class=\"cpu\" x=\"%.03f\" y=\"%.03f\" width=\"%.03f\" height=\"%.03f\" />\n",
|
|
||||||
time_to_graph(prev_sampledata->sampletime - graph_start),
|
time_to_graph(prev_sampledata->sampletime - graph_start),
|
||||||
((arg_scale_y * 5) - ((sampledata->entropy_avail / 4096.) * (arg_scale_y * 5))),
|
((arg_scale_y * 5) - ((sampledata->entropy_avail / 4096.) * (arg_scale_y * 5))),
|
||||||
time_to_graph(sampledata->sampletime - prev_sampledata->sampletime),
|
time_to_graph(sampledata->sampletime - prev_sampledata->sampletime),
|
||||||
@@ -871,7 +867,7 @@ static void svg_entropy_bar(void) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct ps_struct *get_next_ps(struct ps_struct *ps) {
|
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
|
* walk the list of processes and return the next one to be
|
||||||
* painted
|
* painted
|
||||||
@@ -919,7 +915,7 @@ static bool ps_filter(struct ps_struct *ps) {
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void svg_do_initcall(int count_only) {
|
static void svg_do_initcall(FILE *of, struct list_sample_data *head, int count_only, double graph_start) {
|
||||||
_cleanup_pclose_ FILE *f = NULL;
|
_cleanup_pclose_ FILE *f = NULL;
|
||||||
double t;
|
double t;
|
||||||
char func[256];
|
char func[256];
|
||||||
@@ -927,17 +923,16 @@ static void svg_do_initcall(int count_only) {
|
|||||||
int usecs;
|
int usecs;
|
||||||
|
|
||||||
/* can't plot initcall when disabled or in relative mode */
|
/* can't plot initcall when disabled or in relative mode */
|
||||||
if (!initcall || arg_relative) {
|
if (!arg_initcall || arg_relative) {
|
||||||
kcount = 0;
|
kcount = 0;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!count_only) {
|
if (!count_only) {
|
||||||
svg("<!-- initcall -->\n");
|
fprintf(of, "<!-- initcall -->\n");
|
||||||
|
fprintf(of, "<text class=\"t2\" x=\"5\" y=\"-15\">Kernel init threads</text>\n");
|
||||||
svg("<text class=\"t2\" x=\"5\" y=\"-15\">Kernel init threads</text>\n");
|
|
||||||
/* surrounding box */
|
/* surrounding box */
|
||||||
svg_graph_box(kcount);
|
svg_graph_box(of, head, kcount, graph_start);
|
||||||
}
|
}
|
||||||
|
|
||||||
kcount = 0;
|
kcount = 0;
|
||||||
@@ -983,47 +978,52 @@ static void svg_do_initcall(int count_only) {
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
svg("<!-- thread=\"%s\" time=\"%.3f\" elapsed=\"%d\" result=\"%d\" -->\n",
|
fprintf(of, "<!-- thread=\"%s\" time=\"%.3f\" elapsed=\"%d\" result=\"%d\" -->\n",
|
||||||
func, t, usecs, ret);
|
func, t, usecs, ret);
|
||||||
|
|
||||||
if (usecs < 1000)
|
if (usecs < 1000)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
/* rect */
|
/* rect */
|
||||||
svg(" <rect class=\"krnl\" x=\"%.03f\" y=\"%.03f\" width=\"%.03f\" height=\"%.03f\" />\n",
|
fprintf(of, " <rect class=\"krnl\" x=\"%.03f\" y=\"%.03f\" width=\"%.03f\" height=\"%.03f\" />\n",
|
||||||
time_to_graph(t - (usecs / 1000000.0)),
|
time_to_graph(t - (usecs / 1000000.0)),
|
||||||
ps_to_graph(kcount),
|
ps_to_graph(kcount),
|
||||||
time_to_graph(usecs / 1000000.0),
|
time_to_graph(usecs / 1000000.0),
|
||||||
ps_to_graph(1));
|
ps_to_graph(1));
|
||||||
|
|
||||||
/* label */
|
/* label */
|
||||||
svg(" <text x=\"%.03f\" y=\"%.03f\">%s <tspan class=\"run\">%.03fs</tspan></text>\n",
|
fprintf(of, " <text x=\"%.03f\" y=\"%.03f\">%s <tspan class=\"run\">%.03fs</tspan></text>\n",
|
||||||
time_to_graph(t - (usecs / 1000000.0)) + 5,
|
time_to_graph(t - (usecs / 1000000.0)) + 5,
|
||||||
ps_to_graph(kcount) + 15,
|
ps_to_graph(kcount) + 15,
|
||||||
func,
|
func, usecs / 1000000.0);
|
||||||
usecs / 1000000.0);
|
|
||||||
|
|
||||||
kcount++;
|
kcount++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static void svg_ps_bars(void) {
|
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;
|
struct ps_struct *ps;
|
||||||
int i = 0;
|
int i = 0;
|
||||||
int j = 0;
|
int j = 0;
|
||||||
int pid;
|
int pid;
|
||||||
double w = 0.0;
|
double w = 0.0;
|
||||||
|
|
||||||
svg("<!-- Process graph -->\n");
|
fprintf(of, "<!-- Process graph -->\n");
|
||||||
|
fprintf(of, "<text class=\"t2\" x=\"5\" y=\"-15\">Processes</text>\n");
|
||||||
svg("<text class=\"t2\" x=\"5\" y=\"-15\">Processes</text>\n");
|
|
||||||
|
|
||||||
/* surrounding box */
|
/* surrounding box */
|
||||||
svg_graph_box(pcount);
|
svg_graph_box(of, head, pcount, graph_start);
|
||||||
|
|
||||||
/* pass 2 - ps boxes */
|
/* pass 2 - ps boxes */
|
||||||
ps = ps_first;
|
ps = ps_first;
|
||||||
while ((ps = get_next_ps(ps))) {
|
while ((ps = get_next_ps(ps, ps_first))) {
|
||||||
_cleanup_free_ char *enc_name = NULL, *escaped = NULL;
|
_cleanup_free_ char *enc_name = NULL, *escaped = NULL;
|
||||||
double endtime;
|
double endtime;
|
||||||
double starttime;
|
double starttime;
|
||||||
@@ -1037,7 +1037,7 @@ static void svg_ps_bars(void) {
|
|||||||
continue;
|
continue;
|
||||||
|
|
||||||
/* leave some trace of what we actually filtered etc. */
|
/* leave some trace of what we actually filtered etc. */
|
||||||
svg("<!-- %s [%i] ppid=%i runtime=%.03fs -->\n", enc_name, ps->pid,
|
fprintf(of, "<!-- %s [%i] ppid=%i runtime=%.03fs -->\n", enc_name, ps->pid,
|
||||||
ps->ppid, ps->total);
|
ps->ppid, ps->total);
|
||||||
|
|
||||||
starttime = ps->first->sampledata->sampletime;
|
starttime = ps->first->sampledata->sampletime;
|
||||||
@@ -1053,7 +1053,7 @@ static void svg_ps_bars(void) {
|
|||||||
|
|
||||||
/* if this is the last child, we might still need to draw a connecting line */
|
/* if this is the last child, we might still need to draw a connecting line */
|
||||||
if ((!ps->next) && (ps->parent))
|
if ((!ps->next) && (ps->parent))
|
||||||
svg(" <line class=\"dot\" x1=\"%.03f\" y1=\"%.03f\" x2=\"%.03f\" y2=\"%.03f\" />\n",
|
fprintf(of, " <line class=\"dot\" x1=\"%.03f\" y1=\"%.03f\" x2=\"%.03f\" y2=\"%.03f\" />\n",
|
||||||
ps->parent->pos_x,
|
ps->parent->pos_x,
|
||||||
ps_to_graph(j-1) + 10.0, /* whee, use the last value here */
|
ps_to_graph(j-1) + 10.0, /* whee, use the last value here */
|
||||||
ps->parent->pos_x,
|
ps->parent->pos_x,
|
||||||
@@ -1062,7 +1062,7 @@ static void svg_ps_bars(void) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
endtime = ps->last->sampledata->sampletime;
|
endtime = ps->last->sampledata->sampletime;
|
||||||
svg(" <rect class=\"ps\" x=\"%.03f\" y=\"%.03f\" width=\"%.03f\" height=\"%.03f\" />\n",
|
fprintf(of, " <rect class=\"ps\" x=\"%.03f\" y=\"%.03f\" width=\"%.03f\" height=\"%.03f\" />\n",
|
||||||
time_to_graph(starttime - graph_start),
|
time_to_graph(starttime - graph_start),
|
||||||
ps_to_graph(j),
|
ps_to_graph(j),
|
||||||
time_to_graph(ps->last->sampledata->sampletime - starttime),
|
time_to_graph(ps->last->sampledata->sampletime - starttime),
|
||||||
@@ -1095,14 +1095,14 @@ static void svg_ps_bars(void) {
|
|||||||
if ((prt < 0.1) && (wrt < 0.1)) /* =~ 26 (color threshold) */
|
if ((prt < 0.1) && (wrt < 0.1)) /* =~ 26 (color threshold) */
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
svg(" <rect class=\"wait\" x=\"%.03f\" y=\"%.03f\" width=\"%.03f\" height=\"%.03f\" />\n",
|
fprintf(of, " <rect class=\"wait\" x=\"%.03f\" y=\"%.03f\" width=\"%.03f\" height=\"%.03f\" />\n",
|
||||||
time_to_graph(prev->sampledata->sampletime - graph_start),
|
time_to_graph(prev->sampledata->sampletime - graph_start),
|
||||||
ps_to_graph(j),
|
ps_to_graph(j),
|
||||||
time_to_graph(ps->sample->sampledata->sampletime - prev->sampledata->sampletime),
|
time_to_graph(ps->sample->sampledata->sampletime - prev->sampledata->sampletime),
|
||||||
ps_to_graph(wrt));
|
ps_to_graph(wrt));
|
||||||
|
|
||||||
/* draw cpu over wait - TODO figure out how/why run + wait > interval */
|
/* draw cpu over wait - TODO figure out how/why run + wait > interval */
|
||||||
svg(" <rect class=\"cpu\" x=\"%.03f\" y=\"%.03f\" width=\"%.03f\" height=\"%.03f\" />\n",
|
fprintf(of, " <rect class=\"cpu\" x=\"%.03f\" y=\"%.03f\" width=\"%.03f\" height=\"%.03f\" />\n",
|
||||||
time_to_graph(prev->sampledata->sampletime - graph_start),
|
time_to_graph(prev->sampledata->sampletime - graph_start),
|
||||||
ps_to_graph(j + (1.0 - prt)),
|
ps_to_graph(j + (1.0 - prt)),
|
||||||
time_to_graph(ps->sample->sampledata->sampletime - prev->sampledata->sampletime),
|
time_to_graph(ps->sample->sampledata->sampletime - prev->sampledata->sampletime),
|
||||||
@@ -1118,7 +1118,7 @@ static void svg_ps_bars(void) {
|
|||||||
w = starttime;
|
w = starttime;
|
||||||
|
|
||||||
/* text label of process name */
|
/* text label of process name */
|
||||||
svg(" <text x=\"%.03f\" y=\"%.03f\"><![CDATA[%s]]> [%i]<tspan class=\"run\">%.03fs</tspan> %s</text>\n",
|
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,
|
time_to_graph(w - graph_start) + 5.0,
|
||||||
ps_to_graph(j) + 14.0,
|
ps_to_graph(j) + 14.0,
|
||||||
escaped ? escaped : ps->name,
|
escaped ? escaped : ps->name,
|
||||||
@@ -1128,7 +1128,7 @@ static void svg_ps_bars(void) {
|
|||||||
/* paint lines to the parent process */
|
/* paint lines to the parent process */
|
||||||
if (ps->parent) {
|
if (ps->parent) {
|
||||||
/* horizontal part */
|
/* horizontal part */
|
||||||
svg(" <line class=\"dot\" x1=\"%.03f\" y1=\"%.03f\" x2=\"%.03f\" y2=\"%.03f\" />\n",
|
fprintf(of, " <line class=\"dot\" x1=\"%.03f\" y1=\"%.03f\" x2=\"%.03f\" y2=\"%.03f\" />\n",
|
||||||
time_to_graph(starttime - graph_start),
|
time_to_graph(starttime - graph_start),
|
||||||
ps_to_graph(j) + 10.0,
|
ps_to_graph(j) + 10.0,
|
||||||
ps->parent->pos_x,
|
ps->parent->pos_x,
|
||||||
@@ -1136,7 +1136,7 @@ static void svg_ps_bars(void) {
|
|||||||
|
|
||||||
/* one vertical line connecting all the horizontal ones up */
|
/* one vertical line connecting all the horizontal ones up */
|
||||||
if (!ps->next)
|
if (!ps->next)
|
||||||
svg(" <line class=\"dot\" x1=\"%.03f\" y1=\"%.03f\" x2=\"%.03f\" y2=\"%.03f\" />\n",
|
fprintf(of, " <line class=\"dot\" x1=\"%.03f\" y1=\"%.03f\" x2=\"%.03f\" y2=\"%.03f\" />\n",
|
||||||
ps->parent->pos_x,
|
ps->parent->pos_x,
|
||||||
ps_to_graph(j) + 10.0,
|
ps_to_graph(j) + 10.0,
|
||||||
ps->parent->pos_x,
|
ps->parent->pos_x,
|
||||||
@@ -1145,7 +1145,7 @@ static void svg_ps_bars(void) {
|
|||||||
|
|
||||||
j++; /* count boxes */
|
j++; /* count boxes */
|
||||||
|
|
||||||
svg("\n");
|
fprintf(of, "\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
/* last pass - determine when idle */
|
/* last pass - determine when idle */
|
||||||
@@ -1165,7 +1165,7 @@ static void svg_ps_bars(void) {
|
|||||||
ps->sample = ps->first;
|
ps->sample = ps->first;
|
||||||
i = ps->sample->next->sampledata->counter;
|
i = ps->sample->next->sampledata->counter;
|
||||||
|
|
||||||
while (ps->sample->next && i<(samples-(arg_hz/2))) {
|
while (ps->sample->next && i<(n_samples-(arg_hz/2))) {
|
||||||
double crt;
|
double crt;
|
||||||
double brt;
|
double brt;
|
||||||
int c;
|
int c;
|
||||||
@@ -1179,7 +1179,7 @@ static void svg_ps_bars(void) {
|
|||||||
|
|
||||||
/* subtract bootchart cpu utilization from total */
|
/* subtract bootchart cpu utilization from total */
|
||||||
crt = 0.0;
|
crt = 0.0;
|
||||||
for (c = 0; c < cpus; c++)
|
for (c = 0; c < n_cpus; c++)
|
||||||
crt += sample_hz->sampledata->runtime[c] - ps->sample->sampledata->runtime[c];
|
crt += sample_hz->sampledata->runtime[c] - ps->sample->sampledata->runtime[c];
|
||||||
brt = sample_hz->runtime - ps->sample->runtime;
|
brt = sample_hz->runtime - ps->sample->runtime;
|
||||||
/*
|
/*
|
||||||
@@ -1190,14 +1190,13 @@ static void svg_ps_bars(void) {
|
|||||||
*/
|
*/
|
||||||
if ((crt - brt) < (interval / 2.0)) {
|
if ((crt - brt) < (interval / 2.0)) {
|
||||||
idletime = ps->sample->sampledata->sampletime - graph_start;
|
idletime = ps->sample->sampledata->sampletime - graph_start;
|
||||||
svg("\n<!-- idle detected at %.03f seconds -->\n",
|
fprintf(of, "\n<!-- idle detected at %.03f seconds -->\n", idletime);
|
||||||
idletime);
|
fprintf(of, "<line class=\"idle\" x1=\"%.03f\" y1=\"%.03f\" x2=\"%.03f\" y2=\"%.03f\" />\n",
|
||||||
svg("<line class=\"idle\" x1=\"%.03f\" y1=\"%.03f\" x2=\"%.03f\" y2=\"%.03f\" />\n",
|
|
||||||
time_to_graph(idletime),
|
time_to_graph(idletime),
|
||||||
-arg_scale_y,
|
-arg_scale_y,
|
||||||
time_to_graph(idletime),
|
time_to_graph(idletime),
|
||||||
ps_to_graph(pcount) + arg_scale_y);
|
ps_to_graph(pcount) + arg_scale_y);
|
||||||
svg("<text class=\"idle\" x=\"%.03f\" y=\"%.03f\">%.01fs</text>\n",
|
fprintf(of, "<text class=\"idle\" x=\"%.03f\" y=\"%.03f\">%.01fs</text>\n",
|
||||||
time_to_graph(idletime) + 5.0,
|
time_to_graph(idletime) + 5.0,
|
||||||
ps_to_graph(pcount) + arg_scale_y,
|
ps_to_graph(pcount) + arg_scale_y,
|
||||||
idletime);
|
idletime);
|
||||||
@@ -1207,7 +1206,7 @@ static void svg_ps_bars(void) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static void svg_top_ten_cpu(void) {
|
static void svg_top_ten_cpu(FILE *of, struct ps_struct *ps_first) {
|
||||||
struct ps_struct *top[10];
|
struct ps_struct *top[10];
|
||||||
struct ps_struct emptyps = {};
|
struct ps_struct emptyps = {};
|
||||||
struct ps_struct *ps;
|
struct ps_struct *ps;
|
||||||
@@ -1218,7 +1217,7 @@ static void svg_top_ten_cpu(void) {
|
|||||||
|
|
||||||
/* walk all ps's and setup ptrs */
|
/* walk all ps's and setup ptrs */
|
||||||
ps = ps_first;
|
ps = ps_first;
|
||||||
while ((ps = get_next_ps(ps))) {
|
while ((ps = get_next_ps(ps, ps_first))) {
|
||||||
for (n = 0; n < 10; n++) {
|
for (n = 0; n < 10; n++) {
|
||||||
if (ps->total <= top[n]->total)
|
if (ps->total <= top[n]->total)
|
||||||
continue;
|
continue;
|
||||||
@@ -1230,16 +1229,16 @@ static void svg_top_ten_cpu(void) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
svg("<text class=\"t2\" x=\"20\" y=\"0\">Top CPU consumers:</text>\n");
|
fprintf(of, "<text class=\"t2\" x=\"20\" y=\"0\">Top CPU consumers:</text>\n");
|
||||||
for (n = 0; n < 10; n++)
|
for (n = 0; n < 10; n++)
|
||||||
svg("<text class=\"t3\" x=\"20\" y=\"%d\">%3.03fs - <![CDATA[%s]]> [%d]</text>\n",
|
fprintf(of, "<text class=\"t3\" x=\"20\" y=\"%d\">%3.03fs - <![CDATA[%s]]> [%d]</text>\n",
|
||||||
20 + (n * 13),
|
20 + (n * 13),
|
||||||
top[n]->total,
|
top[n]->total,
|
||||||
top[n]->name,
|
top[n]->name,
|
||||||
top[n]->pid);
|
top[n]->pid);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void svg_top_ten_pss(void) {
|
static void svg_top_ten_pss(FILE *of, struct ps_struct *ps_first) {
|
||||||
struct ps_struct *top[10];
|
struct ps_struct *top[10];
|
||||||
struct ps_struct emptyps = {};
|
struct ps_struct emptyps = {};
|
||||||
struct ps_struct *ps;
|
struct ps_struct *ps;
|
||||||
@@ -1250,7 +1249,7 @@ static void svg_top_ten_pss(void) {
|
|||||||
|
|
||||||
/* walk all ps's and setup ptrs */
|
/* walk all ps's and setup ptrs */
|
||||||
ps = ps_first;
|
ps = ps_first;
|
||||||
while ((ps = get_next_ps(ps))) {
|
while ((ps = get_next_ps(ps, ps_first))) {
|
||||||
for (n = 0; n < 10; n++) {
|
for (n = 0; n < 10; n++) {
|
||||||
if (ps->pss_max <= top[n]->pss_max)
|
if (ps->pss_max <= top[n]->pss_max)
|
||||||
continue;
|
continue;
|
||||||
@@ -1262,30 +1261,39 @@ static void svg_top_ten_pss(void) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
svg("<text class=\"t2\" x=\"20\" y=\"0\">Top PSS consumers:</text>\n");
|
fprintf(of, "<text class=\"t2\" x=\"20\" y=\"0\">Top PSS consumers:</text>\n");
|
||||||
for (n = 0; n < 10; n++)
|
for (n = 0; n < 10; n++)
|
||||||
svg("<text class=\"t3\" x=\"20\" y=\"%d\">%dK - <![CDATA[%s]]> [%d]</text>\n",
|
fprintf(of, "<text class=\"t3\" x=\"20\" y=\"%d\">%dK - <![CDATA[%s]]> [%d]</text>\n",
|
||||||
20 + (n * 13),
|
20 + (n * 13),
|
||||||
top[n]->pss_max,
|
top[n]->pss_max,
|
||||||
top[n]->name,
|
top[n]->name,
|
||||||
top[n]->pid);
|
top[n]->pid);
|
||||||
}
|
}
|
||||||
|
|
||||||
int svg_do(const char *build) {
|
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;
|
struct ps_struct *ps;
|
||||||
double offset = 7;
|
double offset = 7;
|
||||||
int r, c;
|
int r, c;
|
||||||
|
|
||||||
memzero(&str, sizeof(str));
|
|
||||||
|
|
||||||
ps = ps_first;
|
ps = ps_first;
|
||||||
|
|
||||||
/* count initcall thread count first */
|
/* count initcall thread count first */
|
||||||
svg_do_initcall(1);
|
svg_do_initcall(of, head, 1, graph_start);
|
||||||
ksize = (kcount ? ps_to_graph(kcount) + (arg_scale_y * 2) : 0);
|
ksize = (kcount ? ps_to_graph(kcount) + (arg_scale_y * 2) : 0);
|
||||||
|
|
||||||
/* then count processes */
|
/* then count processes */
|
||||||
while ((ps = get_next_ps(ps))) {
|
while ((ps = get_next_ps(ps, ps_first))) {
|
||||||
if (!ps_filter(ps))
|
if (!ps_filter(ps))
|
||||||
pcount++;
|
pcount++;
|
||||||
else
|
else
|
||||||
@@ -1296,70 +1304,70 @@ int svg_do(const char *build) {
|
|||||||
esize = (arg_entropy ? arg_scale_y * 7 : 0);
|
esize = (arg_entropy ? arg_scale_y * 7 : 0);
|
||||||
|
|
||||||
/* after this, we can draw the header with proper sizing */
|
/* after this, we can draw the header with proper sizing */
|
||||||
svg_header();
|
svg_header(of, head, graph_start);
|
||||||
svg("<rect class=\"bg\" width=\"100%%\" height=\"100%%\" />\n\n");
|
fprintf(of, "<rect class=\"bg\" width=\"100%%\" height=\"100%%\" />\n\n");
|
||||||
|
|
||||||
svg("<g transform=\"translate(10,400)\">\n");
|
fprintf(of, "<g transform=\"translate(10,400)\">\n");
|
||||||
svg_io_bi_bar();
|
svg_io_bi_bar(of, head, n_samples, graph_start, interval);
|
||||||
svg("</g>\n\n");
|
fprintf(of, "</g>\n\n");
|
||||||
|
|
||||||
svg("<g transform=\"translate(10,%.03f)\">\n", 400.0 + (arg_scale_y * offset));
|
fprintf(of, "<g transform=\"translate(10,%.03f)\">\n", 400.0 + (arg_scale_y * offset));
|
||||||
svg_io_bo_bar();
|
svg_io_bo_bar(of, head, n_samples, graph_start, interval);
|
||||||
svg("</g>\n\n");
|
fprintf(of, "</g>\n\n");
|
||||||
|
|
||||||
for (c = -1; c < (arg_percpu ? cpus : 0); c++) {
|
for (c = -1; c < (arg_percpu ? n_cpus : 0); c++) {
|
||||||
offset += 7;
|
offset += 7;
|
||||||
svg("<g transform=\"translate(10,%.03f)\">\n", 400.0 + (arg_scale_y * offset));
|
fprintf(of, "<g transform=\"translate(10,%.03f)\">\n", 400.0 + (arg_scale_y * offset));
|
||||||
svg_cpu_bar(c);
|
svg_cpu_bar(of, head, n_cpus, c, graph_start);
|
||||||
svg("</g>\n\n");
|
fprintf(of, "</g>\n\n");
|
||||||
|
|
||||||
offset += 7;
|
offset += 7;
|
||||||
svg("<g transform=\"translate(10,%.03f)\">\n", 400.0 + (arg_scale_y * offset));
|
fprintf(of, "<g transform=\"translate(10,%.03f)\">\n", 400.0 + (arg_scale_y * offset));
|
||||||
svg_wait_bar(c);
|
svg_wait_bar(of, head, n_cpus, c, graph_start);
|
||||||
svg("</g>\n\n");
|
fprintf(of, "</g>\n\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (kcount) {
|
if (kcount) {
|
||||||
offset += 7;
|
offset += 7;
|
||||||
svg("<g transform=\"translate(10,%.03f)\">\n", 400.0 + (arg_scale_y * offset));
|
fprintf(of, "<g transform=\"translate(10,%.03f)\">\n", 400.0 + (arg_scale_y * offset));
|
||||||
svg_do_initcall(0);
|
svg_do_initcall(of, head, 0, graph_start);
|
||||||
svg("</g>\n\n");
|
fprintf(of, "</g>\n\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
offset += 7;
|
offset += 7;
|
||||||
svg("<g transform=\"translate(10,%.03f)\">\n", 400.0 + (arg_scale_y * offset) + ksize);
|
fprintf(of, "<g transform=\"translate(10,%.03f)\">\n", 400.0 + (arg_scale_y * offset) + ksize);
|
||||||
svg_ps_bars();
|
svg_ps_bars(of, head, n_samples, n_cpus, ps_first, graph_start, interval);
|
||||||
svg("</g>\n\n");
|
fprintf(of, "</g>\n\n");
|
||||||
|
|
||||||
svg("<g transform=\"translate(10, 0)\">\n");
|
fprintf(of, "<g transform=\"translate(10, 0)\">\n");
|
||||||
r = svg_title(build);
|
r = svg_title(of, build, pscount, log_start, overrun);
|
||||||
svg("</g>\n\n");
|
fprintf(of, "</g>\n\n");
|
||||||
|
|
||||||
if (r < 0)
|
if (r < 0)
|
||||||
return r;
|
return r;
|
||||||
|
|
||||||
svg("<g transform=\"translate(10,200)\">\n");
|
fprintf(of, "<g transform=\"translate(10,200)\">\n");
|
||||||
svg_top_ten_cpu();
|
svg_top_ten_cpu(of, ps_first);
|
||||||
svg("</g>\n\n");
|
fprintf(of, "</g>\n\n");
|
||||||
|
|
||||||
if (arg_entropy) {
|
if (arg_entropy) {
|
||||||
svg("<g transform=\"translate(10,%.03f)\">\n", 400.0 + (arg_scale_y * offset) + ksize + psize);
|
fprintf(of, "<g transform=\"translate(10,%.03f)\">\n", 400.0 + (arg_scale_y * offset) + ksize + psize);
|
||||||
svg_entropy_bar();
|
svg_entropy_bar(of, head, graph_start);
|
||||||
svg("</g>\n\n");
|
fprintf(of, "</g>\n\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (arg_pss) {
|
if (arg_pss) {
|
||||||
svg("<g transform=\"translate(10,%.03f)\">\n", 400.0 + (arg_scale_y * offset) + ksize + psize + esize);
|
fprintf(of, "<g transform=\"translate(10,%.03f)\">\n", 400.0 + (arg_scale_y * offset) + ksize + psize + esize);
|
||||||
svg_pss_graph();
|
svg_pss_graph(of, head, ps_first, graph_start);
|
||||||
svg("</g>\n\n");
|
fprintf(of, "</g>\n\n");
|
||||||
|
|
||||||
svg("<g transform=\"translate(410,200)\">\n");
|
fprintf(of, "<g transform=\"translate(410,200)\">\n");
|
||||||
svg_top_ten_pss();
|
svg_top_ten_pss(of, ps_first);
|
||||||
svg("</g>\n\n");
|
fprintf(of, "</g>\n\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
/* svg footer */
|
/* fprintf footer */
|
||||||
svg("\n</svg>\n");
|
fprintf(of, "\n</svg>\n");
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|||||||
+11
-1
@@ -24,4 +24,14 @@
|
|||||||
along with systemd; If not, see <http://www.gnu.org/licenses/>.
|
along with systemd; If not, see <http://www.gnu.org/licenses/>.
|
||||||
***/
|
***/
|
||||||
|
|
||||||
int svg_do(const char *build);
|
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);
|
||||||
|
|||||||
Reference in New Issue
Block a user