matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

lnstat: review lnstat_update() 

Instead of calling rewind() and fgets() before every call to
scan_lines(), move them into scan_lines() itself.

This should also fix compat mode, as before the second call to
scan_lines() the first line was skipped unconditionally.

Signed-off-by: Phil Sutter <phil@nwl.cc>
This commit is contained in:
Phil Sutter 2015-11-28 01:00:01 +01:00 committed by Stephen Hemminger
parent fc31817d1f
commit db3ef44c54
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
misc/lnstat_util.c
View File

@ -38,18 +38,22 @@
/* Read (and summarize for SMP) the different stats vars. */ /* Read (and summarize for SMP) the different stats vars. */
static int scan_lines(struct lnstat_file *lf, int i) static int scan_lines(struct lnstat_file *lf, int i)
{ {
char buf[FGETS_BUF_SIZE];
int j, num_lines = 0; int j, num_lines = 0;
for (j = 0; j < lf->num_fields; j++) for (j = 0; j < lf->num_fields; j++)
lf->fields[j].values[i] = 0; lf->fields[j].values[i] = 0;
while(!feof(lf->fp)) { rewind(lf->fp);
char buf[FGETS_BUF_SIZE]; /* skip first line */
if (!lf->compat && !fgets(buf, sizeof(buf)-1, lf->fp))
return -1;
while(!feof(lf->fp) && fgets(buf, sizeof(buf)-1, lf->fp)) {
char *ptr = buf; char *ptr = buf;
num_lines++; num_lines++;
fgets(buf, sizeof(buf)-1, lf->fp);
gettimeofday(&lf->last_read, NULL); gettimeofday(&lf->last_read, NULL);
for (j = 0; j < lf->num_fields; j++) { for (j = 0; j < lf->num_fields; j++) {
@ -81,7 +85,6 @@ static int time_after(struct timeval *last,
int lnstat_update(struct lnstat_file *lnstat_files) int lnstat_update(struct lnstat_file *lnstat_files)
{ {
struct lnstat_file *lf; struct lnstat_file *lf;
char buf[FGETS_BUF_SIZE];
struct timeval tv; struct timeval tv;
gettimeofday(&tv, NULL); gettimeofday(&tv, NULL);
@ -91,11 +94,6 @@ int lnstat_update(struct lnstat_file *lnstat_files)
int i; int i;
struct lnstat_field *lfi; struct lnstat_field *lfi;
rewind(lf->fp);
if (!lf->compat) {
/* skip first line */
fgets(buf, sizeof(buf)-1, lf->fp);
}
scan_lines(lf, 1); scan_lines(lf, 1);
for (i = 0, lfi = &lf->fields[i]; for (i = 0, lfi = &lf->fields[i];
@ -107,8 +105,6 @@ int lnstat_update(struct lnstat_file *lnstat_files)
/ lf->interval.tv_sec; / lf->interval.tv_sec;
} }
rewind(lf->fp);
fgets(buf, sizeof(buf)-1, lf->fp);
scan_lines(lf, 0); scan_lines(lf, 0);
} }
} }