Module Name: src
Committed By: matt
Date: Thu Aug 2 14:03:22 UTC 2012
Modified Files:
src/sys/arch/vax/vax: trap.c
Log Message:
Supress print fatal traps if the process is being debugged of it the signal
will be caught by a signal handler.
To generate a diff of this commit:
cvs rdiff -u -r1.130 -r1.131 src/sys/arch/vax/vax/trap.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/vax/vax/trap.c
diff -u src/sys/arch/vax/vax/trap.c:1.130 src/sys/arch/vax/vax/trap.c:1.131
--- src/sys/arch/vax/vax/trap.c:1.130 Sun Feb 19 21:06:33 2012
+++ src/sys/arch/vax/vax/trap.c Thu Aug 2 14:03:22 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.130 2012/02/19 21:06:33 rmind Exp $ */
+/* $NetBSD: trap.c,v 1.131 2012/08/02 14:03:22 matt Exp $ */
/*
* Copyright (c) 1994 Ludd, University of Lule}, Sweden.
@@ -33,7 +33,7 @@
/* All bugs are subject to removal without further notice */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.130 2012/02/19 21:06:33 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.131 2012/08/02 14:03:22 matt Exp $");
#include "opt_ddb.h"
#include "opt_multiprocessor.h"
@@ -327,7 +327,10 @@ if(faultdebug)printf("trap accflt type %
}
if (trapsig) {
ksiginfo_t ksi;
- if ((sig == SIGSEGV || sig == SIGILL) && cpu_printfataltraps)
+ if ((sig == SIGSEGV || sig == SIGILL)
+ && cpu_printfataltraps
+ && (p->p_slflag & PSL_TRACED) == 0
+ && !sigismember(&p->p_sigctx.ps_sigcatch, sig))
printf("pid %d.%d (%s): sig %d: type %lx, code %lx, pc %lx, psl %lx\n",
p->p_pid, l->l_lid, p->p_comm, sig, tf->tf_trap,
tf->tf_code, tf->tf_pc, tf->tf_psl);
