summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElliott Hughes2015-08-17 12:49:42 -0500
committerElliott Hughes2015-08-17 12:49:42 -0500
commit49ef9c0fc05c94e45b05ee68957a6cf26a008f4f (patch)
tree28780a3f82aa6b41fe41ebc8f9038f14dff5be8c /toolbox
parent428f626d1ba9819156549c4ce5b044aadbda014b (diff)
downloadplatform-system-core-49ef9c0fc05c94e45b05ee68957a6cf26a008f4f.tar.gz
platform-system-core-49ef9c0fc05c94e45b05ee68957a6cf26a008f4f.tar.xz
platform-system-core-49ef9c0fc05c94e45b05ee68957a6cf26a008f4f.zip
Lose uptime to toybox.
Let's see if anyone actually needs the non-POSIX information... Change-Id: I0bb63b3a81f6295d281a661bd941a26fef675598
Diffstat (limited to 'toolbox')
-rw-r--r--toolbox/Android.mk1
-rw-r--r--toolbox/uptime.c87
2 files changed, 0 insertions, 88 deletions
diff --git a/toolbox/Android.mk b/toolbox/Android.mk
index 2ae7ed296..24f702f34 100644
--- a/toolbox/Android.mk
+++ b/toolbox/Android.mk
@@ -53,7 +53,6 @@ OUR_TOOLS := \
53 start \ 53 start \
54 stop \ 54 stop \
55 top \ 55 top \
56 uptime \
57 56
58ALL_TOOLS = $(BSD_TOOLS) $(OUR_TOOLS) 57ALL_TOOLS = $(BSD_TOOLS) $(OUR_TOOLS)
59 58
diff --git a/toolbox/uptime.c b/toolbox/uptime.c
deleted file mode 100644
index ebfb15e5a..000000000
--- a/toolbox/uptime.c
+++ /dev/null
@@ -1,87 +0,0 @@
1/*
2 * Copyright (c) 2010, The Android Open Source Project
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above copyright
11 * notice, this list of conditions and the following disclaimer in
12 * the documentation and/or other materials provided with the
13 * distribution.
14 * * Neither the name of Google, Inc. nor the names of its contributors
15 * may be used to endorse or promote products derived from this
16 * software without specific prior written permission.
17 *
18 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
19 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
20 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
21 * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
22 * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
23 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
24 * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
25 * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
26 * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
27 * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
28 * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
29 * SUCH DAMAGE.
30 */
31
32#include <errno.h>
33#include <stdio.h>
34#include <string.h>
35#include <time.h>
36
37static void format_time(int time, char* buffer) {
38 int seconds = time % 60;
39 time /= 60;
40 int minutes = time % 60;
41 time /= 60;
42 int hours = time % 24;
43 int days = time / 24;
44
45 if (days > 0) {
46 sprintf(buffer, "%d day%s, %02d:%02d:%02d", days, (days == 1) ? "" : "s", hours, minutes, seconds);
47 } else {
48 sprintf(buffer, "%02d:%02d:%02d", hours, minutes, seconds);
49 }
50}
51
52int uptime_main(int argc __attribute__((unused)), char *argv[] __attribute__((unused))) {
53 FILE* file = fopen("/proc/uptime", "r");
54 if (!file) {
55 fprintf(stderr, "Could not open /proc/uptime\n");
56 return -1;
57 }
58 float idle_time;
59 if (fscanf(file, "%*f %f", &idle_time) != 1) {
60 fprintf(stderr, "Could not parse /proc/uptime\n");
61 fclose(file);
62 return -1;
63 }
64 fclose(file);
65
66 struct timespec up_timespec;
67 if (clock_gettime(CLOCK_MONOTONIC, &up_timespec) == -1) {
68 fprintf(stderr, "Could not get monotonic time: %s\n", strerror(errno));
69 return -1;
70 }
71 float up_time = up_timespec.tv_sec + up_timespec.tv_nsec / 1e9;
72
73 struct timespec elapsed_timespec;
74 if (clock_gettime(CLOCK_BOOTTIME, &elapsed_timespec) == -1) {
75 fprintf(stderr, "Could not get boot time: %s\n", strerror(errno));
76 return -1;
77 }
78 int elapsed = elapsed_timespec.tv_sec;
79
80 char up_string[100], idle_string[100], sleep_string[100];
81 format_time(elapsed, up_string);
82 format_time((int)idle_time, idle_string);
83 format_time((int)(elapsed - up_time), sleep_string);
84 printf("up time: %s, idle time: %s, sleep time: %s\n", up_string, idle_string, sleep_string);
85
86 return 0;
87}