openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

am 9d1de8a8: am 0e23a3d4: am 215f78ae: Merge "toolbox: uptime: use clock_gettime() on devices without /dev/alarm" 

* commit '9d1de8a81240e6ede714e8ee67cb079132b3e6de':
  toolbox: uptime: use clock_gettime() on devices without /dev/alarm
This commit is contained in:
Greg Hackmann 2013-12-18 00:28:48 +00:00 committed by Android Git Automerger
parent e75af57454 9d1de8a812
commit 07dbb562a8
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
toolbox/uptime.c
View File

@ -54,17 +54,27 @@ static void format_time(int time, char* buffer) {
sprintf(buffer, "%02d:%02d:%02d", hours, minutes, seconds);
}
int64_t elapsedRealtime()
static int elapsedRealtimeAlarm(struct timespec *ts)
{
struct timespec ts;
int fd, result;
fd = open("/dev/alarm", O_RDONLY);
if (fd < 0)
return fd;
result = ioctl(fd, ANDROID_ALARM_GET_TIME(ANDROID_ALARM_ELAPSED_REALTIME), &ts);
close(fd);
result = ioctl(fd, ANDROID_ALARM_GET_TIME(ANDROID_ALARM_ELAPSED_REALTIME), ts);
close(fd);
return result;
}
int64_t elapsedRealtime()
{
struct timespec ts;
int result = elapsedRealtimeAlarm(&ts);
if (result < 0)
result = clock_gettime(CLOCK_BOOTTIME, &ts);
if (result == 0)
return ts.tv_sec;