emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

restore change by Denis Vlasenko: file_to_buf must vary fast, best if inline

Browse Source
This commit is contained in:
"Vladimir N. Oleynik" 2006-02-14 10:36:38 +00:00
parent 465300ced9
commit 3afdfecf7e
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
procps/top.c
View File

@ -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; int sz;
if (fd == -1) { if (fd == -1) {
@ -142,13 +142,12 @@ static int file_to_buf(char *buf, int bufsize, char *filename, int *d)
} else { } else {
lseek(fd, 0L, SEEK_SET); lseek(fd, 0L, SEEK_SET);
} }
sz = read(fd, buf, bufsize - 1); sz = read(fd, buf, file_to_buf_bufsize - 1);
if (sz < 0) { if (sz < 0) {
bb_perror_msg_and_die("%s", filename); bb_perror_msg_and_die("%s", filename);
} }
buf[sz] = '\0'; buf[sz] = '\0';
*d = fd; return fd;
return sz;
} }
static void init_Hertz_value(void) 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; if(smp_num_cpus<1) smp_num_cpus=1;
do { do {
file_to_buf(buf, sizeof(buf), "uptime", &uptime_fd); uptime_fd = file_to_buf(buf, "uptime", uptime_fd);
up_1 = strtod(buf, 0); 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); 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); up_2 = strtod(buf, 0);
} while((long)( (up_2-up_1)*1000.0/up_1 )); /* want under 0.1% error */ } while((long)( (up_2-up_1)*1000.0/up_1 )); /* want under 0.1% error */
close(uptime_fd); close(uptime_fd);