fdo-mirrors/libinput
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libinput/libinput.git synced 2026-02-04 14:00:29 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

util: move libinput_now() into a utility function

Browse source 
Part-of: <https://gitlab.freedesktop.org/libinput/libinput/-/merge_requests/1067>
This commit is contained in:
Peter Hutterer 2024-10-21 11:07:14 +10:00 • committed by Marge Bot
parent d3922661ba
commit 02f5faf6f6
2 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/libinput-private.h
View file

@ -836,14 +836,15 @@ switch_notify_toggle(struct libinput_device *device,
static inline uint64_t
libinput_now(struct libinput *libinput)
{
struct timespec ts = { 0, 0 };
uint64_t now;
int rc = now_in_us(&now);
if (clock_gettime(CLOCK_MONOTONIC, &ts) != 0) {
log_error(libinput, "clock_gettime failed: %s\n", strerror(errno));
if (rc < 0) {
log_error(libinput, "clock_gettime failed: %s\n", strerror(-rc));
return 0;
}
return s2us(ts.tv_sec) + ns2us(ts.tv_nsec);
return now;
}
static inline struct device_float_coords

15
src/util-time.h
View file

@ -26,6 +26,7 @@
#include "config.h"
#include <assert.h>
#include <errno.h>
#include <time.h>
#include <stdint.h>
#include <unistd.h>
@ -98,6 +99,20 @@ us2tv(uint64_t time)
return tv;
}
static inline int
now_in_us(uint64_t *us)
{
struct timespec ts = { 0, 0 };
if (clock_gettime(CLOCK_MONOTONIC, &ts) != 0) {
*us = 0;
return -errno;
}
*us = s2us(ts.tv_sec) + ns2us(ts.tv_nsec);
return 0;
}
struct human_time {
unsigned int value;
const char *unit;