Have dtrace(1) handle SIGPIPE by cleaning up and exiting. Additionally,
install signal handlers when running in list mode (-l), and acknowledge interrupts by cleaning up and exiting. This ensures that a command like $ dtrace -l -P 'pid$target' -p <target PID> | less won't cause the ptrace(2)d target process to be killed if less(1) exits before all dtrace output is consumed. Reported by: Anton Yuzhaninov <citrin+bsd@citrin.ru> Differential Revision: https://reviews.freebsd.org/D880 Reviewed by: rpaulo MFC after: 1 month Sponsored by: EMC / Isilon Storage Division
This commit is contained in:
parent
35fe94304b
commit
486de25d46
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=272455
@ -710,6 +710,9 @@ list_probe(dtrace_hdl_t *dtp, const dtrace_probedesc_t *pdp, void *arg)
|
|||||||
if (g_verbose && dtrace_probe_info(dtp, pdp, &p) == 0)
|
if (g_verbose && dtrace_probe_info(dtp, pdp, &p) == 0)
|
||||||
print_probe_info(&p);
|
print_probe_info(&p);
|
||||||
|
|
||||||
|
if (g_intr != 0)
|
||||||
|
return (1);
|
||||||
|
|
||||||
return (0);
|
return (0);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1220,11 +1223,34 @@ intr(int signo)
|
|||||||
g_impatient = 1;
|
g_impatient = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
installsighands(void)
|
||||||
|
{
|
||||||
|
struct sigaction act, oact;
|
||||||
|
|
||||||
|
(void) sigemptyset(&act.sa_mask);
|
||||||
|
act.sa_flags = 0;
|
||||||
|
act.sa_handler = intr;
|
||||||
|
|
||||||
|
if (sigaction(SIGINT, NULL, &oact) == 0 && oact.sa_handler != SIG_IGN)
|
||||||
|
(void) sigaction(SIGINT, &act, NULL);
|
||||||
|
|
||||||
|
if (sigaction(SIGTERM, NULL, &oact) == 0 && oact.sa_handler != SIG_IGN)
|
||||||
|
(void) sigaction(SIGTERM, &act, NULL);
|
||||||
|
|
||||||
|
#if !defined(sun)
|
||||||
|
if (sigaction(SIGPIPE, NULL, &oact) == 0 && oact.sa_handler != SIG_IGN)
|
||||||
|
(void) sigaction(SIGPIPE, &act, NULL);
|
||||||
|
|
||||||
|
if (sigaction(SIGUSR1, NULL, &oact) == 0 && oact.sa_handler != SIG_IGN)
|
||||||
|
(void) sigaction(SIGUSR1, &act, NULL);
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
int
|
int
|
||||||
main(int argc, char *argv[])
|
main(int argc, char *argv[])
|
||||||
{
|
{
|
||||||
dtrace_bufdesc_t buf;
|
dtrace_bufdesc_t buf;
|
||||||
struct sigaction act, oact;
|
|
||||||
dtrace_status_t status[2];
|
dtrace_status_t status[2];
|
||||||
dtrace_optval_t opt;
|
dtrace_optval_t opt;
|
||||||
dtrace_cmd_t *dcp;
|
dtrace_cmd_t *dcp;
|
||||||
@ -1776,6 +1802,8 @@ main(int argc, char *argv[])
|
|||||||
if (g_ofile != NULL && (g_ofp = fopen(g_ofile, "a")) == NULL)
|
if (g_ofile != NULL && (g_ofp = fopen(g_ofile, "a")) == NULL)
|
||||||
fatal("failed to open output file '%s'", g_ofile);
|
fatal("failed to open output file '%s'", g_ofile);
|
||||||
|
|
||||||
|
installsighands();
|
||||||
|
|
||||||
oprintf("%5s %10s %17s %33s %s\n",
|
oprintf("%5s %10s %17s %33s %s\n",
|
||||||
"ID", "PROVIDER", "MODULE", "FUNCTION", "NAME");
|
"ID", "PROVIDER", "MODULE", "FUNCTION", "NAME");
|
||||||
|
|
||||||
@ -1861,20 +1889,7 @@ main(int argc, char *argv[])
|
|||||||
if (opt != DTRACEOPT_UNSET)
|
if (opt != DTRACEOPT_UNSET)
|
||||||
notice("allowing destructive actions\n");
|
notice("allowing destructive actions\n");
|
||||||
|
|
||||||
(void) sigemptyset(&act.sa_mask);
|
installsighands();
|
||||||
act.sa_flags = 0;
|
|
||||||
act.sa_handler = intr;
|
|
||||||
|
|
||||||
if (sigaction(SIGINT, NULL, &oact) == 0 && oact.sa_handler != SIG_IGN)
|
|
||||||
(void) sigaction(SIGINT, &act, NULL);
|
|
||||||
|
|
||||||
if (sigaction(SIGTERM, NULL, &oact) == 0 && oact.sa_handler != SIG_IGN)
|
|
||||||
(void) sigaction(SIGTERM, &act, NULL);
|
|
||||||
|
|
||||||
#if !defined(sun)
|
|
||||||
if (sigaction(SIGUSR1, NULL, &oact) == 0 && oact.sa_handler != SIG_IGN)
|
|
||||||
(void) sigaction(SIGUSR1, &act, NULL);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Now that tracing is active and we are ready to consume trace data,
|
* Now that tracing is active and we are ready to consume trace data,
|
||||||
|
Loading…
Reference in New Issue
Block a user