Skip to content

Commit

Permalink
* rt/tst-timer2.c (do_test): If timer_create fails, just continue.
Browse files Browse the repository at this point in the history
	* rt/tst-timer4.c (do_test): If one of the timer_create calls fails,
	return 1 immediately.
  • Loading branch information
Roland McGrath committed Aug 11, 2004
1 parent 90595fb commit 0569cbb
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 8 deletions.
6 changes: 4 additions & 2 deletions ChangeLog
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,13 @@

2004-08-11 Jakub Jelinek <jakub@redhat.com>

* rt/tst-timer2.c (do_test): If timer_create fails, just continue.
* rt/tst-timer4.c (do_test): If one of the timer_create calls fails,
return 1 immediately.

* time/tzfile.c (__tzfile_read): Free transitions only if it will
not be reused.

2004-08-11 Jakub Jelinek <jakub@redhat.com>

* sysdeps/ieee754/dbl-64/mpa.c: Include <sys/param.h>.
* sysdeps/ieee754/dbl-64/mpa.h (MAX, MIN): Macros removed.

Expand Down
5 changes: 4 additions & 1 deletion rt/tst-timer2.c
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,10 @@ do_test (void)
printf ("cnt = %d\n", i);

if (timer_create (CLOCK_REALTIME, &sigev, &timerId) < 0)
perror ("timer_create");
{
perror ("timer_create");
continue;
}

res = timer_settime (timerId, 0, &itval, NULL);
if (res < 0)
Expand Down
10 changes: 5 additions & 5 deletions rt/tst-timer4.c
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ do_test (void)
if (timer_create (CLOCK_REALTIME, &ev, &timer_none) != 0)
{
printf ("*** timer_create for timer_none failed: %m\n");
result = 1;
return 1;
}

struct sigaction sa = { .sa_sigaction = sig1_handler,
Expand All @@ -223,7 +223,7 @@ do_test (void)
if (timer_create (CLOCK_REALTIME, &ev, &timer_sig1) != 0)
{
printf ("*** timer_create for timer_sig1 failed: %m\n");
result = 1;
return 1;
}

memset (&ev, 0x33, sizeof (ev));
Expand All @@ -233,7 +233,7 @@ do_test (void)
if (timer_create (CLOCK_REALTIME, &ev, &timer_sig2) != 0)
{
printf ("*** timer_create for timer_sig2 failed: %m\n");
result = 1;
return 1;
}

memset (&ev, 0x44, sizeof (ev));
Expand All @@ -244,7 +244,7 @@ do_test (void)
if (timer_create (CLOCK_REALTIME, &ev, &timer_thr1) != 0)
{
printf ("*** timer_create for timer_thr1 failed: %m\n");
result = 1;
return 1;
}

pthread_attr_t nattr;
Expand All @@ -263,7 +263,7 @@ do_test (void)
if (timer_create (CLOCK_REALTIME, &ev, &timer_thr2) != 0)
{
printf ("*** timer_create for timer_thr2 failed: %m\n");
result = 1;
return 1;
}

int ret = timer_getoverrun (timer_thr1);
Expand Down

0 comments on commit 0569cbb

Please sign in to comment.