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

2009-10-11 Joel Sherrill <joel.sherrill@oarcorp.com>

Browse Source 
* psxtimer01/psxtimer.c: Make sure we have null and not-null as return
	parameter to timer_settime().
This commit is contained in:
Joel Sherrill
2009-10-11 14:44:00 +00:00
parent 6aa3ce3bfe
commit 157354e9aa
2 changed files with 36 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
testsuites/psxtests/ChangeLog
View File

@@ -1,3 +1,8 @@
2009-10-11 Joel Sherrill <joel.sherrill@oarcorp.com>
* psxtimer01/psxtimer.c: Make sure we have null and not-null as return
parameter to timer_settime().
2009-10-10 Joel Sherrill <joel.sherrill@oarcorp.com> 2009-10-10 Joel Sherrill <joel.sherrill@oarcorp.com>
* psxtimer01/psxtimer.c: Modify so it passes in a NULL to * psxtimer01/psxtimer.c: Modify so it passes in a NULL to

54
testsuites/psxtests/psxtimer01/psxtimer.c
View File

@@ -63,16 +63,23 @@ void StopTimer(
struct itimerspec *timerdata struct itimerspec *timerdata
) )
{ {
/* static int firstTime = 1;
* We do not care about the old value. And this is a path struct itimerspec *pOld;
* that needs to be exercised anyway. struct itimerspec odata;
*/
timerdata->it_value.tv_sec = 0; /*
timerdata->it_value.tv_nsec = 0; * We do not care about the old value. But we need to exercise
if (timer_settime(timer_id,POSIX_TIMER_RELATIVE,timerdata,NULL) == -1) { * getting and not getting the return value back.
perror ("Error in timer setting\n"); */
pthread_exit ((void *) -1); pOld = (firstTime == 1) ? NULL : &odata;
} firstTime = 0;
timerdata->it_value.tv_sec = 0;
timerdata->it_value.tv_nsec = 0;
if (timer_settime(timer_id,POSIX_TIMER_RELATIVE,timerdata,NULL) == -1) {
perror ("Error in timer setting\n");
rtems_test_exit(0);
}
} }
/* task A */ /* task A */
@@ -97,7 +104,7 @@ void * task_a (void *arg)
event.sigev_signo = my_sig; event.sigev_signo = my_sig;
if (timer_create (CLOCK_REALTIME, &event, &timer_id) == -1) { if (timer_create (CLOCK_REALTIME, &event, &timer_id) == -1) {
perror ("Error in timer creation\n"); perror ("Error in timer creation\n");
pthread_exit ((void *) -1); rtems_test_exit(0);
} }
/* block the timer signal */ /* block the timer signal */
@@ -111,7 +118,7 @@ void * task_a (void *arg)
timerdata.it_value.tv_sec *= 2; timerdata.it_value.tv_sec *= 2;
if (timer_settime(timer_id,POSIX_TIMER_RELATIVE,&timerdata,&timergetdata) == -1) { if (timer_settime(timer_id,POSIX_TIMER_RELATIVE,&timerdata,&timergetdata) == -1) {
perror ("Error in timer setting\n"); perror ("Error in timer setting\n");
pthread_exit ((void *) -1); rtems_test_exit(0);
} }
printf( printf(
"task A: timer_settime - value=%d:%d interval=%d:%d\n", "task A: timer_settime - value=%d:%d interval=%d:%d\n",
@@ -127,7 +134,7 @@ void * task_a (void *arg)
} }
if (timer_gettime(timer_id, &timerdata) == -1) { if (timer_gettime(timer_id, &timerdata) == -1) {
perror ("Error in timer_gettime\n"); perror ("Error in timer_gettime\n");
pthread_exit ((void *) -1); rtems_test_exit(0);
} }
if (! _Timespec_Equal_to( &timerdata.it_value, &my_period )){ if (! _Timespec_Equal_to( &timerdata.it_value, &my_period )){
perror ("Error in Task A timer_gettime\n"); perror ("Error in Task A timer_gettime\n");
@@ -165,7 +172,7 @@ void * task_b (void *arg)
event.sigev_signo = my_sig; event.sigev_signo = my_sig;
if (timer_create (CLOCK_REALTIME, &event, &timer_id) == -1) { if (timer_create (CLOCK_REALTIME, &event, &timer_id) == -1) {
perror ("Error in timer creation\n"); perror ("Error in timer creation\n");
pthread_exit ((void *) -1); rtems_test_exit(0);
} }
/* block the timer signal */ /* block the timer signal */
@@ -180,22 +187,23 @@ void * task_b (void *arg)
_Timespec_Add_to( &timerdata.it_value, &my_period ); _Timespec_Add_to( &timerdata.it_value, &my_period );
if (timer_settime(timer_id,TIMER_ABSTIME,&timerdata,NULL) == -1) { if (timer_settime(timer_id,TIMER_ABSTIME,&timerdata,NULL) == -1) {
perror ("Error in timer setting\n"); perror ("Error in timer setting\n");
pthread_exit ((void *) -1); rtems_test_exit(0);
} }
/* periodic activity */ /* periodic activity */
while(1) { while(1) {
if (sigwait(&set,&received_sig) == -1) { if (sigwait(&set,&received_sig) == -1) {
perror ("Error in sigwait\n"); perror ("Error in sigwait\n");
pthread_exit ((void *) -1); rtems_test_exit(0);
} }
if (timer_gettime(timer_id, &timerdata) == -1) { if (timer_gettime(timer_id, &timerdata) == -1) {
perror ("Error in timer_gettime\n"); perror ("Error in timer_gettime\n");
pthread_exit ((void *) -1); rtems_test_exit(0);
} }
if (! _Timespec_Equal_to( &timerdata.it_value, &my_period) ){ if ( !_Timespec_Equal_to( &timerdata.it_value, &my_period) ){
perror ("Error in Task B timer_gettime\n"); perror ("Error in Task B timer_gettime\n");
rtems_test_exit(0);
} }
pthread_mutex_lock (&data.mutex); pthread_mutex_lock (&data.mutex);
@@ -237,7 +245,7 @@ void * task_c (void *arg)
event.sigev_signo = my_sig; event.sigev_signo = my_sig;
if (timer_create (CLOCK_REALTIME, &event, &timer_id) == -1) { if (timer_create (CLOCK_REALTIME, &event, &timer_id) == -1) {
perror ("Error in timer creation\n"); perror ("Error in timer creation\n");
pthread_exit ((void *) -1); rtems_test_exit(0);
} }
/* block the timer signal */ /* block the timer signal */
@@ -251,18 +259,18 @@ void * task_c (void *arg)
timerdata.it_value.tv_sec *= 2; timerdata.it_value.tv_sec *= 2;
if (timer_settime(timer_id,POSIX_TIMER_RELATIVE,&timerdata,NULL) == -1) { if (timer_settime(timer_id,POSIX_TIMER_RELATIVE,&timerdata,NULL) == -1) {
perror ("Error in timer setting\n"); perror ("Error in timer setting\n");
pthread_exit ((void *) -1); rtems_test_exit(0);
} }
/* periodic activity */ /* periodic activity */
for (count=0 ; ; count++) { for (count=0 ; ; count++) {
if (sigwait(&set,&received_sig) == -1) { if (sigwait(&set,&received_sig) == -1) {
perror ("Error in sigwait\n"); perror ("Error in sigwait\n");
pthread_exit ((void *) -1); rtems_test_exit(0);
} }
if (timer_gettime(timer_id, &timerdata) == -1) { if (timer_gettime(timer_id, &timerdata) == -1) {
perror ("Error in timer_gettime\n"); perror ("Error in timer_gettime\n");
pthread_exit ((void *) -1); rtems_test_exit(0);
} }
if (! _Timespec_Equal_to( &timerdata.it_value, &my_period) ){ if (! _Timespec_Equal_to( &timerdata.it_value, &my_period) ){
perror ("Error in Task C timer_gettime\n"); perror ("Error in Task C timer_gettime\n");
@@ -284,7 +292,7 @@ void * task_c (void *arg)
if (timer_gettime(timer_id, &timergetdata) == -1) { if (timer_gettime(timer_id, &timergetdata) == -1) {
perror ("Error in timer setting\n"); perror ("Error in timer setting\n");
pthread_exit ((void *) -1); rtems_test_exit(0);
} }
printf( printf(
"task C: timer_gettime - %d:%d remaining from %d:%d\n", "task C: timer_gettime - %d:%d remaining from %d:%d\n",