From 8c2e9a29b1fbda33e57b2d33c7bfcb0de666b1fb Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Fri, 21 Feb 2003 10:00:33 +0000 Subject: Update. * pthreadP.h: Define INVALID_TD_P and INVALID_NOT_TERMINATED_TD_P. * pthread_cancel.c: Use INVALID_TD_P. * pthread_detach.c: Likewise. * pthread_getschedparam.c: Likewise. * pthread_setschedparam.c: Likewise. * sysdeps/pthread/pthread_getcpuclockid.c: Likewise. * sysdeps/unix/sysv/linux/pthread_kill.c: Likewise. * pthread_join.c: Use INVALID_NOT_TERMINATED_TD_P. * pthread_timedjoin.c: Likewise. * tst-basic7.c: Include . --- nptl/sysdeps/pthread/pthread_getcpuclockid.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) (limited to 'nptl/sysdeps/pthread/pthread_getcpuclockid.c') diff --git a/nptl/sysdeps/pthread/pthread_getcpuclockid.c b/nptl/sysdeps/pthread/pthread_getcpuclockid.c index 62761f9d7a..6386dc4dc0 100644 --- a/nptl/sysdeps/pthread/pthread_getcpuclockid.c +++ b/nptl/sysdeps/pthread/pthread_getcpuclockid.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc. +/* Copyright (C) 2000, 2001, 2002, 2003 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -17,23 +17,30 @@ Boston, MA 02111-1307, USA. */ #include -#include +#include #include #include int -pthread_getcpuclockid (thread_id, clock_id) - pthread_t thread_id; - clockid_t *clock_id; +pthread_getcpuclockid (threadid, clockid) + pthread_t threadid; + clockid_t *clockid; { + struct pthread *pd = (struct pthread *) threadid; + + /* Make sure the descriptor is valid. */ + if (INVALID_TD_P (pd)) + /* Not a valid thread handle. */ + return ESRCH; + /* We don't allow any process ID but our own. */ - if ((struct pthread *) thread_id != THREAD_SELF) + if (pd != THREAD_SELF) return EPERM; #ifdef CLOCK_THREAD_CPUTIME_ID /* Store the number. */ - *clock_id = CLOCK_THREAD_CPUTIME_ID; + *clockid = CLOCK_THREAD_CPUTIME_ID; return 0; #else -- cgit v1.2.3