fastfetch-cli/fastfetch
1
0
Fork 0
mirror of https://github.com/fastfetch-cli/fastfetch.git synced 2026-09-13 02:42:09 +02:00
Code Issues Packages Projects Releases 10 Wiki Activity

Uptime: add ffTimeGetNow() and use it

Browse Source
This commit is contained in:
李通洲
2023-09-12 14:50:38 +08:00
parent 2251086c0f
commit f3ec60a061
4 changed files with 29 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/common/time.h
+14
View File
@@ -7,6 +7,7 @@
#ifdef _WIN32
#include <synchapi.h>
#include <profileapi.h>
#include <sysinfoapi.h>
#else
#include <time.h>
#endif
@@ -26,6 +27,19 @@ static inline uint64_t ffTimeGetTick() //In msec
#endif
}
static inline uint64_t ffTimeGetNow()
{
#ifdef _WIN32
uint64_t timeNow;
GetSystemTimeAsFileTime((FILETIME*) &timeNow);
return (timeNow - 116444736000000000ull) / 10000ull;
#else
struct timespec timeNow;
clock_gettime(CLOCK_REALTIME, &timeNow);
return (uint64_t)((timeNow.tv_sec * 1000) + (timeNow.tv_nsec / 1000000));
#endif
}
static inline void ffTimeSleep(uint32_t msec)
{
#ifdef _WIN32
src/detection/uptime/uptime_bsd.c
+11 -21
View File
@@ -1,31 +1,21 @@
#include "uptime.h"
#include "common/time.h"
#include <time.h>
#include <sys/sysctl.h>
#include <sys/time.h>
const char* ffDetectUptime(FFUptimeResult* result)
{
{
struct timeval bootTime;
size_t bootTimeSize = sizeof(bootTime);
if(sysctl(
(int[]) {CTL_KERN, KERN_BOOTTIME}, 2,
&bootTime, &bootTimeSize,
NULL, 0
) != 0)
return "sysctl({CTL_KERN, KERN_BOOTTIME}) failed";
struct timeval bootTime;
size_t bootTimeSize = sizeof(bootTime);
if(sysctl(
(int[]) {CTL_KERN, KERN_BOOTTIME}, 2,
&bootTime, &bootTimeSize,
NULL, 0
) != 0)
return "sysctl({CTL_KERN, KERN_BOOTTIME}) failed";
result->bootTime = (uint64_t) bootTime.tv_sec * 1000 + (uint64_t) bootTime.tv_usec / 1000;
}
{
struct timespec realTime;
if(clock_gettime(CLOCK_REALTIME, &realTime) != 0)
return "clock_gettime(CLOCK_REALTIME) failed";
uint64_t now = (uint64_t) realTime.tv_sec * 1000 + (uint64_t) realTime.tv_nsec / 1000000;
result->uptime = now - result->bootTime;
}
result->bootTime = (uint64_t) bootTime.tv_sec * 1000 + (uint64_t) bootTime.tv_usec / 1000;
result->uptime = ffTimeGetNow() - result->bootTime;
return NULL;
}
src/detection/uptime/uptime_linux.c
+2 -7
View File
@@ -1,6 +1,5 @@
#include "uptime.h"
#include <time.h>
#include "common/time.h"
const char* ffDetectUptime(FFUptimeResult* result)
{
@@ -10,11 +9,7 @@ const char* ffDetectUptime(FFUptimeResult* result)
result->uptime = (uint64_t) uptime.tv_sec * 1000 + (uint64_t) uptime.tv_nsec / 1000000;
struct timespec realTime;
if(clock_gettime(CLOCK_REALTIME, &realTime) != 0)
return "clock_gettime(CLOCK_REALTIME) failed";
result->bootTime = (uint64_t) realTime.tv_sec * 1000 + (uint64_t) realTime.tv_nsec / 1000000 + result->uptime;
result->bootTime = ffTimeGetNow() + result->uptime;
return NULL;
}
src/detection/uptime/uptime_windows.c
+2 -9
View File
@@ -1,18 +1,11 @@
#include "uptime.h"
#include "common/time.h"
#include <sysinfoapi.h>
static inline uint64_t to_ms(uint64_t ret)
{
ret -= 116444736000000000ull;
return ret / 10000ull;
}
const char* ffDetectUptime(FFUptimeResult* result)
{
result->uptime = GetTickCount64();
FILETIME fileTime;
GetSystemTimeAsFileTime(&fileTime);
result->bootTime = to_ms(*(uint64_t*) &fileTime) - result->uptime;
result->bootTime = ffTimeGetNow() - result->uptime;
return NULL;
}