From 46ab347b651f869025b3c5a351bc9e944c39985c Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Fri, 7 Mar 2025 20:33:18 +0100 Subject: Misc improvements MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattias Andrée --- src/systemtime.c | 68 ++++++++++++++++++++++++++------------------------------ 1 file changed, 31 insertions(+), 37 deletions(-) (limited to 'src/systemtime.c') diff --git a/src/systemtime.c b/src/systemtime.c index ac6d6e3..8ca845c 100644 --- a/src/systemtime.c +++ b/src/systemtime.c @@ -1,58 +1,52 @@ /* systemtime.c -- Portable system time source - This file is part of redshift-ng. - - redshift-ng is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - redshift-ng is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with redshift-ng. If not, see . - - Copyright (c) 2010-2014 Jon Lund Steffensen -*/ + * This file is part of redshift-ng. + * + * redshift-ng is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * redshift-ng is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with redshift-ng. If not, see . + * + * Copyright (c) 2010-2014 Jon Lund Steffensen + * Copyright (c) 2025 Mattias Andrée + */ #include "common.h" -/* Return current time in T as the number of seconds since the epoch. */ -int -systemtime_get_time(double *t) +double +systemtime_get_time(void) { -#if defined(WINDOWS) /* Windows */ +#if defined(WINDOWS) FILETIME now; ULARGE_INTEGER i; GetSystemTimeAsFileTime(&now); i.LowPart = now.dwLowDateTime; i.HighPart = now.dwHighDateTime; /* FILETIME is tenths of microseconds since 1601-01-01 UTC */ - *t = (i.QuadPart / 10000000.0) - 11644473600.0; + return (i.QuadPart / 10000000.0) - 11644473600.0; -#elif defined(_POSIX_TIMERS) /* POSIX timers */ +#elif defined(_POSIX_TIMERS) struct timespec now; - if (clock_gettime(CLOCK_REALTIME, &now)) { - weprintf("clock_gettime CLOCK_REALTIME:"); - return -1; - } - *t = now.tv_sec + (now.tv_nsec / 1000000000.0); + if (clock_gettime(CLOCK_REALTIME, &now)) + eprintf("clock_gettime CLOCK_REALTIME:"); + return now.tv_sec + (now.tv_nsec / 1000000000.0); -#else /* other platforms */ +#else struct timeval now; - if (gettimeofday(&now, NULL)) { - weprintf("gettimeofday:"); - return -1; - } - *t = now.tv_sec + (now.tv_usec / 1000000.0); + if (gettimeofday(&now, NULL)) + eprintf("gettimeofday:"); + return = now.tv_sec + (now.tv_usec / 1000000.0); #endif - - return 0; } -/* Sleep for a number of milliseconds. */ + void systemtime_msleep(unsigned int msecs) { -- cgit v1.2.3-70-g09d2