mirror of
				https://sourceware.org/git/glibc.git
				synced 2025-11-03 20:53:13 +03:00 
			
		
		
		
	* htl/pt-join.c (__pthread_join): Move implementation to... (__pthread_join_common): ... new function. Add try, timed and clock support. (__pthread_join): Reimplement on top of __pthread_join_common. (__pthread_tryjoin_np, __pthread_timedjoin_np, __pthread_clockjoin_np): Implement on top of __pthread_join_common. (pthread_tryjoin_np, pthread_timedjoin_np, pthread_clockjoin_np): New aliases. * hurd/hurdlock.c (__lll_abstimed_wait, __lll_abstimed_xwait, __lll_abstimed_lock): Check for supported clock. * sysdeps/htl/pt-cond-timedwait.c (__pthread_cond_timedwait_internal): Add clockid parameter and support it. (__pthread_cond_timedwait): Pass -1 as clockid. (__pthread_cond_clockwait): New function. (pthread_cond_clockwait): New alias. * sysdeps/htl/pt-cond-wait.c (__pthread_cond_timedwait_internal): Update prototype. (__pthread_cond_wait): Pass -1 as clockid. * sysdeps/htl/pt-rwlock-timedrdlock.c (__pthread_rwlock_timedrdlock_internal): Add clockid parameter, and support id. (__pthread_rwlock_clockrdlock): New function. (pthread_rwlock_clockrdlock): New alias. * sysdeps/htl/pt-rwlock-rdlock.c (__pthread_rwlock_timedrdlock_internal): Update prototype. (__pthread_rwlock_rdlock): Pass -1 as clockid. * sysdeps/htl/pt-rwlock-timedwrlock.c (__pthread_rwlock_timedwrlock_internal): Add clockid parameter, and support id. (__pthread_rwlock_clockwrlock): New function. (pthread_rwlock_clockwrlock): New alias. * sysdeps/htl/pt-rwlock-wrlock.c (__pthread_rwlock_timedwrlock_internal): Update prototype. (__pthread_rwlock_wrlock): Pass -1 as clockid. * sysdeps/mach/hurd/htl/pt-mutex-timedlock.c (__pthread_mutex_timedlock): Move implementation to (__pthread_mutex_clocklock): New function with additional clockid parameter and support it. (pthread_mutex_clocklock): New alias. (__pthread_mutex_timedlock): Reimplement on top of __pthread_mutex_clocklock. * sysdeps/htl/pthread.h (pthread_tryjoin_np, pthread_timedjoin_np, pthread_clockjoin_np, pthread_mutex_clocklock, pthread_cond_clockwait, pthread_rwlock_clockrdlock, pthread_rwlock_clockwrlock): New prototypes. * sysdeps/htl/pthreadP.h (__pthread_cond_clockwait): New prototype. * htl/Versions (GLIBC_2.32): Add pthread_cond_clockwait, pthread_mutex_clocklock, pthread_rwlock_clockrdlock, pthread_rwlock_clockwrlock, pthread_tryjoin_np, pthread_timedjoin_np, pthread_clockjoin_np. * sysdeps/mach/hurd/i386/libpthread.abilist (pthread_clockjoin_np, pthread_cond_clockwait, pthread_mutex_clocklock, pthread_rwlock_clockrdlock, pthread_rwlock_clockwrlock, pthread_timedjoin_np, pthread_tryjoin_np): New functions. * nptl/tst-abstime.c, nptl/tst-join10.c, nptl/tst-join11.c, nptl/tst-join12.c, nptl/tst-join13.c, nptl/tst-join14.c, nptl/tst-join2.c, nptl/tst-join3.c, nptl/tst-join8.c, nptl/tst-join9.c, nptl/tst-mutex-errorcheck.c, nptl/tst-pthread-mutexattr.c, nptl/tst-mutex11.c, nptl/tst-mutex5.c, nptl/tst-mutex7.c, nptl/tst-mutex7robus.c, nptl/tst-mutex9.c, nptl/tst-rwlock12.c, nptl/tst-rwlock14.c: Move to sysdeps/pthread. * sysdeps/pthread/tst-mutex8.c: Move back to nptl. * nptl/Makefile (tests): Move tst-mutex5, tst-mutex7, tst-mutex7robust, tst-mutex9, tst-mutex11, tst-rwlock12, tst-rwlock14, tst-join2, tst-join3, tst-join8, tst-join9 tst-join10, tst-join11, tst-join12, tst-join13, tst-join14, tst-abstime, tst-mutex-errorcheck, tst-pthread-mutexattr to ... * sysdeps/pthread/Makefile (tests): ... here.
		
			
				
	
	
		
			190 lines
		
	
	
		
			4.5 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			190 lines
		
	
	
		
			4.5 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
