Update.
2003-02-13 Ulrich Drepper <drepper@redhat.com> * Makefile (tests): Add tst-cleanup3. * tst-cleanup3.c: New file.
This commit is contained in:
Ulrich Drepper
parent
89e78a954d
commit
e8cda341a4
|
|
@ -1,3 +1,8 @@
|
|||
2003-02-13 Ulrich Drepper <drepper@redhat.com>
|
||||
|
||||
* Makefile (tests): Add tst-cleanup3.
|
||||
* tst-cleanup3.c: New file.
|
||||
|
||||
2003-02-12 Ulrich Drepper <drepper@redhat.com>
|
||||
|
||||
* Makefile (tests): Add tst-attr1 and tst-attr2.
|
||||
|
|
|
|||
|
|
@ -142,7 +142,7 @@ tests = tst-attr1 tst-attr2 \
|
|||
tst-atfork1 \
|
||||
tst-cancel1 tst-cancel2 tst-cancel3 tst-cancel4 tst-cancel5 \
|
||||
tst-cancel6 tst-cancel7 tst-cancel8 \
|
||||
tst-cleanup1 tst-cleanup2 \
|
||||
tst-cleanup1 tst-cleanup2 tst-cleanup3 \
|
||||
tst-flock1 tst-flock2 \
|
||||
tst-signal1 tst-signal2 tst-signal3 \
|
||||
tst-exec1 tst-exec2 tst-exec3 \
|
||||
|
|
|
|||
|
|
@ -35,6 +35,11 @@ do_test (void)
|
|||
exit (1);
|
||||
}
|
||||
|
||||
/* XXX Remove if default value is clear. */
|
||||
pthread_attr_setinheritsched (&a, PTHREAD_INHERIT_SCHED);
|
||||
pthread_attr_setschedpolicy (&a, SCHED_OTHER);
|
||||
pthread_attr_setscope (&a, PTHREAD_SCOPE_SYSTEM);
|
||||
|
||||
for (i = 0; i < 10000; ++i)
|
||||
{
|
||||
long int r = random ();
|
||||
|
|
@ -63,6 +68,81 @@ detach state changed to %d by invalid setdetachstate call\n", s);
|
|||
exit (1);
|
||||
}
|
||||
}
|
||||
|
||||
if (r != PTHREAD_INHERIT_SCHED && r != PTHREAD_EXPLICIT_SCHED)
|
||||
{
|
||||
int e = pthread_attr_setinheritsched (&a, r);
|
||||
|
||||
if (e == 0)
|
||||
{
|
||||
printf ("attr_setinheritsched with value %ld succeeded\n", r);
|
||||
exit (1);
|
||||
}
|
||||
|
||||
int s;
|
||||
if (pthread_attr_getinheritsched (&a, &s) != 0)
|
||||
{
|
||||
puts ("attr_getinheritsched failed");
|
||||
exit (1);
|
||||
}
|
||||
|
||||
if (s != PTHREAD_INHERIT_SCHED)
|
||||
{
|
||||
printf ("\
|
||||
inheritsched changed to %d by invalid setinheritsched call\n", s);
|
||||
exit (1);
|
||||
}
|
||||
}
|
||||
|
||||
if (r != SCHED_OTHER && r != SCHED_RR && r != SCHED_FIFO)
|
||||
{
|
||||
int e = pthread_attr_setschedpolicy (&a, r);
|
||||
|
||||
if (e == 0)
|
||||
{
|
||||
printf ("attr_setschedpolicy with value %ld succeeded\n", r);
|
||||
exit (1);
|
||||
}
|
||||
|
||||
int s;
|
||||
if (pthread_attr_getschedpolicy (&a, &s) != 0)
|
||||
{
|
||||
puts ("attr_getschedpolicy failed");
|
||||
exit (1);
|
||||
}
|
||||
|
||||
if (s != SCHED_OTHER)
|
||||
{
|
||||
printf ("\
|
||||
schedpolicy changed to %d by invalid setschedpolicy call\n", s);
|
||||
exit (1);
|
||||
}
|
||||
}
|
||||
|
||||
if (r != PTHREAD_SCOPE_SYSTEM && r != PTHREAD_SCOPE_PROCESS)
|
||||
{
|
||||
int e = pthread_attr_setscope (&a, r);
|
||||
|
||||
if (e == 0)
|
||||
{
|
||||
printf ("attr_setscope with value %ld succeeded\n", r);
|
||||
exit (1);
|
||||
}
|
||||
|
||||
int s;
|
||||
if (pthread_attr_getscope (&a, &s) != 0)
|
||||
{
|
||||
puts ("attr_getscope failed");
|
||||
exit (1);
|
||||
}
|
||||
|
||||
if (s != PTHREAD_SCOPE_SYSTEM)
|
||||
{
|
||||
printf ("\
|
||||
contentionscope changed to %d by invalid setscope call\n", s);
|
||||
exit (1);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
|
|
|||
190
nptl/tst-attr2.c
190
nptl/tst-attr2.c
|
|
@ -17,6 +17,7 @@
|
|||
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
||||
02111-1307 USA. */
|
||||
|
||||
#include <errno.h>
|
||||
#include <pthread.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
|
|
@ -49,7 +50,8 @@ default detach state wrong: %d, expected %d (PTHREAD_CREATE_JOINABLE)\n",
|
|||
exit (1);
|
||||
}
|
||||
|
||||
if (pthread_attr_setdetachstate (&a, PTHREAD_CREATE_DETACHED) != 0)
|
||||
int e = pthread_attr_setdetachstate (&a, PTHREAD_CREATE_DETACHED);
|
||||
if (e != 0)
|
||||
{
|
||||
puts ("1st attr_setdetachstate failed");
|
||||
exit (1);
|
||||
|
|
@ -65,7 +67,8 @@ default detach state wrong: %d, expected %d (PTHREAD_CREATE_JOINABLE)\n",
|
|||
exit (1);
|
||||
}
|
||||
|
||||
if (pthread_attr_setdetachstate (&a, PTHREAD_CREATE_JOINABLE) != 0)
|
||||
e = pthread_attr_setdetachstate (&a, PTHREAD_CREATE_JOINABLE);
|
||||
if (e != 0)
|
||||
{
|
||||
puts ("2nd attr_setdetachstate failed");
|
||||
exit (1);
|
||||
|
|
@ -95,7 +98,8 @@ default detach state wrong: %d, expected %d (PTHREAD_CREATE_JOINABLE)\n",
|
|||
exit (1);
|
||||
}
|
||||
|
||||
if (pthread_attr_setguardsize (&a, 0) != 0)
|
||||
e = pthread_attr_setguardsize (&a, 0);
|
||||
if (e != 0)
|
||||
{
|
||||
puts ("1st attr_setguardsize failed");
|
||||
exit (1);
|
||||
|
|
@ -111,7 +115,8 @@ default detach state wrong: %d, expected %d (PTHREAD_CREATE_JOINABLE)\n",
|
|||
exit (1);
|
||||
}
|
||||
|
||||
if (pthread_attr_setguardsize (&a, 1) != 0)
|
||||
e = pthread_attr_setguardsize (&a, 1);
|
||||
if (e != 0)
|
||||
{
|
||||
puts ("2nd attr_setguardsize failed");
|
||||
exit (1);
|
||||
|
|
@ -127,6 +132,183 @@ default detach state wrong: %d, expected %d (PTHREAD_CREATE_JOINABLE)\n",
|
|||
exit (1);
|
||||
}
|
||||
|
||||
|
||||
if (pthread_attr_getinheritsched (&a, &s) != 0)
|
||||
{
|
||||
puts ("1st attr_getinheritsched failed");
|
||||
exit (1);
|
||||
}
|
||||
/* XXX What is the correct default value. */
|
||||
if (s != PTHREAD_INHERIT_SCHED && s != PTHREAD_EXPLICIT_SCHED)
|
||||
{
|
||||
puts ("incorrect default value for inheritsched");
|
||||
exit (1);
|
||||
}
|
||||
|
||||
e = pthread_attr_setinheritsched (&a, PTHREAD_EXPLICIT_SCHED);
|
||||
if (e != 0)
|
||||
{
|
||||
puts ("1st attr_setinheritsched failed");
|
||||
exit (1);
|
||||
}
|
||||
if (pthread_attr_getinheritsched (&a, &s) != 0)
|
||||
{
|
||||
puts ("2nd attr_getinheritsched failed");
|
||||
exit (1);
|
||||
}
|
||||
if (s != PTHREAD_EXPLICIT_SCHED)
|
||||
{
|
||||
printf ("inheritsched set to PTHREAD_EXPLICIT_SCHED, but got %d\n", s);
|
||||
exit (1);
|
||||
}
|
||||
|
||||
e = pthread_attr_setinheritsched (&a, PTHREAD_INHERIT_SCHED);
|
||||
if (e != 0)
|
||||
{
|
||||
puts ("2nd attr_setinheritsched failed");
|
||||
exit (1);
|
||||
}
|
||||
if (pthread_attr_getinheritsched (&a, &s) != 0)
|
||||
{
|
||||
puts ("3rd attr_getinheritsched failed");
|
||||
exit (1);
|
||||
}
|
||||
if (s != PTHREAD_INHERIT_SCHED)
|
||||
{
|
||||
printf ("inheritsched set to PTHREAD_INHERIT_SCHED, but got %d\n", s);
|
||||
exit (1);
|
||||
}
|
||||
|
||||
|
||||
if (pthread_attr_getschedpolicy (&a, &s) != 0)
|
||||
{
|
||||
puts ("1st attr_getschedpolicy failed");
|
||||
exit (1);
|
||||
}
|
||||
/* XXX What is the correct default value. */
|
||||
if (s != SCHED_OTHER && s != SCHED_FIFO && s != SCHED_RR)
|
||||
{
|
||||
puts ("incorrect default value for schedpolicy");
|
||||
exit (1);
|
||||
}
|
||||
|
||||
e = pthread_attr_setschedpolicy (&a, SCHED_RR);
|
||||
if (e != 0)
|
||||
{
|
||||
puts ("1st attr_setschedpolicy failed");
|
||||
exit (1);
|
||||
}
|
||||
if (pthread_attr_getschedpolicy (&a, &s) != 0)
|
||||
{
|
||||
puts ("2nd attr_getschedpolicy failed");
|
||||
exit (1);
|
||||
}
|
||||
if (s != SCHED_RR)
|
||||
{
|
||||
printf ("schedpolicy set to SCHED_RR, but got %d\n", s);
|
||||
exit (1);
|
||||
}
|
||||
|
||||
e = pthread_attr_setschedpolicy (&a, SCHED_FIFO);
|
||||
if (e != 0)
|
||||
{
|
||||
puts ("2nd attr_setschedpolicy failed");
|
||||
exit (1);
|
||||
}
|
||||
if (pthread_attr_getschedpolicy (&a, &s) != 0)
|
||||
{
|
||||
puts ("3rd attr_getschedpolicy failed");
|
||||
exit (1);
|
||||
}
|
||||
if (s != SCHED_FIFO)
|
||||
{
|
||||
printf ("schedpolicy set to SCHED_FIFO, but got %d\n", s);
|
||||
exit (1);
|
||||
}
|
||||
|
||||
e = pthread_attr_setschedpolicy (&a, SCHED_OTHER);
|
||||
if (e != 0)
|
||||
{
|
||||
puts ("3rd attr_setschedpolicy failed");
|
||||
exit (1);
|
||||
}
|
||||
if (pthread_attr_getschedpolicy (&a, &s) != 0)
|
||||
{
|
||||
puts ("4th attr_getschedpolicy failed");
|
||||
exit (1);
|
||||
}
|
||||
if (s != SCHED_OTHER)
|
||||
{
|
||||
printf ("schedpolicy set to SCHED_OTHER, but got %d\n", s);
|
||||
exit (1);
|
||||
}
|
||||
|
||||
|
||||
if (pthread_attr_getscope (&a, &s) != 0)
|
||||
{
|
||||
puts ("1st attr_getscope failed");
|
||||
exit (1);
|
||||
}
|
||||
/* XXX What is the correct default value. */
|
||||
if (s != PTHREAD_SCOPE_SYSTEM && s != PTHREAD_SCOPE_PROCESS)
|
||||
{
|
||||
puts ("incorrect default value for contentionscope");
|
||||
exit (1);
|
||||
}
|
||||
|
||||
e = pthread_attr_setscope (&a, PTHREAD_SCOPE_PROCESS);
|
||||
if (e != ENOTSUP)
|
||||
{
|
||||
if (e != 0)
|
||||
{
|
||||
puts ("1st attr_setscope failed");
|
||||
exit (1);
|
||||
}
|
||||
if (pthread_attr_getscope (&a, &s) != 0)
|
||||
{
|
||||
puts ("2nd attr_getscope failed");
|
||||
exit (1);
|
||||
}
|
||||
if (s != PTHREAD_SCOPE_PROCESS)
|
||||
{
|
||||
printf ("\
|
||||
contentionscope set to PTHREAD_SCOPE_PROCESS, but got %d\n", s);
|
||||
exit (1);
|
||||
}
|
||||
}
|
||||
|
||||
e = pthread_attr_setscope (&a, PTHREAD_SCOPE_SYSTEM);
|
||||
if (e != 0)
|
||||
{
|
||||
puts ("2nd attr_setscope failed");
|
||||
exit (1);
|
||||
}
|
||||
if (pthread_attr_getscope (&a, &s) != 0)
|
||||
{
|
||||
puts ("3rd attr_getscope failed");
|
||||
exit (1);
|
||||
}
|
||||
if (s != PTHREAD_SCOPE_SYSTEM)
|
||||
{
|
||||
printf ("contentionscope set to PTHREAD_SCOPE_SYSTEM, but got %d\n", s);
|
||||
exit (1);
|
||||
}
|
||||
|
||||
char buf[1];
|
||||
e = pthread_attr_setstack (&a, buf, 1);
|
||||
if (e != EINVAL)
|
||||
{
|
||||
puts ("setstack with size 1 did not produce EINVAL");
|
||||
exit (1);
|
||||
}
|
||||
|
||||
e = pthread_attr_setstacksize (&a, 1);
|
||||
if (e != EINVAL)
|
||||
{
|
||||
puts ("setstacksize with size 1 did not produce EINVAL");
|
||||
exit (1);
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,98 @@
|
|||
/* Copyright (C) 2003 Free Software Foundation, Inc.
|
||||
This file is part of the GNU C Library.
|
||||
Contributed by Ulrich Drepper <drepper@redhat.com>, 2003.
|
||||
|
||||
The GNU C Library is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU Lesser General Public
|
||||
License as published by the Free Software Foundation; either
|
||||
version 2.1 of the License, or (at your option) any later version.
|
||||
|
||||
The GNU C Library is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
Lesser General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Lesser General Public
|
||||
License along with the GNU C Library; if not, write to the Free
|
||||
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
||||
02111-1307 USA. */
|
||||
|
||||
#include <pthread.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <unistd.h>
|
||||
|
||||
|
||||
static int global;
|
||||
|
||||
|
||||
static void
|
||||
ch (void *arg)
|
||||
{
|
||||
int val = (long int) arg;
|
||||
|
||||
printf ("ch (%d)\n", val);
|
||||
|
||||
global *= val;
|
||||
global += val;
|
||||
}
|
||||
|
||||
|
||||
static void *
|
||||
tf (void *a)
|
||||
{
|
||||
pthread_cleanup_push (ch, (void *) 1l);
|
||||
|
||||
pthread_cleanup_push (ch, (void *) 2l);
|
||||
|
||||
pthread_cleanup_push (ch, (void *) 3l);
|
||||
|
||||
pthread_exit ((void *) 1l);
|
||||
|
||||
pthread_cleanup_pop (1);
|
||||
|
||||
pthread_cleanup_pop (1);
|
||||
|
||||
pthread_cleanup_pop (1);
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
||||
int
|
||||
do_test (void)
|
||||
{
|
||||
pthread_t th;
|
||||
|
||||
if (pthread_create (&th, NULL, tf, NULL) != 0)
|
||||
{
|
||||
write (2, "create failed\n", 14);
|
||||
_exit (1);
|
||||
}
|
||||
|
||||
void *r;
|
||||
int e;
|
||||
if ((e = pthread_join (th, &r)) != 0)
|
||||
{
|
||||
printf ("join failed: %d\n", e);
|
||||
_exit (1);
|
||||
}
|
||||
|
||||
if (r != (void *) 1l)
|
||||
{
|
||||
puts ("thread not canceled");
|
||||
exit (1);
|
||||
}
|
||||
|
||||
if (global != 9)
|
||||
{
|
||||
printf ("global = %d, expected 9\n", global);
|
||||
exit (1);
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
#define TEST_FUNCTION do_test ()
|
||||
#include "../test-skeleton.c"
|
||||
Loading…
Reference in New Issue