OpenE2K
/
glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update. 

* Makefile (tests): Add tst-tls1 and tst-tls2.
	* tst-tls1.c: New file.
	* tst-tls2.c: New file.
This commit is contained in:
Ulrich Drepper 2003-02-24 03:50:46 +00:00
parent cdd8e46f88
commit 5e47b76b50
6 changed files with 286 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bits/confname.h
View File

@ -473,7 +473,7 @@ enum
_CS_GNU_LIBC_VERSION,
#define _CS_GNU_LIBC_VERSION _CS_GNU_LIBC_VERSION
_CS_GNU_LIBPTHREAD_VERSION
_CS_GNU_LIBPTHREAD_VERSION,
#define _CS_GNU_LIBPTHREAD_VERSION _CS_GNU_LIBPTHREAD_VERSION
_CS_LFS_CFLAGS = 1000,
@ -556,7 +556,6 @@ enum
#define _CS_POSIX_V6_LPBIG_OFFBIG_LDFLAGS _CS_POSIX_V6_LPBIG_OFFBIG_LDFLAGS
_CS_POSIX_V6_LPBIG_OFFBIG_LIBS,
#define _CS_POSIX_V6_LPBIG_OFFBIG_LIBS _CS_POSIX_V6_LPBIG_OFFBIG_LIBS
_CS_POSIX_V6_LPBIG_OFFBIG_LINTFLAGS,
_CS_POSIX_V6_LPBIG_OFFBIG_LINTFLAGS
#define _CS_POSIX_V6_LPBIG_OFFBIG_LINTFLAGS _CS_POSIX_V6_LPBIG_OFFBIG_LINTFLAGS
};
#endif

4
nptl/ChangeLog
View File

@ -1,5 +1,9 @@
2003-02-23 Ulrich Drepper <drepper@redhat.com>
* Makefile (tests): Add tst-tls1 and tst-tls2.
* tst-tls1.c: New file.
* tst-tls2.c: New file.
* libc-cancellation.c (__libc_enable_asynccancel): Correct test
for failed cmpxchg.

1
nptl/Makefile
View File

@ -142,6 +142,7 @@ tests = tst-attr1 tst-attr2 \
tst-join1 tst-join2 tst-join3 tst-join4 tst-join5 \
tst-eintr1 \
tst-tsd1 tst-tsd2 \
tst-tls1 tst-tls2 \
tst-fork1 tst-fork2 tst-fork3 \
tst-atfork1 \
tst-cancel1 tst-cancel2 tst-cancel3 tst-cancel4 tst-cancel5 \

92
nptl/tst-tls1.c Normal file
View File

@ -0,0 +1,92 @@
/* 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>
struct test_s
{
int a;
int b;
};
#define INIT_A 1
#define INIT_B 42
/* Deliberately not static. */
__thread struct test_s s __attribute__ ((tls_model ("initial-exec"))) =
{
.a = INIT_A,
.b = INIT_B
};
static void *
tf (void *arg)
{
if (s.a != INIT_A || s.b != INIT_B)
{
puts ("initial value of s in child thread wrong");
exit (1);
}
++s.a;
return NULL;
}
int
do_test (void)
{
if (s.a != INIT_A || s.b != INIT_B)
{
puts ("initial value of s in main thread wrong");
exit (1);
}
#define N 10
int i;
for (i = 0; i < N; ++i)
{
#define M 10
pthread_t th[M];
int j;
for (j = 0; j < M; ++j, ++s.a)
if (pthread_create (&th[j], NULL, tf, NULL) != 0)
{
puts ("pthread_create failed");
exit (1);
}
for (j = 0; j < M; ++j)
if (pthread_join (th[j], NULL) != 0)
{
puts ("pthread_join failed");
exit (1);
}
}
return 0;
}
#define TEST_FUNCTION do_test ()
#include "../test-skeleton.c"

185
nptl/tst-tls2.c Normal file
View File

