Changeset f48c9068 in rtems

Timestamp:

08/13/96 14:24:00 (27 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

85f5b4ab

Parents:

aac34f7b

Message:

removed errors for TOD not set yet.

made nanosleep return -1/EINTR for being interrupted for a signal.

Files:

• c/src/exec/posix/src/time.c (modified) (4 diffs)
• cpukit/posix/src/time.c (modified) (4 diffs)

c/src/exec/posix/src/time.c

@@ -172 +172 @@
 
     case CLOCK_REALTIME:
-#if 0
-      if ( !_TOD_Is_set() )    /* XXX does posix allow it to not be set? */
-        set_errno_and_return_minus_one( EINVAL );
-#endif
  
       _ISR_Disable( level );
@@ -267 +263 @@
     set_errno_and_return_minus_one( EINVAL );
  
-/* XXX this is interruptible by a posix signal */
-
   ticks = _POSIX_Timespec_to_interval( rqtp );
 
@@ -293 +287 @@
     _Watchdog_Initialize(
       &_Thread_Executing->Timer,
-      _Thread_Delay_ended,          /* XXX may need to be POSIX specific */
+      _Thread_Delay_ended,
       _Thread_Executing->Object.id,
       NULL
@@ -307 +301 @@
 
     _POSIX_Interval_to_timespec( ticks, rmtp );
-  }
-
-  return 0;                    /* XXX should account for signal */
-
+
+    /*
+     *  If there is time remaining, then we were interrupted by a signal.
+     */
+
+    if ( ticks )
+      set_errno_and_return_minus_one( EINTR );
+  }
+
+  return 0;
 }
 

cpukit/posix/src/time.c

@@ -172 +172 @@
 
     case CLOCK_REALTIME:
-#if 0
-      if ( !_TOD_Is_set() )    /* XXX does posix allow it to not be set? */
-        set_errno_and_return_minus_one( EINVAL );
-#endif
  
       _ISR_Disable( level );
@@ -267 +263 @@
     set_errno_and_return_minus_one( EINVAL );
  
-/* XXX this is interruptible by a posix signal */
-
   ticks = _POSIX_Timespec_to_interval( rqtp );
 
@@ -293 +287 @@
     _Watchdog_Initialize(
       &_Thread_Executing->Timer,
-      _Thread_Delay_ended,          /* XXX may need to be POSIX specific */
+      _Thread_Delay_ended,
       _Thread_Executing->Object.id,
       NULL
@@ -307 +301 @@
 
     _POSIX_Interval_to_timespec( ticks, rmtp );
-  }
-
-  return 0;                    /* XXX should account for signal */
-
+
+    /*
+     *  If there is time remaining, then we were interrupted by a signal.
+     */
+
+    if ( ticks )
+      set_errno_and_return_minus_one( EINTR );
+  }
+
+  return 0;
 }