Changeset 5d73509 in rtems

Timestamp:

05/18/21 09:28:08 (14 months ago)

Author:

Sebastian Huber <sebastian.huber@…>

Branches:

5

Children:

8d54187

Parents:

be5d2bc0

git-author:

Sebastian Huber <sebastian.huber@…> (05/18/21 09:28:08)

git-committer:

Sebastian Huber <sebastian.huber@…> (05/04/22 13:57:37)

Message:

posix: Fix use of clock for relative times

Close #4429.

File:

• cpukit/posix/src/nanosleep.c (modified) (3 diffs)

cpukit/posix/src/nanosleep.c

@@ -65 +65 @@
 {
   Thread_queue_Context   queue_context;
-  struct timespec        uptime;
+  struct timespec        now;
   const struct timespec *end;
   Thread_Control        *executing;
@@ -82 +82 @@
   if ( ( flags & TIMER_ABSTIME ) != 0 ) {
     end = rqtp;
+  } else {
+    if ( clock_id == CLOCK_REALTIME ) {
+      _Timecounter_Nanotime( &now );
+    } else {
+      _Timecounter_Nanouptime( &now );
+    }
 
-    if ( clock_id == CLOCK_REALTIME ) {
-      _Thread_queue_Context_set_enqueue_timeout_realtime_timespec(
-        &queue_context,
-        end
-      );
-    } else {
-      _Thread_queue_Context_set_enqueue_timeout_monotonic_timespec(
-        &queue_context,
-        end
-      );
-    }
+    end = _Watchdog_Future_timespec( &now, rqtp );
+  }
+
+  if ( clock_id == CLOCK_REALTIME ) {
+    _Thread_queue_Context_set_enqueue_timeout_realtime_timespec(
+      &queue_context,
+      end
+    );
   } else {
-    _Timecounter_Nanouptime( &uptime );
-    end = _Watchdog_Future_timespec( &uptime, rqtp );
     _Thread_queue_Context_set_enqueue_timeout_monotonic_timespec(
       &queue_context,
@@ -121 +122 @@
       struct timespec actual_end;
 
-      _Timecounter_Nanouptime( &actual_end );
+      if ( clock_id == CLOCK_REALTIME ) {
+        _Timecounter_Nanotime( &actual_end );
+      } else {
+        _Timecounter_Nanouptime( &actual_end );
+      }
 
       if ( _Timespec_Less_than( &actual_end, end ) ) {