/* Copyright (C) 2002-2020 Free Software Foundation, Inc.
 | 
						|
   This file is part of the GNU C Library.
 | 
						|
   Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
 | 
						|
 | 
						|
   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, see
 | 
						|
   <https://www.gnu.org/licenses/>.  */
 | 
						|
 | 
						|
#include <errno.h>
 | 
						|
#include <pthread.h>
 | 
						|
#include <stdio.h>
 | 
						|
#include <stdlib.h>
 | 
						|
#include <time.h>
 | 
						|
 | 
						|
/* This test is a template for other tests to use.  Other tests define
 | 
						|
   the following macros to change the behaviour of the template test.
 | 
						|
   The test is very simple, it configures N threads given the parameters
 | 
						|
   below and then proceeds to go through mutex lock and unlock
 | 
						|
   operations in each thread as described before for the thread
 | 
						|
   function.  */
 | 
						|
#ifndef TYPE
 | 
						|
# define TYPE PTHREAD_MUTEX_DEFAULT
 | 
						|
#endif
 | 
						|
#ifndef ROBUST
 | 
						|
# define ROBUST PTHREAD_MUTEX_STALLED
 | 
						|
#endif
 | 
						|
#ifndef DELAY_NSEC
 | 
						|
# define DELAY_NSEC 11000
 | 
						|
#endif
 | 
						|
#ifndef ROUNDS
 | 
						|
# define ROUNDS 1000
 | 
						|
#endif
 | 
						|
#ifndef N
 | 
						|
# define N 100
 | 
						|
#endif
 | 
						|
 | 
						|
static pthread_mutex_t lock;
 | 
						|
 | 
						|
/* Each thread locks and the subsequently unlocks the lock, yielding
 | 
						|
   the smallest critical section possible.  After the unlock the thread
 | 
						|
   waits DELAY_NSEC nanoseconds before doing the lock and unlock again.
 | 
						|
   Every thread does this ROUNDS times.  The lock and unlock are
 | 
						|
   checked for errors.  */
 | 
						|
static void *
 | 
						|
tf (void *arg)
 | 
						|
{
 | 
						|
  int nr = (long int) arg;
 | 
						|
  int cnt;
 | 
						|
  struct timespec ts = { .tv_sec = 0, .tv_nsec = DELAY_NSEC };
 | 
						|
 | 
						|
  for (cnt = 0; cnt < ROUNDS; ++cnt)
 | 
						|
    {
 | 
						|
      if (pthread_mutex_lock (&lock) != 0)
 | 
						|
	{
 | 
						|
	  printf ("thread %d: failed to get the lock\n", nr);
 | 
						|
	  return (void *) 1l;
 | 
						|
	}
 | 
						|
 | 
						|
      if (pthread_mutex_unlock (&lock) != 0)
 | 
						|
	{
 | 
						|
	  printf ("thread %d: failed to release the lock\n", nr);
 | 
						|
	  return (void *) 1l;
 | 
						|
	}
 | 
						|
 | 
						|
      if ((ts.tv_sec > 0) || (ts.tv_nsec > 0))
 | 
						|
	nanosleep (&ts, NULL);
 | 
						|
    }
 | 
						|
 | 
						|
  return NULL;
 | 
						|
}
 | 
						|
 | 
						|
/* Setup and run N threads, where each thread does as described
 | 
						|
   in the above thread function.  The threads are given a minimal 1MiB
 | 
						|
   stack since they don't do anything between the lock and unlock.  */
 | 
						|
static int
 | 
						|
