X-Git-Url: https://git.xinqibao.xyz/slstatus.git/blobdiff_plain/ee5ec756218c852385c5ba5ef0f75b47ba59ec39..ae8a658d0cf8f12e6633447a53a75d2583b94d46:/components/uptime.c diff --git a/components/uptime.c b/components/uptime.c index 981f3cd..7c23c98 100644 --- a/components/uptime.c +++ b/components/uptime.c @@ -1,61 +1,33 @@ /* See LICENSE file for copyright and license details. */ +#include #include +#include #include "../util.h" +#if defined(CLOCK_BOOTTIME) + #define UPTIME_FLAG CLOCK_BOOTTIME +#elif defined(CLOCK_UPTIME) + #define UPTIME_FLAG CLOCK_UPTIME +#else + #define UPTIME_FLAG CLOCK_MONOTONIC +#endif + const char * -format(int uptime) +uptime(void) { - int h, m; - - h = uptime / 3600; - m = (uptime - h * 3600) / 60; - - return bprintf("%dh %dm", h, m); -} - -#if defined(__linux__) - #include - - const char * - uptime(void) - { - int uptime; - struct sysinfo info; - - sysinfo(&info); - uptime = info.uptime; - - return format(uptime); + char warn_buf[256]; + uintmax_t h, m; + struct timespec uptime; + + if (clock_gettime(UPTIME_FLAG, &uptime) < 0) { + snprintf(warn_buf, 256, "clock_gettime %d", UPTIME_FLAG); + warn(warn_buf); + return NULL; } -#elif defined(__OpenBSD__) - #include - #include - #include - #include - const char * - uptime(void) - { - int mib[2], uptime; - size_t size; - time_t now; - struct timeval boottime; + h = uptime.tv_sec / 3600; + m = uptime.tv_sec % 3600 / 60; - time(&now); - - mib[0] = CTL_KERN; - mib[1] = KERN_BOOTTIME; - - size = sizeof(boottime); - - if (sysctl(mib, 2, &boottime, &size, NULL, 0) < 0) { - fprintf(stderr, "sysctl 'KERN_BOOTTIME': %s\n", strerror(errno)); - return NULL; - } - - uptime = now - boottime.tv_sec; - - return format(uptime); - } -#endif + return bprintf("%juh %jum", h, m); +}