From owner-svn-src-all@FreeBSD.ORG  Sun Dec  4 18:43:09 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A9F06106566B;
	Sun,  4 Dec 2011 18:43:09 +0000 (UTC) (envelope-from kib@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 99CDF8FC1C;
	Sun,  4 Dec 2011 18:43:09 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pB4Ih9Np098406;
	Sun, 4 Dec 2011 18:43:09 GMT (envelope-from kib@svn.freebsd.org)
Received: (from kib@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id pB4Ih92H098404;
	Sun, 4 Dec 2011 18:43:09 GMT (envelope-from kib@svn.freebsd.org)
Message-Id: <201112041843.pB4Ih92H098404@svn.freebsd.org>
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Sun, 4 Dec 2011 18:43:09 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r228261 - head/usr.bin/truss
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 04 Dec 2011 18:43:09 -0000

Author: kib
Date: Sun Dec  4 18:43:09 2011
New Revision: 228261
URL: http://svn.freebsd.org/changeset/base/228261

Log:
  Use explicit information from the kernel to detect the traps due to
  syscall entry and leave.
  
  Based on submision by:	Dan Nelson <dnelson allantgroup com>
  MFC after:	1 month

Modified:
  head/usr.bin/truss/setup.c

Modified: head/usr.bin/truss/setup.c
==============================================================================
--- head/usr.bin/truss/setup.c	Sun Dec  4 16:33:04 2011	(r228260)
+++ head/usr.bin/truss/setup.c	Sun Dec  4 18:43:09 2011	(r228261)
@@ -202,9 +202,19 @@ waitevent(struct trussinfo *info)
 		find_thread(info, lwpinfo.pl_lwpid);
 		switch(WSTOPSIG(waitval)) {
 		case SIGTRAP:
-			info->pr_why = info->curthread->in_syscall?S_SCX:S_SCE;
-			info->curthread->in_syscall = 1 - info->curthread->in_syscall;
-			break;
+			if (lwpinfo.pl_flags & PL_FLAG_SCE) {
+				info->pr_why = S_SCE;
+				info->curthread->in_syscall = 1;
+				break;
+			} else if (lwpinfo.pl_flags & PL_FLAG_SCX) {
+				info->pr_why = S_SCX;
+				info->curthread->in_syscall = 0;
+				break;
+			} else {
+				errx(1,
+		   "pl_flags %x contains neither PL_FLAG_SCE nor PL_FLAG_SCX",
+				    lwpinfo.pl_flags);
+			}
 		default:
 			info->pr_why = S_SIG;
 			info->pr_data = WSTOPSIG(waitval);