mirror of
https://github.com/Zenithsiz/ftmemsim-valgrind.git
synced 2026-02-04 10:21:20 +00:00
6b5a479bda
All memory dereferences during leak search are checked either with aspacemgr or using the VA-bits. So, in theory, no memory fault should occur. However, the leak search is done so as to resist to e.g. - desynchronisation between the real pages mapped and the aspacemgr state. - client pages mprotected against reading - any other reason why dereferencing a client address would fail. So, the function lc_scan_memory installs a fault catcher that is called if a memory fault signal is raised during memory scan. However, memory dereference is also done in the function heuristic_reachedness. So, this function must also resist to memory fault. This patch also installs a fault catcher for the function heuristic_reachedness. More in details, the following changes are done: * pub_tool_signal.h and m_signals.c : VG_(set_fault_catcher) now returns the previously set fault catcher. This is needed so that heuristic_reachedness/lc_scan_memory can save and restore the previous fault catcher. * mc_leakcheck.c: Addition of leak_search_fault_catcher that contains the common code for the (currently 2) fault catchers used during leak search. * Modification of heuristic_reachedness and lc_scan_memory: Add 2 (small) specific fault catcher that are calling the common leak_search_fault_catcher. * The way sigprocmask is handled has been changed: Before this patch, lc_scan_memory was saving/restoring the procsigmask for each scanned block (and was restoring it when the fault catcher was longjmp-ing back to lc_scan_memory in case of SEGV or BUS. This was causing 2 system calls for each block scanned. Now, lc_scan_memory and heuristic_reachedness are not saving/restoring the procmask: the work to reset the sigprocmask is only done in leak_search_fault_catcher. This is more efficient as no syscall anymore is done during leak search, except for (normally) unfrequent SIGSEGV/BUS. It is also simpler as signal handling is now done at a single place. It is ok to reset the procmask (in fact, just remove the caught signal from the process sigmask) as during leak search, no other activity than the leak search is on-going, and so no other SEGV/BUS can be received while the handler runs. This gives moderate speed improvements for applications allocating a lot of blocks (about 10% improvement when leak searching in 1 million small blocks). Test case (slightly modified) by Matthias Schwarzott. git-svn-id: svn://svn.valgrind.org/valgrind/trunk@15716
97 lines
4.2 KiB
C
97 lines
4.2 KiB
C
|
|
/*--------------------------------------------------------------------*/
|
|
/*--- Signal-related libc stuff. pub_core_libcsignal.h ---*/
|
|
/*--------------------------------------------------------------------*/
|
|
|
|
/*
|
|
This file is part of Valgrind, a dynamic binary instrumentation
|
|
framework.
|
|
|
|
Copyright (C) 2000-2015 Julian Seward
|
|
jseward@acm.org
|
|
|
|
This program is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU General Public License as
|
|
published by the Free Software Foundation; either version 2 of the
|
|
License, or (at your option) any later version.
|
|
|
|
This program 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
|
|
General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
|
02111-1307, USA.
|
|
|
|
The GNU General Public License is contained in the file COPYING.
|
|
*/
|
|
|
|
#ifndef __PUB_CORE_LIBCSIGNAL_H
|
|
#define __PUB_CORE_LIBCSIGNAL_H
|
|
|
|
//--------------------------------------------------------------------
|
|
// PURPOSE: This module contains all the libc code related to signals.
|
|
//--------------------------------------------------------------------
|
|
|
|
#include "pub_tool_libcsignal.h"
|
|
|
|
/* Note that these use the vki_ (kernel) structure
|
|
definitions, which are different in places from those that glibc
|
|
defines. Since we're operating right at the kernel interface, glibc's view
|
|
of the world is entirely irrelevant. */
|
|
|
|
/* --- Signal set ops --- */
|
|
extern Int VG_(sigfillset) ( vki_sigset_t* set );
|
|
extern Int VG_(sigemptyset) ( vki_sigset_t* set );
|
|
|
|
extern Bool VG_(isfullsigset) ( const vki_sigset_t* set );
|
|
extern Bool VG_(isemptysigset) ( const vki_sigset_t* set );
|
|
extern Bool VG_(iseqsigset) ( const vki_sigset_t* set1,
|
|
const vki_sigset_t* set2 );
|
|
|
|
extern Int VG_(sigaddset) ( vki_sigset_t* set, Int signum );
|
|
/* VG_(sigdelset) is in pub_tool_libcsignal.h */
|
|
extern Int VG_(sigismember) ( const vki_sigset_t* set, Int signum );
|
|
|
|
extern void VG_(sigaddset_from_set) ( vki_sigset_t* dst, const vki_sigset_t* src );
|
|
extern void VG_(sigdelset_from_set) ( vki_sigset_t* dst, const vki_sigset_t* src );
|
|
extern void VG_(sigintersectset) ( vki_sigset_t* dst, const vki_sigset_t* src );
|
|
extern void VG_(sigcomplementset) ( vki_sigset_t* dst, const vki_sigset_t* src );
|
|
|
|
/* --- Mess with the kernel's sig state --- */
|
|
/* VG_(sigprocmask) is in pub_tool_libcsignal.h. */
|
|
|
|
extern Int VG_(sigaction) ( Int signum,
|
|
const vki_sigaction_toK_t* act,
|
|
vki_sigaction_fromK_t* oldact );
|
|
|
|
/* Convert a sigaction which you got from the kernel (a _fromK_t) to
|
|
one which you can give back to the kernel (a _toK_t). On Linux,
|
|
vki_sigaction_{toK,fromK}_t are identical, so this is a no-op
|
|
(structure copy), but on Darwin it's not a no-op. */
|
|
extern void VG_(convert_sigaction_fromK_to_toK)(
|
|
const vki_sigaction_fromK_t*, /*OUT*/vki_sigaction_toK_t*);
|
|
|
|
|
|
extern Int VG_(kill) ( Int pid, Int signo );
|
|
extern Int VG_(tkill) ( Int lwpid, Int signo );
|
|
|
|
/* A cut-down version of POSIX sigtimedwait: poll for pending signals
|
|
mentioned in the sigset_t, and if any are present, select one
|
|
arbitrarily, return its number (which must be > 0), and put
|
|
auxiliary info about it in the siginfo_t, and make it
|
|
not-pending-any-more. If none are pending, return zero. The _zero
|
|
refers to the fact that there is zero timeout, so if no signals are
|
|
pending it returns immediately. Perhaps a better name would be
|
|
'sigpoll'. Returns -1 on error, 0 if no signals pending, and n > 0
|
|
if signal n was selected. */
|
|
extern Int VG_(sigtimedwait_zero)( const vki_sigset_t *, vki_siginfo_t * );
|
|
|
|
#endif // __PUB_CORE_LIBCSIGNAL_H
|
|
|
|
/*--------------------------------------------------------------------*/
|
|
/*--- end ---*/
|
|
/*--------------------------------------------------------------------*/
|