do_test (void)
 | 
						|
{
 | 
						|
  pthread_mutexattr_t a;
 | 
						|
 | 
						|
  if (pthread_mutexattr_init (&a) != 0)
 | 
						|
    {
 | 
						|
      puts ("mutexattr_init failed");
 | 
						|
      exit (1);
 | 
						|
    }
 | 
						|
 | 
						|
  if (pthread_mutexattr_settype (&a, TYPE) != 0)
 | 
						|
    {
 | 
						|
      puts ("mutexattr_settype failed");
 | 
						|
      exit (1);
 | 
						|
    }
 | 
						|
 | 
						|
  if (pthread_mutexattr_setrobust (&a, ROBUST) != 0)
 | 
						|
    {
 | 
						|
      puts ("mutexattr_setrobust failed");
 | 
						|
      exit (1);
 | 
						|
    }
 | 
						|
 | 
						|
#ifdef ENABLE_PI
 | 
						|
  if (pthread_mutexattr_setprotocol (&a, PTHREAD_PRIO_INHERIT) != 0)
 | 
						|
    {
 | 
						|
      puts ("pthread_mutexattr_setprotocol failed");
 | 
						|
      return 1;
 | 
						|
    }
 | 
						|
#endif
 | 
						|
 | 
						|
  int e = pthread_mutex_init (&lock, &a);
 | 
						|
  if (e != 0)
 | 
						|
    {
 | 
						|
#ifdef ENABLE_PI
 | 
						|
      if (e == ENOTSUP)
 | 
						|
	{
 | 
						|
	  puts ("PI mutexes unsupported");
 | 
						|
	  return 0;
 | 
						|
	}
 | 
						|
#endif
 | 
						|
      puts ("mutex_init failed");
 | 
						|
      return 1;
 | 
						|
    }
 | 
						|
 | 
						|
  if (pthread_mutexattr_destroy (&a) != 0)
 | 
						|
    {
 | 
						|
      puts ("mutexattr_destroy failed");
 | 
						|
      return 1;
 | 
						|
    }
 | 
						|
 | 
						|
  pthread_attr_t at;
 | 
						|
  pthread_t th[N];
 | 
						|
  int cnt;
 | 
						|
 | 
						|
  if (pthread_attr_init (&at) != 0)
 | 
						|
    {
 | 
						|
      puts ("attr_init failed");
 | 
						|
      return 1;
 | 
						|
    }
 | 
						|
 | 
						|
  if (pthread_attr_setstacksize (&at, 1 * 1024 * 1024) != 0)
 | 
						|
    {
 | 
						|
      puts ("attr_setstacksize failed");
 | 
						|
      return 1;
 | 
						|
    }
 | 
						|
 | 
						|
  if (pthread_mutex_lock (&lock) != 0)
 | 
						|
    {
 | 
						|
      puts ("locking in parent failed");
 | 
						|
      return 1;
 | 
						|
    }
 | 
						|
 | 
						|
  for (cnt = 0; cnt < N; ++cnt)
 | 
						|
    if (pthread_create (&th[cnt], &at, tf, (void *) (long int) cnt) != 0)
 | 
						|
      {
 | 
						|
	printf ("creating thread %d failed\n", cnt);
 | 
						|
	return 1;
 | 
						|
      }
 | 
						|
 | 
						|
  if (pthread_attr_destroy (&at) != 0)
 | 
						|
    {
 | 
						|
      puts ("attr_destroy failed");
 | 
						|
      return 1;
 | 
						|
    }
 | 
						|
 | 
						|
  if (pthread_mutex_unlock (&lock) != 0)
 | 
						|
    {
 | 
						|
      puts ("unlocking in parent failed");
 | 
						|
      return 1;
 | 
						|
    }
 | 
						|
 | 
						|
  for (cnt = 0; cnt < N; ++cnt)
 | 
						|
    if (pthread_join (th[cnt], NULL) != 0)
 | 
						|
      {
 | 
						|
	printf ("joining thread %d failed\n", cnt);
 | 
						|
	return 1;
 | 
						|
      }
 | 
						|
 | 
						|
  return 0;
 | 
						|
}
 | 
						|
 | 
						|
#define TIMEOUT 60
 | 
						|
#define TEST_FUNCTION do_test ()
 | 
						|
#include "../test-skeleton.c"
 |