core: replace core/timer.c by std::chrono

No point in reimplementing the wheel.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>

core/CMakeLists.txt

@@ -182,8 +182,6 @@ set(SUBSURFACE_CORE_LIB_SRCS
 	taxonomy.c
 	taxonomy.h
 	time.cpp
-	timer.c
-	timer.h
 	trip.c
 	trip.h
 	uemis-downloader.cpp

core/libdivecomputer.cpp

@@ -5,6 +5,7 @@
 #endif
 
 #include "ssrf.h"
+#include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -12,7 +13,7 @@
 #include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <fcntl.h>
+#include <chrono>
 #include "gettext.h"
 #include "divelog.h"
 #include "divesite.h"
@@ -26,7 +27,6 @@
 #include "event.h"
 #include "sha1.h"
 #include "subsurface-time.h"
-#include "timer.h"
 
 #include <libdivecomputer/version.h>
 #include <libdivecomputer/usbhid.h>
@@ -1205,28 +1205,22 @@ static std::string do_device_import(device_data_t *data)
 	return std::string();
 }
 
-static dc_timer_t *logfunc_timer = NULL;
 void logfunc(dc_context_t *, dc_loglevel_t loglevel, const char *file, unsigned int line, const char *function, const char *msg, void *userdata)
 {
 	const char *loglevels[] = { "NONE", "ERROR", "WARNING", "INFO", "DEBUG", "ALL" };
 
-	if (logfunc_timer == NULL)
+	static const auto start(std::chrono::steady_clock::now());
-		dc_timer_new(&logfunc_timer);
+	auto now(std::chrono::steady_clock::now());
+	double elapsed_seconds = std::chrono::duration<double>(now - start).count();
 
 	FILE *fp = (FILE *)userdata;
 
-	dc_usecs_t now = 0;
-	dc_timer_now(logfunc_timer, &now);
-
-	unsigned long seconds = now / 1000000;
-	unsigned long microseconds = now % 1000000;
-
 	if (loglevel == DC_LOGLEVEL_ERROR || loglevel == DC_LOGLEVEL_WARNING) {
-		fprintf(fp, "[%li.%06li] %s: %s [in %s:%d (%s)]\n",
+		fprintf(fp, "[%.6f] %s: %s [in %s:%d (%s)]\n",
-			seconds, microseconds,
+			elapsed_seconds,
 			loglevels[loglevel], msg, file, line, function);
 	} else {
-		fprintf(fp, "[%li.%06li] %s: %s\n", seconds, microseconds, loglevels[loglevel], msg);
+		fprintf(fp, "[%6f] %s: %s\n", elapsed_seconds, loglevels[loglevel], msg);
 	}
 }
 

core/timer.c

@@ -1,161 +0,0 @@
-/*
- * libdivecomputer
- *
- * Copyright (C) 2018 Jef Driesen
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301 USA
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <stdlib.h>
-
-#ifdef _WIN32
-#define NOGDI
-#include <windows.h>
-#else
-#include <time.h>
-#include <sys/time.h>
-#ifdef HAVE_MACH_MACH_TIME_H
-#include <mach/mach_time.h>
-#endif
-#endif
-
-#include "timer.h"
-
-struct dc_timer_t {
-#if defined (_WIN32)
-	LARGE_INTEGER timestamp;
-	LARGE_INTEGER frequency;
-#elif defined (HAVE_CLOCK_GETTIME)
-	struct timespec timestamp;
-#elif defined (HAVE_MACH_ABSOLUTE_TIME)
-	uint64_t timestamp;
-	mach_timebase_info_data_t info;
-#else
-	struct timeval timestamp;
-#endif
-};
-
-dc_status_t
-dc_timer_new (dc_timer_t **out)
-{
-	dc_timer_t *timer = NULL;
-
-	if (out == NULL)
-		return DC_STATUS_INVALIDARGS;
-
-	timer = (dc_timer_t *) malloc (sizeof (dc_timer_t));
-	if (timer == NULL) {
-		return DC_STATUS_NOMEMORY;
-	}
-
-#if defined (_WIN32)
-	if (!QueryPerformanceFrequency(&timer->frequency) ||
-		!QueryPerformanceCounter(&timer->timestamp)) {
-		free(timer);
-		return DC_STATUS_IO;
-	}
-#elif defined (HAVE_CLOCK_GETTIME)
-	if (clock_gettime(CLOCK_MONOTONIC, &timer->timestamp) != 0) {
-		free(timer);
-		return DC_STATUS_IO;
-	}
-#elif defined (HAVE_MACH_ABSOLUTE_TIME)
-	if (mach_timebase_info(&timer->info) != KERN_SUCCESS) {
-		free(timer);
-		return DC_STATUS_IO;
-	}
-
-	timer->timestamp = mach_absolute_time();
-#else
-	if (gettimeofday (&timer->timestamp, NULL) != 0) {
-		free(timer);
-		return DC_STATUS_IO;
-	}
-#endif
-
-	*out = timer;
-
-	return DC_STATUS_SUCCESS;
-}
-
-dc_status_t
-dc_timer_now (dc_timer_t *timer, dc_usecs_t *usecs)
-{
-	dc_status_t status = DC_STATUS_SUCCESS;
-	dc_usecs_t value = 0;
-
-	if (timer == NULL) {
-		status = DC_STATUS_INVALIDARGS;
-		goto out;
-	}
-
-#if defined (_WIN32)
-	LARGE_INTEGER now;
-	if (!QueryPerformanceCounter(&now)) {
-		status = DC_STATUS_IO;
-		goto out;
-	}
-
-	value = (now.QuadPart - timer->timestamp.QuadPart) * 1000000 / timer->frequency.QuadPart;
-#elif defined (HAVE_CLOCK_GETTIME)
-	struct timespec now, delta;
-	if (clock_gettime(CLOCK_MONOTONIC, &now) != 0) {
-		status = DC_STATUS_IO;
-		goto out;
-	}
-
-	if (now.tv_nsec < timer->timestamp.tv_nsec) {
-		delta.tv_nsec = 1000000000 + now.tv_nsec - timer->timestamp.tv_nsec;
-		delta.tv_sec = now.tv_sec - timer->timestamp.tv_sec - 1;
-	} else {
-		delta.tv_nsec = now.tv_nsec - timer->timestamp.tv_nsec;
-		delta.tv_sec = now.tv_sec - timer->timestamp.tv_sec;
-	}
-
-	value = (dc_usecs_t) delta.tv_sec * 1000000 + delta.tv_nsec / 1000;
-#elif defined (HAVE_MACH_ABSOLUTE_TIME)
-	uint64_t now = mach_absolute_time();
-	value = (now - timer->timestamp) * timer->info.numer / (timer->info.denom * 1000);
-#else
-	struct timeval now, delta;
-	if (gettimeofday (&now, NULL) != 0) {
-		status = DC_STATUS_IO;
-		goto out;
-	}
-
-	timersub (&now, &timer->timestamp, &delta);
-
-	value = (dc_usecs_t) delta.tv_sec * 1000000 + delta.tv_usec;
-#endif
-
-out:
-	if (usecs)
-		*usecs = value;
-
-	return status;
-}
-
-dc_status_t
-dc_timer_free (dc_timer_t *timer)
-{
-	free (timer);
-
-	return DC_STATUS_SUCCESS;
-}

core/timer.h

@@ -1,51 +0,0 @@
-/*
- * libdivecomputer
- *
- * Copyright (C) 2018 Jef Driesen
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301 USA
- */
-
-#ifndef DC_TIMER_H
-#define DC_TIMER_H
-
-#include <libdivecomputer/common.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#if defined (_WIN32) && !defined (__GNUC__)
-typedef unsigned __int64 dc_usecs_t;
-#else
-typedef unsigned long long dc_usecs_t;
-#endif
-
-typedef struct dc_timer_t dc_timer_t;
-
-dc_status_t
-dc_timer_new (dc_timer_t **timer);
-
-dc_status_t
-dc_timer_now (dc_timer_t *timer, dc_usecs_t *usecs);
-
-dc_status_t
-dc_timer_free (dc_timer_t *timer);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-#endif /* DC_TIMER_H */