Message ID | 1423547533-6727-1-git-send-email-brytonlee01@gmail.com |
---|---|
State | Changes Requested, archived |
Delegated to: | stephen hemminger |
Headers | show |
On 2/10/2015 8:52 AM, Bryton Lee wrote: > prevent the read ahead of /proc/slabinfo in ss. > Signed-off-by: Bryton Lee <brytonlee01@gmail.com> > --- > misc/ss.c | 13 ++++++++++--- > 1 file changed, 10 insertions(+), 3 deletions(-) > diff --git a/misc/ss.c b/misc/ss.c > index 7fc0a99..74721b5 100644 > --- a/misc/ss.c > +++ b/misc/ss.c [...] > @@ -655,6 +656,8 @@ static int get_slabstat(struct slabstat *s) > break; > } > > + slabstat_valid = 1; This is indented incorrectly. Use one TAB please. > + > fclose(fp); > return 0; > } > @@ -2230,6 +2233,9 @@ static int tcp_show(struct filter *f, int socktype) > * it is able to give us some memory for snapshot. > */ > if (1) { > + if (!slabstat_valid) > + get_slabstat(&slabstat); > + > int guess = slabstat.socks+slabstat.tcp_syns; > if (f->states&(1<<SS_TIME_WAIT)) > guess += slabstat.tcp_tws; > @@ -3196,6 +3202,9 @@ static int print_summary(void) > if (get_snmp_int("Tcp:", "CurrEstab", &sn.tcp_estab) < 0) > perror("ss: get_snmpstat"); > > + if (!slabstat_valid) > + get_slabstat(&slabstat); > + Can't you perform this check inside get_slabstat()? [...] WBR, Sergei -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Tue, Feb 10, 2015 at 8:51 PM, Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> wrote: > On 2/10/2015 8:52 AM, Bryton Lee wrote: > >> prevent the read ahead of /proc/slabinfo in ss. > > >> Signed-off-by: Bryton Lee <brytonlee01@gmail.com> >> --- >> misc/ss.c | 13 ++++++++++--- >> 1 file changed, 10 insertions(+), 3 deletions(-) > > >> diff --git a/misc/ss.c b/misc/ss.c >> index 7fc0a99..74721b5 100644 >> --- a/misc/ss.c >> +++ b/misc/ss.c > > [...] >> >> @@ -655,6 +656,8 @@ static int get_slabstat(struct slabstat *s) >> break; >> } >> >> + slabstat_valid = 1; > > > This is indented incorrectly. Use one TAB please. > >> + >> fclose(fp); >> return 0; >> } >> @@ -2230,6 +2233,9 @@ static int tcp_show(struct filter *f, int socktype) >> * it is able to give us some memory for snapshot. >> */ >> if (1) { >> + if (!slabstat_valid) >> + get_slabstat(&slabstat); >> + >> int guess = slabstat.socks+slabstat.tcp_syns; >> if (f->states&(1<<SS_TIME_WAIT)) >> guess += slabstat.tcp_tws; >> @@ -3196,6 +3202,9 @@ static int print_summary(void) >> if (get_snmp_int("Tcp:", "CurrEstab", &sn.tcp_estab) < 0) >> perror("ss: get_snmpstat"); >> >> + if (!slabstat_valid) >> + get_slabstat(&slabstat); >> + > > > Can't you perform this check inside get_slabstat()? > OK, I can submit it in another mail, coming soon. > [...] > > WBR, Sergei >
diff --git a/misc/ss.c b/misc/ss.c index 7fc0a99..74721b5 100644 --- a/misc/ss.c +++ b/misc/ss.c @@ -616,7 +616,8 @@ struct slabstat int skbs; }; -struct slabstat slabstat; +static struct slabstat slabstat; +static int slabstat_valid = 0; static const char *slabstat_ids[] = { @@ -655,6 +656,8 @@ static int get_slabstat(struct slabstat *s) break; } + slabstat_valid = 1; + fclose(fp); return 0; } @@ -2230,6 +2233,9 @@ static int tcp_show(struct filter *f, int socktype) * it is able to give us some memory for snapshot. */ if (1) { + if (!slabstat_valid) + get_slabstat(&slabstat); + int guess = slabstat.socks+slabstat.tcp_syns; if (f->states&(1<<SS_TIME_WAIT)) guess += slabstat.tcp_tws; @@ -3196,6 +3202,9 @@ static int print_summary(void) if (get_snmp_int("Tcp:", "CurrEstab", &sn.tcp_estab) < 0) perror("ss: get_snmpstat"); + if (!slabstat_valid) + get_slabstat(&slabstat); + printf("Total: %d (kernel %d)\n", s.socks, slabstat.socks); printf("TCP: %d (estab %d, closed %d, orphaned %d, synrecv %d, timewait %d/%d), ports %d\n", @@ -3543,8 +3552,6 @@ int main(int argc, char *argv[]) argc -= optind; argv += optind; - get_slabstat(&slabstat); - if (do_summary) { print_summary(); if (do_default && argc == 0)
prevent the read ahead of /proc/slabinfo in ss. Signed-off-by: Bryton Lee <brytonlee01@gmail.com> --- misc/ss.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)