Skip to content

Commit

Permalink
Update.
Browse files Browse the repository at this point in the history
2004-10-04  Ulrich Drepper  <drepper@redhat.com>

	* sysdeps/unix/sysv/linux/i386/bits/posix_opt.h: Define _POSIX_CPUTIME
	and _POSIX_THREAD_CPUTIME to zero.
	* sysdeps/unix/sysv/linux/ia64/bits/posix_opt.h: Likewise.
	* tst-barrier2.c: Fix testing for POSIX feature.
	* tst-clock1.c: Likewise.
	* tst-clock2.c: Likewise.
	* tst-cond11.c: Likewise.
	* tst-cond4.c: Likewise.
	* tst-cond6.c: Likewise.
	* tst-flock2.c: Likewise.
	* tst-mutex4.c: Likewise.
	* tst-mutex9.c: Likewise.
	* tst-rwlock12.c: Likewise.
	* tst-rwlock4.c: Likewise.
	* tst-signal1.c: Likewise.
	* tst-spin2.c: Likewise.
	* sysdeps/pthread/posix-timer.h: Likewise.
	* sysdeps/pthread/timer_create.c: Likewise.
	* sysdeps/pthread/timer_routines.c: Likewise.
  • Loading branch information
Ulrich Drepper committed Oct 4, 2004
1 parent 94d824f commit e4bb485
Show file tree
Hide file tree
Showing 19 changed files with 57 additions and 113 deletions.
22 changes: 22 additions & 0 deletions nptl/ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,25 @@
2004-10-04 Ulrich Drepper <drepper@redhat.com>

* sysdeps/unix/sysv/linux/i386/bits/posix_opt.h: Define _POSIX_CPUTIME
and _POSIX_THREAD_CPUTIME to zero.
* sysdeps/unix/sysv/linux/ia64/bits/posix_opt.h: Likewise.
* tst-barrier2.c: Fix testing for POSIX feature.
* tst-clock1.c: Likewise.
* tst-clock2.c: Likewise.
* tst-cond11.c: Likewise.
* tst-cond4.c: Likewise.
* tst-cond6.c: Likewise.
* tst-flock2.c: Likewise.
* tst-mutex4.c: Likewise.
* tst-mutex9.c: Likewise.
* tst-rwlock12.c: Likewise.
* tst-rwlock4.c: Likewise.
* tst-signal1.c: Likewise.
* tst-spin2.c: Likewise.
* sysdeps/pthread/posix-timer.h: Likewise.
* sysdeps/pthread/timer_create.c: Likewise.
* sysdeps/pthread/timer_routines.c: Likewise.

2004-10-01 Ulrich Drepper <drepper@redhat.com>

* sysdeps/unix/sysv/linux/x86_64/lowlevellock.S
Expand Down
6 changes: 3 additions & 3 deletions nptl/sysdeps/pthread/posix-timer.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* Definitions for POSIX timer implementation on top of NPTL.
Copyright (C) 2000, 2002, 2003 Free Software Foundation, Inc.
Copyright (C) 2000, 2002, 2003, 2004 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Kaz Kylheku <kaz@ashi.footprints.net>.
Expand Down Expand Up @@ -92,10 +92,10 @@ extern int __timer_init_failed;
/* A distinct thread is used for each clock type. */

extern struct thread_node __timer_signal_thread_rclk;
#ifdef _POSIX_CPUTIME
#if defined _POSIX_CPUTIME && _POSIX_CPUTIME >= 0
extern struct thread_node __timer_signal_thread_pclk;
#endif
#ifdef _POSIX_THREAD_CPUTIME
#if defined _POSIX_THREAD_CPUTIME && _POSIX_THREAD_CPUTIME >= 0
extern struct thread_node __timer_signal_thread_tclk;
#endif

Expand Down
8 changes: 4 additions & 4 deletions nptl/sysdeps/pthread/timer_create.c
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@ timer_create (clock_id, evp, timerid)
struct thread_node *thread = NULL;

if (0
#ifdef _POSIX_CPUTIME
#ifdef CLOCK_PROCESS_CPUTIME_ID
|| clock_id == CLOCK_PROCESS_CPUTIME_ID
#endif
#ifdef _POSIX_THREAD_CPUTIME
#ifdef CLOCK_THREAD_CPUTIME_ID
|| clock_id == CLOCK_THREAD_CPUTIME_ID
#endif
)
Expand Down Expand Up @@ -100,12 +100,12 @@ timer_create (clock_id, evp, timerid)
default:
thread = &__timer_signal_thread_rclk;
break;
#ifdef _POSIX_CPUTIME
#ifdef CLOCK_PROCESS_CPUTIME_ID
case CLOCK_PROCESS_CPUTIME_ID:
thread = &__timer_signal_thread_pclk;
break;
#endif
#ifdef _POSIX_THREAD_CPUTIME
#ifdef CLOCK_THREAD_CPUTIME_ID
case CLOCK_THREAD_CPUTIME_ID:
thread = &__timer_signal_thread_tclk;
break;
Expand Down
12 changes: 6 additions & 6 deletions nptl/sysdeps/pthread/timer_routines.c
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,10 @@ int __timer_init_failed;

