mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-21 10:20:06 +00:00
c0fb8a563c
1998-06-07 13:32 Ulrich Drepper <drepper@cygnus.com> * libc.map: Add _dl_profile. * elf/dl-reloc.c (_dl_relocate_object): Take extra argument, pass this to ELF_DYNAMIC_RELOCATE. Always allocate array for relocation result if LD_PROFILE is defined. * elf/ldsodefs.h: Adjust prototypes. * elf/dl-open.c (_dl_open): Call relocation function with extra argument. * elf/rtld.c: Likewise. * elf/dl-profile.c (_dl_mcount): Don't mark as internal function. Correct loop condition. * elf/dynamic-link.h: Don't examine _dl_profile variable, pass consider_profile to runtime setup function. * sysdeps/i386/dl-machine.h (elf_machine_runtime_setup): Use _dl_runtime_profile for all shared objects if LD_PROFILE is defined. * elf/dl-support.c: Define __libc_stack_end. * elf/rtld.c: Likewise. * sysdeps/generic/libc-start.c: Store last stack address in __libc_stack_end. * sysdeps/i386/dl-machine.h (_dl_start_user): Store stack address. * sysdeps/i386/elf/start.s: Call __libc_start_main with extra argument. * elf/elf.h: Include <features.h>, not <sys/cdefs.h>. Include <stdint.h>, not <inttypes.h>. * elf/sprof.c: Implement flat profiling. * libio/fgetc.c: Call _IO_cleanup_region_end with 0 and call _IO_funlockfile explicitly. * libio/fileops.c: Likewise. * libio/fputc.c: Likewise. * libio/freopen.c: Likewise. * libio/freopen64.c: Likewise. * libio/fseek.c: Likewise. * libio/fseeko.c: Likewise. * libio/fseeko64.c: Likewise. * libio/ftello.c: Likewise. * libio/ftello64.c: Likewise. * libio/getc.c: Likewise. * libio/getchar.c: Likewise. * libio/iofclose.c: Likewise. * libio/iofflush.c: Likewise. * libio/iofgetpos.c: Likewise. * libio/iofgetpos64.c: Likewise. * libio/iofgets.c: Likewise. * libio/iofputs.c: Likewise. * libio/iofread.c: Likewise. * libio/iofsetpos.c: Likewise. * libio/iofsetpos64.c: Likewise. * libio/ioftell.c: Likewise. * libio/iofwrite.c: Likewise. * libio/iogetdelim.c: Likewise. * libio/iogets.c: Likewise. * libio/ioputs.c: Likewise. * libio/ioseekoff.c: Likewise. * libio/ioseekpos.c: Likewise. * libio/iosetbuffer.c: Likewise. * libio/iosetvbuf.c: Likewise. * libio/ioungetc.c: Likewise. * libio/iovsprintf.c: Likewise. * libio/iovsscanf.c: Likewise. * libio/oldfileops.c: Likewise. * libio/oldiofclose.c: Likewise. * libio/peekc.c: Likewise. * libio/putc.c: Likewise. * libio/putchar.c: Likewise. * libio/rewind.c: Likewise. * malloc/mtrace.c: Pretty print. * misc/mntent.h (struct mentent): Make string elements const char *. * nis/nis_printf.c: Optimize I/O a little bit. * signal/Makefile (distribute): Add sigset-cvt-mask.h. * sysdeps/generic/sigset-cvt-mask.h: New file. * sysdeps/unix/sysv/linux/sigset-cvt-mask.h: New file. * sysdeps/unix/sysv/sysv4/sigset-cvt-mask.h: New file. * sysdeps/posix/sigvec.c: Rewrite the use definitions from sigset-cvt-mask.h to do the dirty work. Patches by Joe Keane. * sysdeps/posix/mkstemp.c: Save one precious byte of rodata. * sysdeps/unix/sysv/linux/i386/sysdep.h: Rewrite PSEUDO etc to make syscall_error label in case of PIC anonymous. * sysdeps/unix/sysv/linux/i386/i686/sysdep.h: Likewise. * sysdeps/unix/sysv/linux/i386/clone.S: Adapt for this change. * sysdeps/unix/sysv/linux/i386/mmap.S: Adapt for this change. * sysdeps/unix/sysv/linux/i386/s_pread64.S: Adapt for this change. * sysdeps/unix/sysv/linux/i386/s_pwrite64.S: Adapt for this change. * sysdeps/unix/sysv/linux/i386/socket.S: Adapt for this change. * sysdeps/unix/sysv/linux/i386/syscall.S: Adapt for this change.
166 lines
4.2 KiB
C
166 lines
4.2 KiB
C
/* Copyright (C) 1991, 92, 94, 95, 96, 97, 98 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
|
|
modify it under the terms of the GNU Library General Public License as
|
|
published by the Free Software Foundation; either version 2 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
|
|
Library General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Library General Public
|
|
License along with the GNU C Library; see the file COPYING.LIB. If not,
|
|
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
Boston, MA 02111-1307, USA. */
|
|
|
|
#include <signal.h>
|
|
#include <errno.h>
|
|
#include <stddef.h>
|
|
|
|
/* Include macros to convert between `sigset_t' and old-style mask. */
|
|
#include "sigset-cvt-mask.h"
|
|
|
|
/* We use a wrapper handler to support SV_RESETHAND. */
|
|
struct sigvec_wrapper_data
|
|
{
|
|
__sighandler_t sw_handler;
|
|
unsigned int sw_mask;
|
|
};
|
|
|
|
static void sigvec_wrapper_handler __P ((int sig));
|
|
|
|
static struct sigvec_wrapper_data sigvec_wrapper_data[NSIG];
|
|
|
|
|
|
/* If VEC is non-NULL, set the handler for SIG to the `sv_handler' member
|
|
of VEC. The signals in `sv_mask' will be blocked while the handler runs.
|
|
If the SV_RESETHAND bit is set in `sv_flags', the handler for SIG will be
|
|
reset to SIG_DFL before `sv_handler' is entered. If OVEC is non-NULL,
|
|
it is filled in with the old information for SIG. */
|
|
int
|
|
__sigvec (sig, vec, ovec)
|
|
int sig;
|
|
const struct sigvec *vec;
|
|
struct sigvec *ovec;
|
|
{
|
|
struct sigaction old;
|
|
|
|
if (vec == NULL || !(vec->sv_flags & SV_RESETHAND))
|
|
{
|
|
struct sigaction new, *n;
|
|
|
|
if (vec == NULL)
|
|
n = NULL;
|
|
else
|
|
{
|
|
__sighandler_t handler;
|
|
unsigned int mask;
|
|
unsigned int sv_flags;
|
|
unsigned int sa_flags;
|
|
|
|
handler = vec->sv_handler;
|
|
mask = vec->sv_mask;
|
|
sv_flags = vec->sv_flags;
|
|
sa_flags = 0;
|
|
if (sv_flags & SV_ONSTACK)
|
|
{
|
|
#ifdef SA_ONSTACK
|
|
sa_flags |= SA_ONSTACK;
|
|
#else
|
|
__set_errno (ENOSYS);
|
|
return -1;
|
|
#endif
|
|
}
|
|
#ifdef SA_RESTART
|
|
if (!(sv_flags & SV_INTERRUPT))
|
|
sa_flags |= SA_RESTART;
|
|
#endif
|
|
n = &new;
|
|
new.sa_handler = handler;
|
|
sigset_set_old_mask (&new.sa_mask, mask);
|
|
new.sa_flags = sa_flags;
|
|
}
|
|
|
|
if (__sigaction (sig, n, &old) < 0)
|
|
return -1;
|
|
}
|
|
else
|
|
{
|
|
__sighandler_t handler;
|
|
unsigned int mask;
|
|
struct sigvec_wrapper_data *data;
|
|
struct sigaction wrapper;
|
|
|
|
handler = vec->sv_handler;
|
|
mask = (unsigned int)vec->sv_mask;
|
|
data = &sigvec_wrapper_data[sig];
|
|
wrapper.sa_handler = sigvec_wrapper_handler;
|
|
/* FIXME: should we set wrapper.sa_mask, wrapper.sa_flags?? */
|
|
data->sw_handler = handler;
|
|
data->sw_mask = mask;
|
|
|
|
if (__sigaction (sig, &wrapper, &old) < 0)
|
|
return -1;
|
|
}
|
|
|
|
if (ovec != NULL)
|
|
{
|
|
__sighandler_t handler;
|
|
unsigned int sv_flags;
|
|
unsigned int sa_flags;
|
|
unsigned int mask;
|
|
|
|
handler = old.sa_handler;
|
|
sv_flags = 0;
|
|
sa_flags = old.sa_flags;
|
|
if (handler == sigvec_wrapper_handler)
|
|
{
|
|
handler = sigvec_wrapper_data[sig].sw_handler;
|
|
/* should we use data->sw_mask?? */
|
|
sv_flags |= SV_RESETHAND;
|
|
}
|
|
sigset_get_old_mask (&old.sa_mask, mask);
|
|
#ifdef SA_ONSTACK
|
|
if (sa_flags & SA_ONSTACK)
|
|
sv_flags |= SV_ONSTACK;
|
|
#endif
|
|
#ifdef SA_RESTART
|
|
if (!(sa_flags & SA_RESTART))
|
|
#endif
|
|
sv_flags |= SV_INTERRUPT;
|
|
ovec->sv_handler = handler;
|
|
ovec->sv_mask = (int)mask;
|
|
ovec->sv_flags = (int)sv_flags;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
weak_alias (__sigvec, sigvec)
|
|
|
|
|
|
static void
|
|
sigvec_wrapper_handler (sig)
|
|
int sig;
|
|
{
|
|
struct sigvec_wrapper_data *data;
|
|
unsigned int mask;
|
|
struct sigaction act;
|
|
int save;
|
|
__sighandler_t handler;
|
|
|
|
data = &sigvec_wrapper_data[sig];
|
|
mask = data->sw_mask;
|
|
act.sa_handler = SIG_DFL;
|
|
sigset_set_old_mask (&act.sa_mask, mask);
|
|
act.sa_flags = 0;
|
|
save = errno;
|
|
handler = data->sw_handler;
|
|
(void) __sigaction (sig, &act, (struct sigaction *) NULL);
|
|
__set_errno (save);
|
|
(*handler) (sig);
|
|
}
|