mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-24 11:41:07 +00:00
11b076bbae
Now that files using __ASSUME_* macros have been made by <https://sourceware.org/ml/libc-alpha/2014-06/msg00543.html> to include <kernel-features.h> directly, any include from a file not using __ASSUME_* macros can safely be removed (as there will no longer be some other file relying on indirect inclusion via a header from which the include is being removed). This patch removes such unnecessary kernel-features.h includes. Tested x86_64 that disassembly of installed shared libraries is unchanged by this patch, except for line numbers in calls to __assert_fail from libc.so and ld.so. 2014-06-23 Joseph Myers <joseph@codesourcery.com> * nptl/createthread.c: Don't include kernel-features.h. * nptl/pthread_cancel.c: Likewise. * nptl/pthread_condattr_setclock.c: Likewise. * nptl/sysdeps/unix/sysv/linux/pt-raise.c: Likewise. * nptl/sysdeps/unix/sysv/linux/pthread_getcpuclockid.c: Likewise. * nptl/sysdeps/unix/sysv/linux/pthread_kill.c: Likewise. * nptl/sysdeps/unix/sysv/linux/pthread_sigqueue.c: Likewise. * nptl/sysdeps/unix/sysv/linux/raise.c: Likewise. * nptl/sysdeps/unix/sysv/linux/s390/s390-32/pt-vfork.S: Likewise. * nptl/sysdeps/unix/sysv/linux/s390/s390-32/vfork.S: Likewise. * nptl/sysdeps/unix/sysv/linux/s390/s390-64/pt-vfork.S: Likewise. * nptl/sysdeps/unix/sysv/linux/s390/s390-64/vfork.S: Likewise. * nptl/sysdeps/unix/sysv/linux/timer_create.c: Likewise. * nptl/sysdeps/unix/sysv/linux/timer_delete.c: Likewise. * nptl/sysdeps/unix/sysv/linux/timer_getoverr.c: Likewise. * nptl/sysdeps/unix/sysv/linux/timer_gettime.c: Likewise. * nptl/sysdeps/unix/sysv/linux/timer_routines.c: Likewise. * nptl/sysdeps/unix/sysv/linux/timer_settime.c: Likewise. * nscd/gai.c: Likewise. * nss/nss_db/db-open.c: Likewise. * sysdeps/generic/ldsodefs.h: Likewise. * sysdeps/sh/nptl/tls.h: Likewise. * sysdeps/unix/sysv/linux/aarch64/sigaction.c: Likewise. * sysdeps/unix/sysv/linux/aarch64/sigcontextinfo.h: Likewise. * sysdeps/unix/sysv/linux/aarch64/vfork.S: Likewise. * sysdeps/unix/sysv/linux/adjtime.c: Likewise. * sysdeps/unix/sysv/linux/alpha/xstatconv.h: Likewise. * sysdeps/unix/sysv/linux/arm/sigaction.c: Likewise. * sysdeps/unix/sysv/linux/arm/sigcontextinfo.h: Likewise. * sysdeps/unix/sysv/linux/check_pf.c: Likewise. * sysdeps/unix/sysv/linux/clock_getcpuclockid.c: Likewise. * sysdeps/unix/sysv/linux/clock_getres.c: Likewise. * sysdeps/unix/sysv/linux/clock_gettime.c: Likewise. * sysdeps/unix/sysv/linux/clock_nanosleep.c: Likewise. * sysdeps/unix/sysv/linux/clock_settime.c: Likewise. * sysdeps/unix/sysv/linux/dl-execstack.c: Likewise. * sysdeps/unix/sysv/linux/dl-osinfo.h: Likewise. * sysdeps/unix/sysv/linux/dl-sysdep.c: Likewise. * sysdeps/unix/sysv/linux/generic/futimesat.c: Likewise. * sysdeps/unix/sysv/linux/generic/poll.c: Likewise. * sysdeps/unix/sysv/linux/generic/wordsize-32/fcntl.c: Likewise. * sysdeps/unix/sysv/linux/generic/wordsize-32/fxstatat.c: Likewise. * sysdeps/unix/sysv/linux/generic/wordsize-32/pread.c: Likewise. * sysdeps/unix/sysv/linux/generic/wordsize-32/pread64.c: Likewise. * sysdeps/unix/sysv/linux/generic/wordsize-32/preadv.c: Likewise. * sysdeps/unix/sysv/linux/generic/wordsize-32/preadv64.c: Likewise. * sysdeps/unix/sysv/linux/generic/wordsize-32/pwrite.c: Likewise. * sysdeps/unix/sysv/linux/generic/wordsize-32/pwrite64.c: Likewise. * sysdeps/unix/sysv/linux/generic/wordsize-32/pwritev.c: Likewise. * sysdeps/unix/sysv/linux/generic/wordsize-32/pwritev64.c: Likewise. * sysdeps/unix/sysv/linux/getcwd.c: Likewise. * sysdeps/unix/sysv/linux/getpagesize.c: Likewise. * sysdeps/unix/sysv/linux/getsysstats.c: Likewise. * sysdeps/unix/sysv/linux/i386/fxstat.c: Likewise. * sysdeps/unix/sysv/linux/i386/lxstat.c: Likewise. * sysdeps/unix/sysv/linux/i386/mmap.S: Likewise. * sysdeps/unix/sysv/linux/i386/mmap64.S: Likewise. * sysdeps/unix/sysv/linux/i386/sigaction.c: Likewise. * sysdeps/unix/sysv/linux/i386/vfork.S: Likewise. * sysdeps/unix/sysv/linux/i386/xstat.c: Likewise. * sysdeps/unix/sysv/linux/ia64/system.c: Likewise. * sysdeps/unix/sysv/linux/if_index.c: Likewise. * sysdeps/unix/sysv/linux/ifaddrs.c: Likewise. * sysdeps/unix/sysv/linux/ifreq.c: Likewise. * sysdeps/unix/sysv/linux/ldsodefs.h: Likewise. * sysdeps/unix/sysv/linux/lutimes.c: Likewise. * sysdeps/unix/sysv/linux/m68k/vfork.S: Likewise. * sysdeps/unix/sysv/linux/microblaze/nptl/vfork.S: Likewise. * sysdeps/unix/sysv/linux/mips/mips32/accept4.c: Likewise. * sysdeps/unix/sysv/linux/mips/mips32/recvmmsg.c: Likewise. * sysdeps/unix/sysv/linux/mips/mips32/sendmmsg.c: Likewise. * sysdeps/unix/sysv/linux/mips/pread.c: Likewise. * sysdeps/unix/sysv/linux/mips/pread64.c: Likewise. * sysdeps/unix/sysv/linux/mips/pwrite.c: Likewise. * sysdeps/unix/sysv/linux/mips/pwrite64.c: Likewise. * sysdeps/unix/sysv/linux/mips/sigaction.c: Likewise. * sysdeps/unix/sysv/linux/mmap64.c: Likewise. * sysdeps/unix/sysv/linux/netlinkaccess.h: Likewise. * sysdeps/unix/sysv/linux/powerpc/chown.c: Likewise. * sysdeps/unix/sysv/linux/powerpc/dl-sysdep.c: Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc32/clone.S: Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/fe_mask.c: Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/fe_nomask.c: Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc32/getcontext.S: Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc32/pread.c: Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc32/pread64.c: Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc32/pwrite.c: Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc32/pwrite64.c: Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc32/setcontext.S: Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc32/swapcontext.S: Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc32/vfork.S: Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc64/fpu/fe_mask.c: Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc64/fpu/fe_nomask.c: Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc64/getcontext.S: Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc64/makecontext.S: Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc64/pread.c: Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc64/pread64.c: Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc64/pwrite.c: Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc64/pwrite64.c: Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc64/setcontext.S: Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc64/swapcontext.S: Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc64/vfork.S: Likewise. * sysdeps/unix/sysv/linux/pread.c: Likewise. * sysdeps/unix/sysv/linux/pread64.c: Likewise. * sysdeps/unix/sysv/linux/prof-freq.c: Likewise. * sysdeps/unix/sysv/linux/pwrite.c: Likewise. * sysdeps/unix/sysv/linux/pwrite64.c: Likewise. * sysdeps/unix/sysv/linux/s390/s390-32/mmap.S: Likewise. * sysdeps/unix/sysv/linux/s390/s390-32/mmap64.S: Likewise. * sysdeps/unix/sysv/linux/s390/system.c: Likewise. * sysdeps/unix/sysv/linux/sh/pread.c: Likewise. * sysdeps/unix/sysv/linux/sh/pread64.c: Likewise. * sysdeps/unix/sysv/linux/sh/pwrite.c: Likewise. * sysdeps/unix/sysv/linux/sh/pwrite64.c: Likewise. * sysdeps/unix/sysv/linux/sigaction.c: Likewise. * sysdeps/unix/sysv/linux/sigpending.c: Likewise. * sysdeps/unix/sysv/linux/sigprocmask.c: Likewise. * sysdeps/unix/sysv/linux/sigsuspend.c: Likewise. * sysdeps/unix/sysv/linux/sparc/sparc64/xstatconv.c: Likewise. * sysdeps/unix/sysv/linux/sparc/system.c: Likewise. * sysdeps/unix/sysv/linux/syslog.c: Likewise. * sysdeps/unix/sysv/linux/system.c: Likewise. * sysdeps/unix/sysv/linux/testrtsig.h: Likewise. * sysdeps/unix/sysv/linux/timespec_get.c: Likewise. * sysdeps/unix/sysv/linux/ttyname.c: Likewise. * sysdeps/unix/sysv/linux/ttyname_r.c: Likewise. * sysdeps/unix/sysv/linux/utimensat.c: Likewise. * sysdeps/unix/sysv/linux/x86_64/sigaction.c: Likewise. * sysdeps/unix/sysv/linux/xstatconv.h: Likewise.
180 lines
5.0 KiB
C
180 lines
5.0 KiB
C
/* Copyright (C) 2003-2014 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; see the file COPYING.LIB. If
|
|
not, see <http://www.gnu.org/licenses/>. */
|
|
|
|
#include <errno.h>
|
|
#include <pthread.h>
|
|
#include <signal.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <time.h>
|
|
#include <sysdep.h>
|
|
#include <internaltypes.h>
|
|
#include <nptl/pthreadP.h>
|
|
#include "kernel-posix-timers.h"
|
|
#include "kernel-posix-cpu-timers.h"
|
|
|
|
|
|
#ifdef timer_create_alias
|
|
# define timer_create timer_create_alias
|
|
#endif
|
|
|
|
|
|
int
|
|
timer_create (clock_id, evp, timerid)
|
|
clockid_t clock_id;
|
|
struct sigevent *evp;
|
|
timer_t *timerid;
|
|
{
|
|
#undef timer_create
|
|
{
|
|
clockid_t syscall_clockid = (clock_id == CLOCK_PROCESS_CPUTIME_ID
|
|
? MAKE_PROCESS_CPUCLOCK (0, CPUCLOCK_SCHED)
|
|
: clock_id == CLOCK_THREAD_CPUTIME_ID
|
|
? MAKE_THREAD_CPUCLOCK (0, CPUCLOCK_SCHED)
|
|
: clock_id);
|
|
|
|
/* If the user wants notification via a thread we need to handle
|
|
this special. */
|
|
if (evp == NULL
|
|
|| __builtin_expect (evp->sigev_notify != SIGEV_THREAD, 1))
|
|
{
|
|
struct sigevent local_evp;
|
|
|
|
/* We avoid allocating too much memory by basically
|
|
using struct timer as a derived class with the
|
|
first two elements being in the superclass. We only
|
|
need these two elements here. */
|
|
struct timer *newp = (struct timer *) malloc (offsetof (struct timer,
|
|
thrfunc));
|
|
if (newp == NULL)
|
|
/* No more memory. */
|
|
return -1;
|
|
|
|
if (evp == NULL)
|
|
{
|
|
/* The kernel has to pass up the timer ID which is a
|
|
userlevel object. Therefore we cannot leave it up to
|
|
the kernel to determine it. */
|
|
local_evp.sigev_notify = SIGEV_SIGNAL;
|
|
local_evp.sigev_signo = SIGALRM;
|
|
local_evp.sigev_value.sival_ptr = newp;
|
|
|
|
evp = &local_evp;
|
|
}
|
|
|
|
kernel_timer_t ktimerid;
|
|
int retval = INLINE_SYSCALL (timer_create, 3, syscall_clockid, evp,
|
|
&ktimerid);
|
|
|
|
if (retval != -1)
|
|
{
|
|
newp->sigev_notify = (evp != NULL
|
|
? evp->sigev_notify : SIGEV_SIGNAL);
|
|
newp->ktimerid = ktimerid;
|
|
|
|
*timerid = (timer_t) newp;
|
|
}
|
|
else
|
|
{
|
|
/* Cannot allocate the timer, fail. */
|
|
free (newp);
|
|
retval = -1;
|
|
}
|
|
|
|
return retval;
|
|
}
|
|
else
|
|
{
|
|
/* Create the helper thread. */
|
|
pthread_once (&__helper_once, __start_helper_thread);
|
|
if (__helper_tid == 0)
|
|
{
|
|
/* No resources to start the helper thread. */
|
|
__set_errno (EAGAIN);
|
|
return -1;
|
|
}
|
|
|
|
struct timer *newp;
|
|
newp = (struct timer *) malloc (sizeof (struct timer));
|
|
if (newp == NULL)
|
|
return -1;
|
|
|
|
/* Copy the thread parameters the user provided. */
|
|
newp->sival = evp->sigev_value;
|
|
newp->thrfunc = evp->sigev_notify_function;
|
|
newp->sigev_notify = SIGEV_THREAD;
|
|
|
|
/* We cannot simply copy the thread attributes since the
|
|
implementation might keep internal information for
|
|
each instance. */
|
|
(void) pthread_attr_init (&newp->attr);
|
|
if (evp->sigev_notify_attributes != NULL)
|
|
{
|
|
struct pthread_attr *nattr;
|
|
struct pthread_attr *oattr;
|
|
|
|
nattr = (struct pthread_attr *) &newp->attr;
|
|
oattr = (struct pthread_attr *) evp->sigev_notify_attributes;
|
|
|
|
nattr->schedparam = oattr->schedparam;
|
|
nattr->schedpolicy = oattr->schedpolicy;
|
|
nattr->flags = oattr->flags;
|
|
nattr->guardsize = oattr->guardsize;
|
|
nattr->stackaddr = oattr->stackaddr;
|
|
nattr->stacksize = oattr->stacksize;
|
|
}
|
|
|
|
/* In any case set the detach flag. */
|
|
(void) pthread_attr_setdetachstate (&newp->attr,
|
|
PTHREAD_CREATE_DETACHED);
|
|
|
|
/* Create the event structure for the kernel timer. */
|
|
struct sigevent sev =
|
|
{ .sigev_value.sival_ptr = newp,
|
|
.sigev_signo = SIGTIMER,
|
|
.sigev_notify = SIGEV_SIGNAL | SIGEV_THREAD_ID,
|
|
._sigev_un = { ._pad = { [0] = __helper_tid } } };
|
|
|
|
/* Create the timer. */
|
|
INTERNAL_SYSCALL_DECL (err);
|
|
int res;
|
|
res = INTERNAL_SYSCALL (timer_create, err, 3,
|
|
syscall_clockid, &sev, &newp->ktimerid);
|
|
if (! INTERNAL_SYSCALL_ERROR_P (res, err))
|
|
{
|
|
/* Add to the queue of active timers with thread
|
|
delivery. */
|
|
pthread_mutex_lock (&__active_timer_sigev_thread_lock);
|
|
newp->next = __active_timer_sigev_thread;
|
|
__active_timer_sigev_thread = newp;
|
|
pthread_mutex_unlock (&__active_timer_sigev_thread_lock);
|
|
|
|
*timerid = (timer_t) newp;
|
|
return 0;
|
|
}
|
|
|
|
/* Free the resources. */
|
|
free (newp);
|
|
|
|
__set_errno (INTERNAL_SYSCALL_ERRNO (res, err));
|
|
|
|
return -1;
|
|
}
|
|
}
|
|
}
|