#include <math.h>
#include <getopt.h>
+#include <json_writer.h>
#include <SNAPSHOT.h>
-
-int dump_zeros = 0;
-int reset_history = 0;
-int ignore_history = 0;
-int no_output = 0;
-int json_output = 0;
-int no_update = 0;
-int scan_interval = 0;
-int time_constant = 0;
+#include "utils.h"
+
+int dump_zeros;
+int reset_history;
+int ignore_history;
+int no_output;
+int json_output;
+int no_update;
+int scan_interval;
+int time_constant;
double W;
char **patterns;
int npatterns;
{
char store[128];
char *p = getenv(env);
+
if (!p) {
p = getenv("PROC_ROOT") ? : "/proc";
snprintf(store, sizeof(store)-1, "%s/%s", p, name);
return generic_proc_open("PROC_NET_SNMP6", "net/snmp6");
}
-struct nstat_ent
+static int net_sctp_snmp_open(void)
{
+ return generic_proc_open("PROC_NET_SCTP_SNMP", "net/sctp/snmp");
+}
+
+struct nstat_ent {
struct nstat_ent *next;
char *id;
unsigned long long val;
static int useless_number(const char *id)
{
int i;
- for (i=0; i<sizeof(useless_numbers)/sizeof(*useless_numbers); i++)
+
+ for (i = 0; i < ARRAY_SIZE(useless_numbers); i++)
if (strcmp(id, useless_numbers[i]) == 0)
return 1;
return 0;
if (npatterns == 0)
return 1;
- for (i=0; i<npatterns; i++) {
+ for (i = 0; i < npatterns; i++) {
if (!fnmatch(patterns[i], id, 0))
return 1;
}
unsigned long long val;
double rate;
char idbuf[sizeof(buf)];
+
if (buf[0] == '#') {
buf[strlen(buf)-1] = 0;
if (info_source[0] && strcmp(info_source, buf+1))
}
}
+static int count_spaces(const char *line)
+{
+ int count = 0;
+ char c;
+
+ while ((c = *line++) != 0)
+ count += c == ' ' || c == '\n';
+ return count;
+}
static void load_ugly_table(FILE *fp)
{
- char buf[4096];
+ char buf[2048];
struct nstat_ent *db = NULL;
struct nstat_ent *n;
while (fgets(buf, sizeof(buf), fp) != NULL) {
- char idbuf[sizeof(buf)];
+ char idbuf[4096];
int off;
char *p;
+ int count1, count2, skip = 0;
p = strchr(buf, ':');
if (!p)
abort();
+ count1 = count_spaces(buf);
*p = 0;
idbuf[0] = 0;
strncat(idbuf, buf, sizeof(idbuf) - 1);
while (*p) {
char *next;
+
if ((next = strchr(p, ' ')) != NULL)
*next++ = 0;
else if ((next = strchr(p, '\n')) != NULL)
n = db;
if (fgets(buf, sizeof(buf), fp) == NULL)
abort();
+ count2 = count_spaces(buf);
+ if (count2 > count1)
+ skip = count2 - count1;
do {
p = strrchr(buf, ' ');
if (!p)
if (sscanf(p+1, "%llu", &n->val) != 1)
abort();
/* Trick to skip "dummy" trailing ICMP MIB in 2.4 */
- if (strcmp(idbuf, "IcmpOutAddrMaskReps") == 0)
- idbuf[5] = 0;
+ if (skip)
+ skip--;
else
n = n->next;
} while (p > buf + off + 2);
}
}
+static void load_sctp_snmp(void)
+{
+ FILE *fp = fdopen(net_sctp_snmp_open(), "r");
+
+ if (fp) {
+ load_good_table(fp);
+ fclose(fp);
+ }
+}
+
static void load_snmp(void)
{
FILE *fp = fdopen(net_snmp_open(), "r");
+
if (fp) {
load_ugly_table(fp);
fclose(fp);
static void load_snmp6(void)
{
FILE *fp = fdopen(net_snmp6_open(), "r");
+
if (fp) {
load_good_table(fp);
fclose(fp);
static void load_netstat(void)
{
FILE *fp = fdopen(net_netstat_open(), "r");
+
if (fp) {
load_ugly_table(fp);
fclose(fp);
static void dump_kern_db(FILE *fp, int to_hist)
{
+ json_writer_t *jw = json_output ? jsonw_new(fp) : NULL;
struct nstat_ent *n, *h;
- const char *eol = "\n";
h = hist_db;
- if (json_output)
- fprintf(fp, "{ \"%s\":{", info_source);
- else
+ if (jw) {
+ jsonw_start_object(jw);
+ jsonw_pretty(jw, pretty);
+ jsonw_name(jw, info_source);
+ jsonw_start_object(jw);
+ } else
fprintf(fp, "#%s\n", info_source);
- for (n=kern_db; n; n=n->next) {
+ for (n = kern_db; n; n = n->next) {
unsigned long long val = n->val;
+
if (!dump_zeros && !val && !n->rate)
continue;
if (!match(n->id)) {
struct nstat_ent *h1;
+
if (!to_hist)
continue;
for (h1 = h; h1; h1 = h1->next) {
}
}
- if (json_output) {
- fprintf(fp, "%s \"%s\":%llu",
- eol, n->id, val);
- eol = ",\n";
- } else
+ if (jw)
+ jsonw_uint_field(jw, n->id, val);
+ else
fprintf(fp, "%-32s%-16llu%6.1f\n", n->id, val, n->rate);
}
- if (json_output)
- fprintf(fp, "\n} }\n");
+
+ if (jw) {
+ jsonw_end_object(jw);
+
+ jsonw_end_object(jw);
+ jsonw_destroy(&jw);
+ }
}
static void dump_incr_db(FILE *fp)
{
+ json_writer_t *jw = json_output ? jsonw_new(fp) : NULL;
struct nstat_ent *n, *h;
- const char *eol = "\n";
h = hist_db;
- if (json_output)
- fprintf(fp, "{ \"%s\":{", info_source);
- else
+ if (jw) {
+ jsonw_start_object(jw);
+ jsonw_pretty(jw, pretty);
+ jsonw_name(jw, info_source);
+ jsonw_start_object(jw);
+ } else
fprintf(fp, "#%s\n", info_source);
- for (n=kern_db; n; n=n->next) {
+ for (n = kern_db; n; n = n->next) {
int ovfl = 0;
unsigned long long val = n->val;
struct nstat_ent *h1;
+
for (h1 = h; h1; h1 = h1->next) {
if (strcmp(h1->id, n->id) == 0) {
if (val < h1->val) {
if (!match(n->id))
continue;
- if (json_output) {
- fprintf(fp, "%s \"%s\":%llu",
- eol, n->id, val);
- eol = ",\n";
- } else
+ if (jw)
+ jsonw_uint_field(jw, n->id, val);
+ else
fprintf(fp, "%-32s%-16llu%6.1f%s\n", n->id, val,
n->rate, ovfl?" (overflow)":"");
}
- if (json_output)
- fprintf(fp, "\n} }\n");
+
+ if (jw) {
+ jsonw_end_object(jw);
+
+ jsonw_end_object(jw);
+ jsonw_destroy(&jw);
+ }
}
static int children;
load_netstat();
load_snmp6();
load_snmp();
+ load_sctp_snmp();
h = kern_db;
kern_db = n;
for (n = kern_db; n; n = n->next) {
struct nstat_ent *h1;
+
for (h1 = h; h1; h1 = h1->next) {
if (strcmp(h1->id, n->id) == 0) {
double sample;
n->rate = sample;
} else {
double w = W*(double)interval/scan_interval;
+
n->rate += w*(sample-n->rate);
}
}
while (h != h1) {
struct nstat_ent *tmp = h;
+
h = h->next;
free(tmp->id);
free(tmp);
}
}
-#define T_DIFF(a,b) (((a).tv_sec-(b).tv_sec)*1000 + ((a).tv_usec-(b).tv_usec)/1000)
+#define T_DIFF(a, b) (((a).tv_sec-(b).tv_sec)*1000 + ((a).tv_usec-(b).tv_usec)/1000)
static void server_loop(int fd)
{
struct timeval snaptime = { 0 };
struct pollfd p;
+
p.fd = fd;
p.events = p.revents = POLLIN;
load_netstat();
load_snmp6();
load_snmp();
+ load_sctp_snmp();
for (;;) {
int status;
- int tdiff;
+ time_t tdiff;
struct timeval now;
+
gettimeofday(&now, NULL);
tdiff = T_DIFF(now, snaptime);
if (tdiff >= scan_interval) {
snaptime = now;
tdiff = 0;
}
- if (poll(&p, 1, tdiff + scan_interval) > 0
+ if (poll(&p, 1, scan_interval - tdiff) > 0
&& (p.revents&POLLIN)) {
int clnt = accept(fd, NULL, NULL);
+
if (clnt >= 0) {
pid_t pid;
+
if (children >= 5) {
close(clnt);
} else if ((pid = fork()) != 0) {
- if (pid>0)
+ if (pid > 0)
children++;
close(clnt);
} else {
FILE *fp = fdopen(clnt, "w");
- if (fp) {
- if (tdiff > 0)
- update_db(tdiff);
+
+ if (fp)
dump_kern_db(fp, 0);
- }
exit(0);
}
}
struct ucred cred;
socklen_t olen = sizeof(cred);
- if (getsockopt(fd, SOL_SOCKET, SO_PEERCRED, (void*)&cred, &olen) ||
+ if (getsockopt(fd, SOL_SOCKET, SO_PEERCRED, (void *)&cred, &olen) ||
olen < sizeof(cred))
return -1;
if (cred.uid == getuid() || cred.uid == 0)
{
fprintf(stderr,
"Usage: nstat [OPTION] [ PATTERN [ PATTERN ] ]\n"
-" -h, --help this message\n"
-" -a, --ignore ignore history\n"
-" -d, --scan=SECS sample every statistics every SECS\n"
-" -j, --json format output in JSON\n"
-" -n, --nooutput do history only\n"
-" -r, --reset reset history\n"
-" -s, --noupdate don\'t update history\n"
-" -t, --interval=SECS report average over the last SECS\n"
-" -V, --version output version information\n"
-" -z, --zeros show entries with zero activity\n");
+" -h, --help this message\n"
+" -a, --ignore ignore history\n"
+" -d, --scan=SECS sample every statistics every SECS\n"
+" -j, --json format output in JSON\n"
+" -n, --nooutput do history only\n"
+" -p, --pretty pretty print\n"
+" -r, --reset reset history\n"
+" -s, --noupdate don't update history\n"
+" -t, --interval=SECS report average over the last SECS\n"
+" -V, --version output version information\n"
+" -z, --zeros show entries with zero activity\n");
exit(-1);
}
{ "json", 0, 0, 'j' },
{ "reset", 0, 0, 'r' },
{ "noupdate", 0, 0, 's' },
+ { "pretty", 0, 0, 'p' },
{ "interval", 1, 0, 't' },
{ "version", 0, 0, 'V' },
{ "zeros", 0, 0, 'z' },
int ch;
int fd;
- while ((ch = getopt_long(argc, argv, "h?vVzrnasd:t:j",
+ while ((ch = getopt_long(argc, argv, "h?vVzrnasd:t:jp",
longopts, NULL)) != EOF) {
- switch(ch) {
+ switch (ch) {
case 'z':
dump_zeros = 1;
break;
case 'j':
json_output = 1;
break;
+ case 'p':
+ pretty = 1;
+ break;
case 'v':
case 'V':
printf("nstat utility, iproute2-ss%s\n", SNAPSHOT);
perror("nstat: socket");
exit(-1);
}
- if (bind(fd, (struct sockaddr*)&sun, 2+1+strlen(sun.sun_path+1)) < 0) {
+ if (bind(fd, (struct sockaddr *)&sun, 2+1+strlen(sun.sun_path+1)) < 0) {
perror("nstat: bind");
exit(-1);
}
if (!ignore_history) {
FILE *tfp;
long uptime = -1;
+
if ((tfp = fopen("/proc/uptime", "r")) != NULL) {
if (fscanf(tfp, "%ld", &uptime) != 1)
uptime = -1;
}
if (uptime >= 0 && time(NULL) >= stb.st_mtime+uptime) {
fprintf(stderr, "nstat: history is aged out, resetting\n");
- ftruncate(fileno(hist_fp), 0);
+ if (ftruncate(fileno(hist_fp), 0) < 0)
+ perror("nstat: ftruncate");
}
}
}
if ((fd = socket(AF_UNIX, SOCK_STREAM, 0)) >= 0 &&
- (connect(fd, (struct sockaddr*)&sun, 2+1+strlen(sun.sun_path+1)) == 0
+ (connect(fd, (struct sockaddr *)&sun, 2+1+strlen(sun.sun_path+1)) == 0
|| (strcpy(sun.sun_path+1, "nstat0"),
- connect(fd, (struct sockaddr*)&sun, 2+1+strlen(sun.sun_path+1)) == 0))
+ connect(fd, (struct sockaddr *)&sun, 2+1+strlen(sun.sun_path+1)) == 0))
&& verify_forging(fd) == 0) {
FILE *sfp = fdopen(fd, "r");
- load_good_table(sfp);
- if (hist_db && source_mismatch) {
- fprintf(stderr, "nstat: history is stale, ignoring it.\n");
- hist_db = NULL;
+
+ if (!sfp) {
+ fprintf(stderr, "nstat: fdopen failed: %s\n",
+ strerror(errno));
+ close(fd);
+ } else {
+ load_good_table(sfp);
+ if (hist_db && source_mismatch) {
+ fprintf(stderr, "nstat: history is stale, ignoring it.\n");
+ hist_db = NULL;
+ }
+ fclose(sfp);
}
- fclose(sfp);
} else {
if (fd >= 0)
close(fd);
load_netstat();
load_snmp6();
load_snmp();
+ load_sctp_snmp();
if (info_source[0] == 0)
strcpy(info_source, "kernel");
}
dump_incr_db(stdout);
}
if (!no_update) {
- ftruncate(fileno(hist_fp), 0);
+ if (ftruncate(fileno(hist_fp), 0) < 0)
+ perror("nstat: ftruncate");
rewind(hist_fp);
json_output = 0;
projects / mirror_iproute2.git / blobdiff