RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

2008-08-19 Tim FitzGeorge <tim.fitzgeorge@astrium.eads.net>

Browse Source 
PR 1296/cpukit.
	* posix/src/timersettime.c: POSIX timers use incorrect repeat interval.
	This patch fixes the following problems in timer_settime: 1) Uses
	value.it_interval for repeat period. 2) Corrects test for incorrect
	value of it_value.tv_nsec (should reject 1000000000).
This commit is contained in:
Joel Sherrill
2008-08-19 14:45:15 +00:00
parent ea0586b1a1
commit 753c05ab02
2 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cpukit/ChangeLog
View File

@@ -1,3 +1,11 @@
2008-08-19 Tim FitzGeorge <tim.fitzgeorge@astrium.eads.net>
PR 1296/cpukit.
* posix/src/timersettime.c: POSIX timers use incorrect repeat interval.
This patch fixes the following problems in timer_settime: 1) Uses
value.it_interval for repeat period. 2) Corrects test for incorrect
value of it_value.tv_nsec (should reject 1000000000).
2008-08-19 Joel Sherrill <joel.sherrill@OARcorp.com> 2008-08-19 Joel Sherrill <joel.sherrill@OARcorp.com>
* score/inline/rtems/score/threadmp.inl: Add include of * score/inline/rtems/score/threadmp.inl: Add include of

15
cpukit/posix/src/timersettime.c
View File

@@ -36,14 +36,17 @@ int timer_settime(
POSIX_Timer_Control *ptimer; POSIX_Timer_Control *ptimer;
Objects_Locations location; Objects_Locations location;
boolean activated; boolean activated;
uint32_t initial_period;
struct itimerspec normalize; struct itimerspec normalize;
if ( !value ) if ( !value )
rtems_set_errno_and_return_minus_one( EINVAL ); rtems_set_errno_and_return_minus_one( EINVAL );
/* First, it verifies if the structure "value" is correct */ /* First, it verifies if the structure "value" is correct */
if ( ( value->it_value.tv_nsec > TOD_NANOSECONDS_PER_SECOND ) || if ( ( value->it_value.tv_nsec >= TOD_NANOSECONDS_PER_SECOND ) ||
( value->it_value.tv_nsec < 0 ) ) { ( value->it_value.tv_nsec < 0 ) ||
( value->it_interval.tv_nsec >= TOD_NANOSECONDS_PER_SECOND) ||
( value->it_interval.tv_nsec < 0 )) {
/* The number of nanoseconds is not correct */ /* The number of nanoseconds is not correct */
rtems_set_errno_and_return_minus_one( EINVAL ); rtems_set_errno_and_return_minus_one( EINVAL );
} }
@@ -57,7 +60,7 @@ int timer_settime(
/* Convert absolute to relative time */ /* Convert absolute to relative time */
if (flags == TIMER_ABSTIME) { if (flags == TIMER_ABSTIME) {
/* Check for seconds in the past */ /* Check for seconds in the past */
if ( _Timespec_Greater_than( &normalize.it_value, &_TOD_Now ) ) if ( _Timespec_Greater_than( &_TOD_Now, &normalize.it_value ) )
rtems_set_errno_and_return_minus_one( EINVAL ); rtems_set_errno_and_return_minus_one( EINVAL );
_Timespec_Subtract( &_TOD_Now, &normalize.it_value, &normalize.it_value ); _Timespec_Subtract( &_TOD_Now, &normalize.it_value, &normalize.it_value );
} }
@@ -88,11 +91,13 @@ int timer_settime(
} }
/* Convert from seconds and nanoseconds to ticks */ /* Convert from seconds and nanoseconds to ticks */
ptimer->ticks = _Timespec_To_ticks( &normalize.it_value ); ptimer->ticks = _Timespec_To_ticks( &value->it_interval );
initial_period = _Timespec_To_ticks( &normalize.it_value );
activated = _POSIX_Timer_Insert_helper( activated = _POSIX_Timer_Insert_helper(
&ptimer->Timer, &ptimer->Timer,
ptimer->ticks, initial_period,
ptimer->Object.id, ptimer->Object.id,
_POSIX_Timer_TSR, _POSIX_Timer_TSR,
ptimer ptimer