summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author"Vladimir N. Oleynik"2006-02-14 10:36:38 +0000
committer"Vladimir N. Oleynik"2006-02-14 10:36:38 +0000
commit3afdfecf7ed6c5cd21837b2354128d107808ca43 (patch)
tree2d4f51d99c7f82a40a46dab93c088987bfefa038
parent465300ced9320a4e8bdf9db00fd4f8e0a35e4a4c (diff)
downloadbusybox-3afdfecf7ed6c5cd21837b2354128d107808ca43.zip
busybox-3afdfecf7ed6c5cd21837b2354128d107808ca43.tar.gz
restore change by Denis Vlasenko: file_to_buf must vary fast, best if inline
-rw-r--r--procps/top.c15
1 files changed, 7 insertions, 8 deletions
diff --git a/procps/top.c b/procps/top.c
index 17addd0..f2e798b 100644
--- a/procps/top.c
+++ b/procps/top.c
@@ -130,9 +130,9 @@ static unsigned long Hertz;
*
*/
-static int file_to_buf(char *buf, int bufsize, char *filename, int *d)
+#define file_to_buf_bufsize 80
+static inline int file_to_buf(char *buf, const char *filename, int fd)
{
- int fd = *d;
int sz;
if (fd == -1) {
@@ -142,13 +142,12 @@ static int file_to_buf(char *buf, int bufsize, char *filename, int *d)
} else {
lseek(fd, 0L, SEEK_SET);
}
- sz = read(fd, buf, bufsize - 1);
+ sz = read(fd, buf, file_to_buf_bufsize - 1);
if (sz < 0) {
bb_perror_msg_and_die("%s", filename);
}
buf[sz] = '\0';
- *d = fd;
- return sz;
+ return fd;
}
static void init_Hertz_value(void)
@@ -165,11 +164,11 @@ static void init_Hertz_value(void)
if(smp_num_cpus<1) smp_num_cpus=1;
do {
- file_to_buf(buf, sizeof(buf), "uptime", &uptime_fd);
+ uptime_fd = file_to_buf(buf, "uptime", uptime_fd);
up_1 = strtod(buf, 0);
- file_to_buf(buf, sizeof(buf), "stat", &stat_fd);
+ stat_fd = file_to_buf(buf, "stat", stat_fd);
sscanf(buf, "cpu %lu %lu %lu %lu", &user_j, &nice_j, &sys_j, &other_j);
- file_to_buf(buf, sizeof(buf), "uptime", &uptime_fd);
+ uptime_fd = file_to_buf(buf, "uptime", uptime_fd);
up_2 = strtod(buf, 0);
} while((long)( (up_2-up_1)*1000.0/up_1 )); /* want under 0.1% error */
close(uptime_fd);