From owner-svn-soc-all@FreeBSD.ORG  Tue Jul 31 19:55:19 2012
Return-Path: <owner-svn-soc-all@FreeBSD.ORG>
Delivered-To: svn-soc-all@FreeBSD.org
Received: from socsvn.FreeBSD.org (unknown [IPv6:2001:4f8:fff6::2f])
	by hub.freebsd.org (Postfix) with SMTP id BD4F4106564A
	for <svn-soc-all@FreeBSD.org>; Tue, 31 Jul 2012 19:55:17 +0000 (UTC)
	(envelope-from gmiller@FreeBSD.org)
Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation);
	Tue, 31 Jul 2012 19:55:17 +0000
Date: Tue, 31 Jul 2012 19:55:17 +0000
From: gmiller@FreeBSD.org
To: svn-soc-all@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Message-Id: <20120731195517.BD4F4106564A@hub.freebsd.org>
Cc: 
Subject: socsvn commit: r239968 - in soc2012/gmiller/locking-head: . include
	lib/libwitness
X-BeenThere: svn-soc-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the entire Summer of Code repository
	<svn-soc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
	<mailto:svn-soc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-soc-all>
List-Post: <mailto:svn-soc-all@freebsd.org>
List-Help: <mailto:svn-soc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
	<mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 31 Jul 2012 19:55:19 -0000

Author: gmiller
Date: Tue Jul 31 19:55:16 2012
New Revision: 239968
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=239968

Log:
   r240024@FreeBSD-dev:  root | 2012-07-24 08:43:51 -0500
   Add child and sibling information to pthread_lockorder_np structure.

Modified:
  soc2012/gmiller/locking-head/   (props changed)
  soc2012/gmiller/locking-head/include/pthread_np.h
  soc2012/gmiller/locking-head/lib/libwitness/lockinfo.c

Modified: soc2012/gmiller/locking-head/include/pthread_np.h
==============================================================================
--- soc2012/gmiller/locking-head/include/pthread_np.h	Tue Jul 31 19:17:25 2012	(r239967)
+++ soc2012/gmiller/locking-head/include/pthread_np.h	Tue Jul 31 19:55:16 2012	(r239968)
@@ -73,6 +73,8 @@
 struct pthread_lockorder_np {
 	struct _pthread_lockorder_private *_pvt;
 	void		*lock;
+	void		*child;
+	void		*sibling;
 };
 
 typedef void	(*pthread_switch_routine_t)(pthread_t, pthread_t);

Modified: soc2012/gmiller/locking-head/lib/libwitness/lockinfo.c
==============================================================================
--- soc2012/gmiller/locking-head/lib/libwitness/lockinfo.c	Tue Jul 31 19:17:25 2012	(r239967)
+++ soc2012/gmiller/locking-head/lib/libwitness/lockinfo.c	Tue Jul 31 19:55:16 2012	(r239968)
@@ -184,6 +184,18 @@
 
 		if (node->_pvt->last_record != NULL) {
 			node->lock = node->_pvt->last_record->lock;
+			if (node->_pvt->last_record->child != NULL) {
+				node->child =
+				    node->_pvt->last_record->child->lock;
+			} else {
+				node->child = NULL;
+			}
+			if (node->_pvt->last_record->sibling != NULL) {
+				node->sibling =
+				    node->_pvt->last_record->sibling->lock;
+			} else {
+				node->sibling = NULL;
+			}
 
 			return (1);
 		}