/* Node for the thread used to deliver signals. */
struct thread_node __timer_signal_thread_rclk;
#ifdef _POSIX_CPUTIME
#if defined _POSIX_CPUTIME && _POSIX_CPUTIME >= 0
struct thread_node __timer_signal_thread_pclk;
#endif
#ifdef _POSIX_THREAD_CPUTIME
#if defined _POSIX_THREAD_CPUTIME && _POSIX_THREAD_CPUTIME >= 0
struct thread_node __timer_signal_thread_tclk;
#endif

Expand Down Expand Up @@ -191,10 +191,10 @@ init_module (void)
list_append (&thread_free_list, &thread_array[i].links);

thread_init (&__timer_signal_thread_rclk, 0, CLOCK_REALTIME);
#ifdef _POSIX_CPUTIME
#if defined _POSIX_CPUTIME && _POSIX_CPUTIME >= 0
thread_init (&__timer_signal_thread_pclk, 0, CLOCK_PROCESS_CPUTIME_ID);
#endif
#ifdef _POSIX_THREAD_CPUTIME
#if defined _POSIX_THREAD_CPUTIME && _POSIX_THREAD_CPUTIME >= 0
thread_init (&__timer_signal_thread_tclk, 0, CLOCK_THREAD_CPUTIME_ID);
#endif
}
Expand Down Expand Up @@ -281,10 +281,10 @@ thread_cleanup (void *val)

/* How did the signal thread get killed? */
assert (thread != &__timer_signal_thread_rclk);
#ifdef _POSIX_CPUTIME
#if defined _POSIX_CPUTIME && _POSIX_CPUTIME >= 0
assert (thread != &__timer_signal_thread_pclk);
#endif
#ifdef _POSIX_THREAD_CPUTIME
#if defined _POSIX_THREAD_CPUTIME && _POSIX_THREAD_CPUTIME >= 0
assert (thread != &__timer_signal_thread_tclk);
#endif

Expand Down
4 changes: 2 additions & 2 deletions nptl/sysdeps/unix/sysv/linux/i386/bits/posix_opt.h
Original file line number Diff line number Diff line change
Expand Up @@ -103,10 +103,10 @@
#define _POSIX_SHARED_MEMORY_OBJECTS 200112L

/* CPU-time clocks supported. */
#define _POSIX_CPUTIME 200112L
#define _POSIX_CPUTIME 0

/* We support the clock also in threads. */
#define _POSIX_THREAD_CPUTIME 200112L
#define _POSIX_THREAD_CPUTIME 0

/* GNU libc provides regular expression handling. */
#define _POSIX_REGEXP 1
Expand Down
4 changes: 2 additions & 2 deletions nptl/sysdeps/unix/sysv/linux/ia64/bits/posix_opt.h
Original file line number Diff line number Diff line change
Expand Up @@ -103,10 +103,10 @@
#define _POSIX_SHARED_MEMORY_OBJECTS 200112L

/* CPU-time clocks supported. */
#define _POSIX_CPUTIME 200112L
#define _POSIX_CPUTIME 0

/* We support the clock also in threads. */
#define _POSIX_THREAD_CPUTIME 200112L
#define _POSIX_THREAD_CPUTIME 0

