From owner-svn-soc-all@FreeBSD.ORG  Thu Jun 28 20:01:50 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 1A23C10657C8
	for <svn-soc-all@FreeBSD.org>; Thu, 28 Jun 2012 20:01:48 +0000 (UTC)
	(envelope-from gmiller@FreeBSD.org)
Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation);
	Thu, 28 Jun 2012 20:01:48 +0000
Date: Thu, 28 Jun 2012 20:01:48 +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: <20120628200148.1A23C10657C8@hub.freebsd.org>
Cc: 
Subject: socsvn commit: r238504 - in soc2012/gmiller/locking-head: .
	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: Thu, 28 Jun 2012 20:01:50 -0000

Author: gmiller
Date: Thu Jun 28 20:01:47 2012
New Revision: 238504
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=238504

Log:
   r238485@FreeBSD-dev:  root | 2012-06-20 04:25:19 -0500
   Implement graph node lookup and graph traversal.

Modified:
  soc2012/gmiller/locking-head/   (props changed)
  soc2012/gmiller/locking-head/lib/libwitness/graph.c
  soc2012/gmiller/locking-head/lib/libwitness/witness.h

Modified: soc2012/gmiller/locking-head/lib/libwitness/graph.c
==============================================================================
--- soc2012/gmiller/locking-head/lib/libwitness/graph.c	Thu Jun 28 20:01:36 2012	(r238503)
+++ soc2012/gmiller/locking-head/lib/libwitness/graph.c	Thu Jun 28 20:01:47 2012	(r238504)
@@ -29,9 +29,56 @@
 
 struct graph_node *root = NULL;
 
+static struct graph_node *
+scan_graph(struct graph_node *graph, void *lock)
+{
+	struct graph_node *ret;
+	struct graph_node *child;
+
+	if (graph->lock == lock) {
+		return (graph);
+	}
+
+	child = graph->child;
+	while (child != NULL) {
+		ret = scan_graph(child, lock);
+		if (ret != NULL) {
+			return (ret);
+		}
+
+		child = child->sibling;
+	}
+
+	return (NULL);
+}
+
+static struct graph_node *
+get_node(void *lock)
+{
+	if (root != NULL) {
+		return (scan_graph(root, lock));
+	}
+
+	return (NULL);
+}
+
 int
 insert_edge(struct graph_node *from, struct graph_node *to)
 {
-	from = from; to = to;
-	return 0;
+#if 1
+  // suppress warning
+  get_node(from->lock);
+#endif
+	if (from == to) {
+		return (0);
+	}
+
+	if (scan_graph(to, from->lock) != NULL) {
+		return (-1);
+	}
+
+	/* XXX */
+
+	return (0);
 }
+

Modified: soc2012/gmiller/locking-head/lib/libwitness/witness.h
==============================================================================
--- soc2012/gmiller/locking-head/lib/libwitness/witness.h	Thu Jun 28 20:01:36 2012	(r238503)
+++ soc2012/gmiller/locking-head/lib/libwitness/witness.h	Thu Jun 28 20:01:47 2012	(r238504)
@@ -37,6 +37,9 @@
 };
 
 struct graph_node {
+	void		*lock;
+	struct graph_node *child;
+	struct graph_node *sibling;
 };
 
 extern pthread_mutex_t witness_mtx;