mirror of
git://sourceware.org/git/glibc.git
synced 2024-12-09 04:11:27 +08:00
6162364368
2003-06-22 Ulrich Drepper <drepper@redhat.com> * pthreadP.h (__pthread_mutex_init_internal): Mark hidden. (__pthread_mutex_lock_internal): Likewise. (__pthread_mutex_unlock_internal): Likewise. (__pthread_mutex_unlock_usercnt): Declare. * pthread_mutex_destroy.c: Always fail if used in any way. * pthread_mutex_init.c: Update comment. * pthread_mutex_lock.c: If NO_INCR is not defined adjust __nusers. * pthread_mutex_timedlock.c: Adjust __nusers. * pthread_mutex_trylock.c: Adjust __nusers. * pthread_mutex_unlock.c: Old code is in __pthread_mutex_unlock_usercnt and public interfaces are wrapper with pass additional parameter. __pthread_mutex_unlock_usercnt does not adjust __nusers if second parameter zero. * tst-mutex8.c: New file. * Makefile (tests): Add tst-mutex8. * sysdeps/pthread/pthread_cond_timedwait.c: Call __pthread_mutex_unlock_usercnt. * sysdeps/pthread/pthread_cond_wait.c: Likewise. * sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S: Likewise. * sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S: Likewise. * sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S: Likewise. * sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S: Likewise. * sysdeps/unix/sysv/linux/pthread_mutex_cond_lock.c: Define NO_INCR. * sysdeps/unix/sysv/linux/i386/bits/pthreadtypes.h (pthread_mutex_t): Add __nusers. * sysdeps/unix/sysv/linux/ia64/bits/pthreadtypes.h: Likewise. * sysdeps/unix/sysv/linux/powerpc/bits/pthreadtypes.h: Likewise. * sysdeps/unix/sysv/linux/s390/bits/pthreadtypes.h: Likewise. * sysdeps/unix/sysv/linux/sh/bits/pthreadtypes.h: Likewise. * sysdeps/unix/sysv/linux/x86_64/bits/pthreadtypes.h: Likewise. * pthread_mutex_lock.c: Don't store THREAD_ID in __owner, use TID. * pthread_mutex_timedlock.c: Likewise. * pthread_mutex_trylock.c: Adjust __nusers. * pthread_mutex_unlock.c: Compare with TID not THREAD_ID. * tst-mutex9.c: New file. * Makefile (tests): Add tst-mutex9. * sysdeps/i386/tls.h: Remove THREAD_ID definition. * sysdeps/ia64/tls.h: Likewise. * sysdeps/powerpc/tls.h: Likewise. * sysdeps/s390/tls.h: Likewise. * sysdeps/sh/tls.h: Likewise. * sysdeps/x86_64/tls.h: Likewise. * sysdeps/unix/sysv/linux/i386/bits/pthreadtypes.h (pthread_mutex_t): Change type of __owner. * sysdeps/unix/sysv/linux/ia64/bits/pthreadtypes.h: Likewise. * sysdeps/unix/sysv/linux/powerpc/bits/pthreadtypes.h: Likewise. * sysdeps/unix/sysv/linux/s390/bits/pthreadtypes.h: Likewise. * sysdeps/unix/sysv/linux/sh/bits/pthreadtypes.h: Likewise. * sysdeps/unix/sysv/linux/x86_64/bits/pthreadtypes.h: Likewise.
195 lines
4.1 KiB
C
195 lines
4.1 KiB
C
/* 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 <errno.h>
|
|
#include <pthread.h>
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
#include <unistd.h>
|
|
#include <sys/mman.h>
|
|
#include <sys/wait.h>
|
|
|
|
|
|
static int
|
|
do_test (void)
|
|
{
|
|
#if ! _POSIX_THREAD_PROCESS_SHARED
|
|
|
|
puts ("_POSIX_THREAD_PROCESS_SHARED not supported, test skipped");
|
|
return 0;
|
|
|
|
#else
|
|
|
|
size_t ps = sysconf (_SC_PAGESIZE);
|
|
char tmpfname[] = "/tmp/tst-mutex9.XXXXXX";
|
|
char data[ps];
|
|
void *mem;
|
|
int fd;
|
|
pthread_mutex_t *m;
|
|
pthread_mutexattr_t a;
|
|
pid_t pid;
|
|
char *p;
|
|
|
|
fd = mkstemp (tmpfname);
|
|
if (fd == -1)
|
|
{
|
|
printf ("cannot open temporary file: %m\n");
|
|
return 1;
|
|
}
|
|
|
|
/* Make sure it is always removed. */
|
|
unlink (tmpfname);
|
|
|
|
/* Create one page of data. */
|
|
memset (data, '\0', ps);
|
|
|
|
/* Write the data to the file. */
|
|
if (write (fd, data, ps) != (ssize_t) ps)
|
|
{
|
|
puts ("short write");
|
|
return 1;
|
|
}
|
|
|
|
mem = mmap (NULL, ps, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
|
|
if (mem == MAP_FAILED)
|
|
{
|
|
printf ("mmap failed: %m\n");
|
|
return 1;
|
|
}
|
|
|
|
m = (pthread_mutex_t *) (((uintptr_t) mem + __alignof (pthread_mutex_t))
|
|
& ~(__alignof (pthread_mutex_t) - 1));
|
|
p = (char *) (m + 1);
|
|
|
|
if (pthread_mutexattr_init (&a) != 0)
|
|
{
|
|
puts ("mutexattr_init failed");
|
|
return 1;
|
|
}
|
|
|
|
if (pthread_mutexattr_setpshared (&a, PTHREAD_PROCESS_SHARED) != 0)
|
|
{
|
|
puts ("mutexattr_setpshared failed");
|
|
return 1;
|
|
}
|
|
|
|
if (pthread_mutexattr_settype (&a, PTHREAD_MUTEX_RECURSIVE) != 0)
|
|
{
|
|
puts ("mutexattr_settype failed");
|
|
return 1;
|
|
}
|
|
|
|
if (pthread_mutex_init (m, &a) != 0)
|
|
{
|
|
puts ("mutex_init failed");
|
|
return 1;
|
|
}
|
|
|
|
if (pthread_mutex_lock (m) != 0)
|
|
{
|
|
puts ("mutex_lock failed");
|
|
return 1;
|
|
}
|
|
|
|
if (pthread_mutexattr_destroy (&a) != 0)
|
|
{
|
|
puts ("mutexattr_destroy failed");
|
|
return 1;
|
|
}
|
|
|
|
puts ("going to fork now");
|
|
pid = fork ();
|
|
if (pid == -1)
|
|
{
|
|
puts ("fork failed");
|
|
return 1;
|
|
}
|
|
else if (pid == 0)
|
|
{
|
|
if (pthread_mutex_trylock (m) == 0)
|
|
{
|
|
puts ("child: mutex_trylock succeeded");
|
|
exit (1);
|
|
}
|
|
|
|
if (pthread_mutex_unlock (m) == 0)
|
|
{
|
|
puts ("child: mutex_unlock succeeded");
|
|
exit (1);
|
|
}
|
|
|
|
struct timeval tv;
|
|
gettimeofday (&tv, NULL);
|
|
struct timespec ts;
|
|
TIMEVAL_TO_TIMESPEC (&tv, &ts);
|
|
ts.tv_nsec += 500000000;
|
|
if (ts.tv_nsec >= 1000000000)
|
|
{
|
|
++ts.tv_sec;
|
|
ts.tv_nsec -= 1000000000;
|
|
}
|
|
|
|
int e = pthread_mutex_timedlock (m, &ts);
|
|
if (e == 0)
|
|
{
|
|
puts ("child: mutex_timedlock succeeded");
|
|
exit (1);
|
|
}
|
|
if (e != ETIMEDOUT)
|
|
{
|
|
puts ("child: mutex_timedlock didn't time out");
|
|
exit (1);
|
|
}
|
|
|
|
alarm (1);
|
|
|
|
pthread_mutex_lock (m);
|
|
|
|
puts ("child: mutex_lock returned");
|
|
|
|
exit (0);
|
|
}
|
|
|
|
sleep (2);
|
|
|
|
int status;
|
|
if (TEMP_FAILURE_RETRY (waitpid (pid, &status, 0)) != pid)
|
|
{
|
|
puts ("waitpid failed");
|
|
return 1;
|
|
}
|
|
if (! WIFSIGNALED (status))
|
|
{
|
|
puts ("child not killed by signal");
|
|
return 1;
|
|
}
|
|
if (WTERMSIG (status) != SIGALRM)
|
|
{
|
|
puts ("child not killed by SIGALRM");
|
|
return 1;
|
|
}
|
|
|
|
return 0;
|
|
#endif
|
|
}
|
|
|
|
#define TIMEOUT 3
|
|
#define TEST_FUNCTION do_test ()
|
|
#include "../test-skeleton.c"
|