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

Merge branch 'master' of git+ssh://busybox.net/var/lib/git/busybox

Browse Source
This commit is contained in:
Denys Vlasenko 2012-06-14 17:30:04 +02:00
commit 604499e5a9
2 changed files with 30 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
miscutils/nandwrite.c
View File

@ -129,7 +129,7 @@ int nandwrite_main(int argc UNUSED_PARAM, char **argv)
xmove_fd(tmp_fd, IS_NANDDUMP ? STDOUT_FILENO : STDIN_FILENO); xmove_fd(tmp_fd, IS_NANDDUMP ? STDOUT_FILENO : STDIN_FILENO);
} }
fd = xopen(argv[0], O_RDWR); fd = xopen(argv[0], IS_NANDWRITE ? O_RDWR : O_RDONLY);
xioctl(fd, MEMGETINFO, &meminfo); xioctl(fd, MEMGETINFO, &meminfo);
mtdoffset = xstrtou(opt_s, 0); mtdoffset = xstrtou(opt_s, 0);

40
procps/ps.c
View File

@ -69,6 +69,31 @@
/* Absolute maximum on output line length */ /* Absolute maximum on output line length */
enum { MAX_WIDTH = 2*1024 }; enum { MAX_WIDTH = 2*1024 };
#if ENABLE_FEATURE_PS_TIME || ENABLE_FEATURE_PS_LONG
static long get_uptime(void)
{
#ifdef __linux__
struct sysinfo info;
if (sysinfo(&info) < 0)
return 0;
return info.uptime;
#elif 1
char buf[64];
long uptime;
if (open_read_close("/proc/uptime", buf, sizeof(buf)) <= 0)
bb_perror_msg_and_die("can't read %s", "/proc/uptime");
buf[sizeof(buf)-1] = '\0';
sscanf(buf, "%l", &uptime);
return uptime;
#else
struct timespec ts;
if (clock_gettime(CLOCK_MONOTONIC, &ts) < 0)
return 0;
return ts.tv_sec;
#endif
}
#endif
#if ENABLE_DESKTOP #if ENABLE_DESKTOP
#include <sys/times.h> /* for times() */ #include <sys/times.h> /* for times() */
@ -197,8 +222,6 @@ static inline unsigned get_HZ_by_waiting(void)
static unsigned get_kernel_HZ(void) static unsigned get_kernel_HZ(void)
{ {
//char buf[64];
struct sysinfo info;
if (kernel_HZ) if (kernel_HZ)
return kernel_HZ; return kernel_HZ;
@ -208,12 +231,7 @@ static unsigned get_kernel_HZ(void)
if (kernel_HZ == (unsigned)-1) if (kernel_HZ == (unsigned)-1)
kernel_HZ = get_HZ_by_waiting(); kernel_HZ = get_HZ_by_waiting();
//if (open_read_close("/proc/uptime", buf, sizeof(buf)) <= 0) seconds_since_boot = get_uptime();
// bb_perror_msg_and_die("can't read %s", "/proc/uptime");
//buf[sizeof(buf)-1] = '\0';
///sscanf(buf, "%llu", &seconds_since_boot);
sysinfo(&info);
seconds_since_boot = info.uptime;
return kernel_HZ; return kernel_HZ;
} }
@ -635,7 +653,7 @@ int ps_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
}; };
#if ENABLE_FEATURE_PS_LONG #if ENABLE_FEATURE_PS_LONG
time_t now = now; time_t now = now;
struct sysinfo info; long uptime;
#endif #endif
int opts = 0; int opts = 0;
/* If we support any options, parse argv */ /* If we support any options, parse argv */
@ -695,7 +713,7 @@ int ps_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
puts("S UID PID PPID VSZ RSS TTY STIME TIME CMD"); puts("S UID PID PPID VSZ RSS TTY STIME TIME CMD");
#if ENABLE_FEATURE_PS_LONG #if ENABLE_FEATURE_PS_LONG
now = time(NULL); now = time(NULL);
sysinfo(&info); uptime = get_uptime();
#endif #endif
} }
else { else {
@ -727,7 +745,7 @@ int ps_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
char tty[2 * sizeof(int)*3 + 2]; char tty[2 * sizeof(int)*3 + 2];
char *endp; char *endp;
unsigned sut = (p->stime + p->utime) / 100; unsigned sut = (p->stime + p->utime) / 100;
unsigned elapsed = info.uptime - (p->start_time / 100); unsigned elapsed = uptime - (p->start_time / 100);
time_t start = now - elapsed; time_t start = now - elapsed;
struct tm *tm = localtime(&start); struct tm *tm = localtime(&start);