#include "bootchart.h"
+#include "util.h"
/*
* Alloc a static 4k buffer for stdio - primarily used to increase
double gettime_ns(void)
{
- struct timespec now;
+ struct timespec n;
- clock_gettime(CLOCK_MONOTONIC, &now);
+ clock_gettime(CLOCK_MONOTONIC, &n);
- return (now.tv_sec + (now.tv_nsec / 1000000000.0));
+ return (n.tv_sec + (n.tv_nsec / 1000000000.0));
}
while (m) {
if (sscanf(m, "%s %s", key, val) < 2)
goto vmstat_next;
- if (!strcmp(key, "pgpgin"))
+ if (streq(key, "pgpgin"))
blockstat[sample].bi = atoi(val);
- if (!strcmp(key, "pgpgout")) {
+ if (streq(key, "pgpgout")) {
blockstat[sample].bo = atoi(val);
break;
}
if (e_fd) {
n = pread(e_fd, buf, sizeof(buf) - 1, 0);
- if (n > 0)
+ if (n > 0) {
+ buf[n] = '\0';
entropy_avail[sample] = atoi(buf);
+ }
}
}
char t[32];
struct ps_struct *parent;
- ps->next_ps = malloc(sizeof(struct ps_struct));
+ ps->next_ps = calloc(1, sizeof(struct ps_struct));
if (!ps->next_ps) {
- perror("malloc(ps_struct)");
+ perror("calloc(ps_struct)");
exit (EXIT_FAILURE);
}
- memset(ps->next_ps, 0, sizeof(struct ps_struct));
ps = ps->next_ps;
ps->pid = pid;
- ps->sample = malloc(sizeof(struct ps_sched_struct) * (len + 1));
+ ps->sample = calloc(len + 1, sizeof(struct ps_sched_struct));
if (!ps->sample) {
- perror("malloc(ps_struct)");
+ perror("calloc(ps_struct)");
exit (EXIT_FAILURE);
}
- memset(ps->sample, 0, sizeof(struct ps_sched_struct) * (len + 1));
pscount++;
close(ps->sched);
continue;
}
+ buf[s] = '\0';
if (!sscanf(buf, "%s %*s %*s", key))
continue;
if (ps->schedstat == -1)
continue;
}
-
- if (pread(ps->schedstat, buf, sizeof(buf) - 1, 0) <= 0) {
+ 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);
if (ps->sched)
// fclose(ps->smaps);
continue;
}
+ buf[s] = '\0';
+
if (!sscanf(buf, "%s %s %*s", rt, wt))
continue;
if (ps->sched == -1)
continue;
}
- if (pread(ps->sched, buf, sizeof(buf) - 1, 0) <= 0) {
+ s = pread(ps->sched, buf, sizeof(buf) - 1, 0);
+ if (s <= 0) {
/* clean up file descriptors */
close(ps->sched);
if (ps->schedstat)
// fclose(ps->smaps);
continue;
}
+ buf[s] = '\0';
if (!sscanf(buf, "%s %*s %*s", key))
continue;