Changeset 6b1d0879 in mainline

Timestamp:

2026-08-14T12:02:04Z (25 hours ago)

Author:

GitHub <noreply@…>

Parents:

48cc66f (diff), 163eccd7 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Matej Volf <mat.volfik@…> (2026-08-14 12:02:04)

git-committer:

GitHub <noreply@…> (2026-08-14 12:02:04)

Message:

Merge 163eccd733cf583a9e5131065a37ca2fcc8634e4 into 48cc66faec96bc448eb5c1a946b6c0f2f7890b04

Location:

uspace/lib/posix

Files:

• include/posix/time.h (modified) (1 diff)
• src/time.c (modified) (5 diffs)

uspace/lib/posix/include/posix/time.h

@@ -42 +42 @@
 
 #define CLOCK_REALTIME ((clockid_t) 0)
+#define CLOCK_MONOTONIC ((clockid_t) 1)
 
 #define ASCTIME_BUF_LEN  26

uspace/lib/posix/src/time.c

@@ -206 +206 @@
 
 /**
- * Get clock resolution. Only CLOCK_REALTIME is supported.
+ * Get clock resolution.
  *
  * @param clock_id Clock ID.
@@ -218 +218 @@
         switch (clock_id) {
         case CLOCK_REALTIME:
+        case CLOCK_MONOTONIC:
                 res->tv_sec = 0;
                 res->tv_nsec = USEC2NSEC(1); /* Microsecond resolution. */
@@ -228 +229 @@
 
 /**
- * Get time. Only CLOCK_REALTIME is supported.
+ * Get time.
  *
  * @param clock_id ID of the clock to query.
@@ -246 +247 @@
                 tp->tv_nsec = USEC2NSEC(tv.tv_usec);
                 return 0;
+        case CLOCK_MONOTONIC:
+                getuptime(tp);
+                return 0;
         default:
                 errno = EINVAL;
@@ -267 +271 @@
         switch (clock_id) {
         case CLOCK_REALTIME:
+        case CLOCK_MONOTONIC:
                 // TODO: setting clock
                 // FIXME: HelenOS doesn't actually support hardware