/* GNU libc provides regular expression handling. */
#define _POSIX_REGEXP 1
Expand Down
9 changes: 1 addition & 8 deletions nptl/tst-barrier2.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright (C) 2002, 2003 Free Software Foundation, Inc.
/* Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
Expand Down Expand Up @@ -31,12 +31,6 @@
static int
do_test (void)
{
#if ! _POSIX_THREAD_PROCESS_SHARED

puts ("_POSIX_THREAD_PROCESS_SHARED not supported, test skipped");

#else

size_t ps = sysconf (_SC_PAGESIZE);
char tmpfname[] = "/tmp/tst-barrier2.XXXXXX";
char data[ps];
Expand Down Expand Up @@ -183,7 +177,6 @@ do_test (void)
WEXITSTATUS (status) + serials, N);
return 1;
}
#endif

return 0;
}
Expand Down
6 changes: 3 additions & 3 deletions nptl/tst-clock1.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright (C) 2003 Free Software Foundation, Inc.
/* Copyright (C) 2003, 2004 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@redhat.com>, 2003.
Expand Down Expand Up @@ -27,13 +27,13 @@
int
do_test (void)
{
#if _POSIX_THREAD_CPUTIME
#ifdef _POSIX_THREAD_CPUTIME && _POSIX_THREAD_CPUTIME >= 0
clockid_t cl;
/* This is really only a linking-test here. */
int e = pthread_getcpuclockid (pthread_self (), &cl);
if (e != 0)
{
# if _POSIX_THREAD_CPUTIME < 0
# if _POSIX_THREAD_CPUTIME == 0
if (sysconf (_SC_THREAD_CPUTIME) >= 0)
# endif
{
Expand Down
4 changes: 2 additions & 2 deletions nptl/tst-clock2.c
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#include <unistd.h>


#if _POSIX_THREAD_CPUTIME
#ifdef _POSIX_THREAD_CPUTIME && _POSIX_THREAD_CPUTIME >= 0
static pthread_barrier_t b2;
static pthread_barrier_t bN;

Expand Down Expand Up @@ -55,7 +55,7 @@ tf (void *arg)
int
do_test (void)
{
#if _POSIX_THREAD_CPUTIME
#if defined _POSIX_THREAD_CPUTIME && _POSIX_THREAD_CPUTIME >= 0
# define N 10

if (pthread_barrier_init (&b2, NULL, 2) != 0
Expand Down
8 changes: 4 additions & 4 deletions nptl/tst-cond11.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright (C) 2003 Free Software Foundation, Inc.
/* Copyright (C) 2003, 2004 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@redhat.com>, 2003.
Expand All @@ -24,7 +24,7 @@
#include <unistd.h>


#if _POSIX_CLOCK_SELECTION
#ifdef _POSIX_CLOCK_SELECTION && _POSIX_CLOCK_SELECTION >= 0
static int
run_test (clockid_t cl)
{
Expand Down Expand Up @@ -156,7 +156,7 @@ run_test (clockid_t cl)
static int
do_test (void)
{
#if ! _POSIX_CLOCK_SELECTION
#if !defined _POSIX_CLOCK_SELECTION || _POSIX_CLOCK_SELECTION == -1

puts ("_POSIX_CLOCK_SELECTION not supported, test skipped");
return 0;
Expand All @@ -165,7 +165,7 @@ do_test (void)

int res = run_test (CLOCK_REALTIME);

# if defined _POSIX_MONOTONIC_CLOCK
# if defined _POSIX_MONOTONIC_CLOCK && _POSIX_MONOTONIC_CLOCK >= 0
# if _POSIX_MONOTONIC_CLOCK == 0
int e = sysconf (_SC_MONOTONIC_CLOCK);
if (e < 0)
Expand Down
10 changes: 1 addition & 9 deletions nptl/tst-cond4.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright (C) 2002, 2003 Free Software Foundation, Inc.
/* Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
Expand Down Expand Up @@ -32,13 +32,6 @@ int *condition;
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-cond4.XXXXXX";
char data[ps];
Expand Down Expand Up @@ -264,7 +257,6 @@ do_test (void)
}

return result;
#endif
}

#define TEST_FUNCTION do_test ()
Expand Down
8 changes: 0 additions & 8 deletions nptl/tst-cond6.c
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,6 @@ int *condition;
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-cond6.XXXXXX";
char data[ps];
Expand Down Expand Up @@ -234,7 +227,6 @@ do_test (void)
}

return result;
#endif
}

#define TEST_FUNCTION do_test ()
Expand Down
10 changes: 1 addition & 9 deletions nptl/tst-flock2.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright (C) 2002, 2003 Free Software Foundation, Inc.
/* Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
Expand Down Expand Up @@ -59,13 +59,6 @@ tf (void *arg)
static int
do_test (void)
{
#if ! _POSIX_THREAD_PROCESS_SHARED

puts ("_POSIX_THREAD_PROCESS_SHARED not supported, test skipped");
return 0;

#else

char tmp[] = "/tmp/tst-flock2-XXXXXX";

fd = mkstemp (tmp);
Expand Down Expand Up @@ -261,7 +254,6 @@ do_test (void)
}

return status;
#endif
}

#define TEST_FUNCTION do_test ()
Expand Down
10 changes: 1 addition & 9 deletions nptl/tst-mutex4.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright (C) 2002, 2003 Free Software Foundation, Inc.
/* Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
Expand Down Expand Up @@ -31,13 +31,6 @@
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-mutex4.XXXXXX";
char data[ps];
Expand Down Expand Up @@ -191,7 +184,6 @@ do_test (void)
}

return 0;
#endif
}

#define TIMEOUT 4
Expand Down
10 changes: 1 addition & 9 deletions nptl/tst-mutex9.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright (C) 2003 Free Software Foundation, Inc.
/* Copyright (C) 2003, 2004 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@redhat.com>, 2003.
Expand Down Expand Up @@ -29,13 +29,6 @@
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];
Expand Down Expand Up @@ -186,7 +179,6 @@ do_test (void)
}

return 0;
#endif
}

#define TIMEOUT 3
Expand Down
Loading

0 comments on commit e4bb485

Please sign in to comment.