diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2007-04-05 21:17:27 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2007-04-05 21:17:27 +0000 |
commit | 412dbff629308745d967718fbd91e272c91b055c (patch) | |
tree | 7fb92204e9ab59173a92e8950d633cc4b39e16ac /cpukit/posix/src/ualarm.c | |
parent | 2007-04-05 Joel Sherrill <joel@OARcorp.com> (diff) | |
download | rtems-412dbff629308745d967718fbd91e272c91b055c.tar.bz2 |
2007-04-05 Joel Sherrill <joel@OARcorp.com>
* posix/Makefile.am, posix/include/rtems/posix/time.h,
posix/src/adjtime.c, posix/src/alarm.c, posix/src/clockgetres.c,
posix/src/condtimedwait.c, posix/src/mqueuetimedreceive.c,
posix/src/mqueuetimedsend.c, posix/src/mutextimedlock.c,
posix/src/nanosleep.c, posix/src/posixtimespecabsolutetimeout.c,
posix/src/pthread.c, posix/src/pthreadcreate.c,
posix/src/pthreadsetschedparam.c, posix/src/ptimer1.c,
posix/src/sched.c, posix/src/semtimedwait.c,
posix/src/sigtimedwait.c, posix/src/ualarm.c,
rtems/src/clocktodtoseconds.c, score/Makefile.am,
score/preinstall.am, score/include/rtems/score/tod.h,
score/inline/rtems/score/tod.inl, score/src/coretod.c,
score/src/coretodget.c, score/src/coretodgetuptime.c,
score/src/coretodset.c, score/src/coretodtickle.c: Provide timespec
manipulation routines in the SuperCore. Use them everywhere possible.
This lead to significant cleanup in the API routines and eliminated
some of the same code from the POSIX API. At this point, the
SuperCore keeps time in POSIX timespec format properly from 1970. You
just cannot set it before 1988 in keeping with RTEMS traditional
behavior.
* score/include/rtems/score/timespec.h, score/src/timespecaddto.c,
score/src/timespecfromticks.c, score/src/timespecisvalid.c,
score/src/timespeclessthan.c, score/src/timespecsubtract.c,
score/src/timespectoticks.c: New files.
* posix/src/posixintervaltotimespec.c,
posix/src/posixtimespecsubtract.c,
posix/src/posixtimespectointerval.c: Removed.
Diffstat (limited to '')
-rw-r--r-- | cpukit/posix/src/ualarm.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/cpukit/posix/src/ualarm.c b/cpukit/posix/src/ualarm.c index d2b524ef5b..a5a8ee926b 100644 --- a/cpukit/posix/src/ualarm.c +++ b/cpukit/posix/src/ualarm.c @@ -1,7 +1,7 @@ /* - * XXX 3.4.1 Schedule Alarm, P1003.1b-1993, p. 79 + * 3.4.1 Schedule Alarm, P1003.1b-1993, p. 79 * - * COPYRIGHT (c) 1989-2003. + * COPYRIGHT (c) 1989-2007. * On-Line Applications Research Corporation (OAR). * * The license and distribution terms for this file may be @@ -75,12 +75,9 @@ useconds_t ualarm( ticks = the_timer->initial; ticks -= (the_timer->stop_time - the_timer->start_time); - /* remaining is now in ticks */ - ticks *= _TOD_Microseconds_per_tick; - ticks /= TOD_MICROSECONDS_PER_SECOND; - _POSIX_Interval_to_timespec( ticks, &tp ); + _Timespec_From_ticks( ticks, &tp ); remaining = tp.tv_sec * TOD_MICROSECONDS_PER_SECOND; remaining += tp.tv_nsec / 1000; break; @@ -89,8 +86,7 @@ useconds_t ualarm( tp.tv_sec = useconds / TOD_MICROSECONDS_PER_SECOND; tp.tv_nsec = (useconds % TOD_MICROSECONDS_PER_SECOND) * 1000; - ticks = _POSIX_Timespec_to_interval( &tp ); - _Watchdog_Insert_ticks( the_timer, ticks ); + _Watchdog_Insert_ticks( the_timer, _Timespec_To_ticks( &tp ) ); return remaining; } |