896fc4638a
When truss is detaching from very active process it is possible to hang on waitpid(2) in restore_proc() forever, because ptrace(PT_SYSCALL) must be called before detaching, to allow the debugging process to continue execution. Also when truss called with '-c' argument, it does not print anything after detach, because it immediately exits from restore_proc(). To fix these two problems make detaching deferred, but then it is impossible to detach from a process which does not do any system call. To fix this issue use sigaction(2) instead of signal(3) to disable SA_RESTART flag for waitpid(2) that makes it non-restartable. Remove global variable child_pid, because now detaching is handled in context where child's pid is known. Reported by: mjg Tested by: mjg, swills Approved by: kib (mentor) MFC after: 2 weeks
91 lines
2.6 KiB
C
91 lines
2.6 KiB
C
/*
|
|
* Copyright 2001 Jamey Wood
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
* SUCH DAMAGE.
|
|
*
|
|
* $FreeBSD$
|
|
*/
|
|
|
|
#include <sys/queue.h>
|
|
|
|
#define FOLLOWFORKS 0x00000001
|
|
#define RELATIVETIMESTAMPS 0x00000002
|
|
#define ABSOLUTETIMESTAMPS 0x00000004
|
|
#define NOSIGS 0x00000008
|
|
#define EXECVEARGS 0x00000010
|
|
#define EXECVEENVS 0x00000020
|
|
#define COUNTONLY 0x00000040
|
|
|
|
struct threadinfo
|
|
{
|
|
SLIST_ENTRY(threadinfo) entries;
|
|
lwpid_t tid;
|
|
int in_syscall;
|
|
int in_fork;
|
|
};
|
|
|
|
struct trussinfo
|
|
{
|
|
pid_t pid;
|
|
int flags;
|
|
int pr_why;
|
|
int pr_data;
|
|
int strsize;
|
|
FILE *outfile;
|
|
|
|
struct timespec start_time;
|
|
struct timespec before;
|
|
struct timespec after;
|
|
|
|
struct threadinfo *curthread;
|
|
|
|
SLIST_HEAD(, threadinfo) threadlist;
|
|
};
|
|
|
|
#define timespecsubt(tvp, uvp, vvp) \
|
|
do { \
|
|
(vvp)->tv_sec = (tvp)->tv_sec - (uvp)->tv_sec; \
|
|
(vvp)->tv_nsec = (tvp)->tv_nsec - (uvp)->tv_nsec; \
|
|
if ((vvp)->tv_nsec < 0) { \
|
|
(vvp)->tv_sec--; \
|
|
(vvp)->tv_nsec += 1000000000; \
|
|
} \
|
|
} while (0)
|
|
|
|
#define timespecadd(tvp, uvp, vvp) \
|
|
do { \
|
|
(vvp)->tv_sec = (tvp)->tv_sec + (uvp)->tv_sec; \
|
|
(vvp)->tv_nsec = (tvp)->tv_nsec + (uvp)->tv_nsec; \
|
|
if ((vvp)->tv_nsec > 1000000000) { \
|
|
(vvp)->tv_sec++; \
|
|
(vvp)->tv_nsec -= 1000000000; \
|
|
} \
|
|
} while (0)
|
|
|
|
#define S_NONE 0
|
|
#define S_SCE 1
|
|
#define S_SCX 2
|
|
#define S_EXIT 3
|
|
#define S_SIG 4
|
|
#define S_EXEC 5
|
|
#define S_DETACHED 6
|