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/alarm.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/alarm.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/cpukit/posix/src/alarm.c b/cpukit/posix/src/alarm.c index 71097554c7..1f3151b919 100644 --- a/cpukit/posix/src/alarm.c +++ b/cpukit/posix/src/alarm.c @@ -1,7 +1,8 @@ /* * 3.4.1 Schedule Alarm, P1003.1b-1993, p. 79 - * - * COPYRIGHT (c) 1989-1999. + */ + +/* COPYRIGHT (c) 1989-2007. * On-Line Applications Research Corporation (OAR). * * The license and distribution terms for this file may be @@ -16,7 +17,6 @@ #endif #include <pthread.h> -/* #include <errno.h> */ #include <rtems/system.h> #include <rtems/posix/pthread.h> @@ -69,12 +69,9 @@ unsigned int alarm( * this. */ - remaining = the_timer->initial; - remaining -= (the_timer->stop_time - the_timer->start_time); - - /* remaining is now in ticks */ - remaining *= _TOD_Microseconds_per_tick; - remaining /= TOD_MICROSECONDS_PER_SECOND; + remaining = the_timer->initial - + ((the_timer->stop_time - the_timer->start_time) / + TOD_TICKS_PER_SECOND); break; } } |