library: some tweaks to 2 file read functions, 3rd gen
Ever since their introduction, plus continuing through several evolutions, both the meminfo and vmstat 'read' functions employed a 'do while' loop for /proc access. However, that loop construct was wrong since identical tests were already done (twice!) within each loop body itself, then accompanied by its own 'break' statement. So, we will now transform them both into forever loops which will help us to emphasize such break statements. [ plus, let's return an error should nothing be read ] [ lastly, eliminate 1 erroneous PROCPS_EXPORT prefix ] Reference(s): . original meminfo introduction commita20e88e4e7. original vmstat introduction commita410e236abSigned-off-by: Jim Warner <james.warner@comcast.net>
This commit is contained in:
@@ -995,11 +995,11 @@ static int read_vmstat_failed (
|
||||
break;
|
||||
}
|
||||
if (size == 0)
|
||||
return 0;
|
||||
return -1;
|
||||
buf[size] = '\0';
|
||||
|
||||
head = buf;
|
||||
do {
|
||||
for (;;) {
|
||||
static ENTRY e; // just to keep coverity off our backs (e.data)
|
||||
ENTRY *ep;
|
||||
|
||||
@@ -1022,7 +1022,7 @@ static int read_vmstat_failed (
|
||||
break;
|
||||
|
||||
head = tail + 1;
|
||||
} while(tail);
|
||||
}
|
||||
|
||||
// let's not distort the deltas the first time thru ...
|
||||
if (!info->vmstat_was_read)
|
||||
|
||||
Reference in New Issue
Block a user