Merge branch 'lsclocks/ptp' of https://github.com/t-8ch/util-linux

* 'lsclocks/ptp' of https://github.com/t-8ch/util-linux: lsclocks: fix dynamic clock ids
karelzak · Dec 26, 2024 · 4e14b57 · 4e14b57
2 parents 3645384 + 63102b8
commit 4e14b57
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/misc-utils/lsclocks.c b/misc-utils/lsclocks.c
@@ -40,6 +40,13 @@
 #include "all-io.h"
 #include "list.h"
 
+#define CLOCKFD 3
+
+static inline clockid_t FD_TO_CLOCKID(int fd)
+{
+	return (~(unsigned int) fd << 3) | CLOCKFD;
+}
+
 #ifndef CLOCK_REALTIME
 #define CLOCK_REALTIME			0
 #endif
@@ -380,6 +387,7 @@ static void add_dynamic_clock_from_path(struct libscols_table *tb,
 
 	struct clockinfo clockinfo = {
 		.type = CT_PTP,
+		.id = FD_TO_CLOCKID(fd),
 		.no_id = true,
 		.id_name = path,
 		.name = path,