@ -0,0 +1,185 @@
/* 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 <signal.h>
#include <semaphore.h>
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
#define N 10
static pthread_t th[N];
#define CB(n) \
static void \
cb##n (void) \
{ \
if (th[n] != pthread_self ()) \
{ \
write (STDOUT_FILENO, "wrong callback\n", 15); \
_exit (1); \
} \
}
CB (0)
CB (1)
CB (2)
CB (3)
CB (4)
CB (5)
CB (6)
CB (7)
CB (8)
CB (9)
static void (*cbs[]) (void) =
{
cb0, cb1, cb2, cb3, cb4, cb5, cb6, cb7, cb8, cb9
};
static __thread void (*fp) (void) __attribute__ ((tls_model ("local-exec")));
static sem_t s;
#define THE_SIG SIGUSR1
static void
handler (int sig)
{
if (sig != THE_SIG)
{
write (STDOUT_FILENO, "wrong signal\n", 13);
_exit (1);
}
fp ();
if (sem_post (&s) != 0)
{
write (STDOUT_FILENO, "sem_post failed\n", 16);
_exit (1);
}
}
static pthread_barrier_t b;
#define TOTAL_SIGS 1000
static int nsigs;
static void *
tf (void *arg)
{
fp = arg;
pthread_barrier_wait (&b);
pthread_barrier_wait (&b);
if (nsigs != TOTAL_SIGS)
{
puts ("barrier_wait prematurely returns");
exit (1);
}
return NULL;
}
int
do_test (void)
{
if (pthread_barrier_init (&b, NULL, N + 1) != 0)
{
puts ("barrier_init failed");
exit (1);
}
if (sem_init (&s, 0, 0) != 0)
{
puts ("sem_init failed");
exit (1);
}
struct sigaction sa;
sa.sa_handler = handler;
sigemptyset (&sa.sa_mask);
sa.sa_flags = 0;
if (sigaction (THE_SIG, &sa, NULL) != 0)
{
puts ("sigaction failed");
exit (1);
}
int i;
for (i = 0; i < N; ++i)
if (pthread_create (&th[i], NULL, tf, cbs[i]) != 0)
{
puts ("pthread_create failed");
exit (1);
}
pthread_barrier_wait (&b);
sigset_t ss;
sigemptyset (&ss);
sigaddset (&ss, THE_SIG);
if (pthread_sigmask (SIG_BLOCK, &ss, NULL) != 0)
{
puts ("pthread_sigmask failed");
exit (1);
}
/* Start sending signals. */
for (i = 0; i < TOTAL_SIGS; ++i)
{
if (kill (getpid (), THE_SIG) != 0)
{
puts ("kill failed");
exit (1);
}
if (sem_wait (&s) != 0)
{
puts ("sem_wait failed");
exit (1);
}
++nsigs;
}
pthread_barrier_wait (&b);
for (i = 0; i < N; ++i)
if (pthread_join (th[i], NULL) != 0)
{
puts ("join failed");
exit (1);
}
return 0;
}
#define TEST_FUNCTION do_test ()
#include "../test-skeleton.c"

5
sysdeps/generic/bits/confname.h
View File

@ -473,7 +473,7 @@ enum
_CS_GNU_LIBC_VERSION,
#define _CS_GNU_LIBC_VERSION _CS_GNU_LIBC_VERSION
_CS_GNU_LIBPTHREAD_VERSION
_CS_GNU_LIBPTHREAD_VERSION,
#define _CS_GNU_LIBPTHREAD_VERSION _CS_GNU_LIBPTHREAD_VERSION
_CS_LFS_CFLAGS = 1000,
@ -556,7 +556,6 @@ enum
#define _CS_POSIX_V6_LPBIG_OFFBIG_LDFLAGS _CS_POSIX_V6_LPBIG_OFFBIG_LDFLAGS
_CS_POSIX_V6_LPBIG_OFFBIG_LIBS,
#define _CS_POSIX_V6_LPBIG_OFFBIG_LIBS _CS_POSIX_V6_LPBIG_OFFBIG_LIBS
_CS_POSIX_V6_LPBIG_OFFBIG_LINTFLAGS,
_CS_POSIX_V6_LPBIG_OFFBIG_LINTFLAGS
#define _CS_POSIX_V6_LPBIG_OFFBIG_LINTFLAGS _CS_POSIX_V6_LPBIG_OFFBIG_LINTFLAGS
};
#endif