Skip site navigation (1)Skip section navigation (2) 
Date:      Wed, 01 Aug 2012 08:15:12 +0000
From:      gmiller@FreeBSD.org
To:        svn-soc-all@FreeBSD.org
Subject:   socsvn commit: r239985 - in soc2012/gmiller/locking-head: . lib/libwitness
Message-ID:  <20120801081512.1E64A106566C@hub.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: gmiller
Date: Wed Aug  1 08:15:11 2012
New Revision: 239985
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=239985

Log:
   r240030@FreeBSD-dev:  root | 2012-07-24 12:16:39 -0500
   Remove graph root code that's no longer needed.

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

Modified: soc2012/gmiller/locking-head/lib/libwitness/graph.c
==============================================================================
--- soc2012/gmiller/locking-head/lib/libwitness/graph.c	Wed Aug  1 08:14:47 2012	(r239984)
+++ soc2012/gmiller/locking-head/lib/libwitness/graph.c	Wed Aug  1 08:15:11 2012	(r239985)
@@ -27,9 +27,6 @@
 
 #include "witness.h"
 
-static SLIST_HEAD(graph_root_head, lock_info) graph_roots =
-    SLIST_HEAD_INITIALIZER(graph_roots);
-
 static int
 scan_graph(struct lock_info *graph, struct lock_info *lock)
 {
@@ -90,8 +87,6 @@
 insert_lock(struct lock_info *from, struct lock_info *to)
 {
 	struct lock_info *child;
-	struct lock_info *node;
-	struct lock_info *node_temp;
 
 	if (from == to || from == NULL || to == NULL) {
 		return (0);
@@ -101,16 +96,6 @@
 		return (-1);
 	}
 
-	if (SLIST_FIRST(&graph_roots) == to) {
-		SLIST_REMOVE_HEAD(&graph_roots, root_next);
-	} else {
-		SLIST_FOREACH_SAFE(node, &graph_roots, root_next, node_temp) {
-			if (SLIST_NEXT(node, root_next) == to) {
-				SLIST_REMOVE_AFTER(node, root_next);
-			}
-		}
-	}
-
 	if (to != from->child) {
 		to->sibling = from->child;
 		from->child = to;
@@ -127,15 +112,3 @@
 
 	return (0);
 }
-
-void
-add_root(struct lock_info *root)
-{
-	SLIST_INSERT_HEAD(&graph_roots, root, root_next);
-}
-
-void
-reset_graph(void)
-{
-	SLIST_INIT(&graph_roots);
-}

Modified: soc2012/gmiller/locking-head/lib/libwitness/lockinfo.c
==============================================================================
--- soc2012/gmiller/locking-head/lib/libwitness/lockinfo.c	Wed Aug  1 08:14:47 2012	(r239984)
+++ soc2012/gmiller/locking-head/lib/libwitness/lockinfo.c	Wed Aug  1 08:15:11 2012	(r239985)
@@ -58,7 +58,6 @@
 			SLIST_INIT(&info->bless_head);
 			SLIST_INSERT_HEAD(&lock_info_head, info,
 					  lock_info_next);
-			add_root(info);
 		}
 	}
 

Modified: soc2012/gmiller/locking-head/lib/libwitness/witness.h
==============================================================================
--- soc2012/gmiller/locking-head/lib/libwitness/witness.h	Wed Aug  1 08:14:47 2012	(r239984)
+++ soc2012/gmiller/locking-head/lib/libwitness/witness.h	Wed Aug  1 08:15:11 2012	(r239985)
@@ -52,12 +52,10 @@
 
 extern pthread_mutex_t witness_mtx;
 
-void		add_root(struct lock_info *root);
 void		add_lock(struct lock_info *lock);
 void		remove_lock(struct lock_info *lock);
 int		insert_lock(struct lock_info *new_lock,
 			    struct lock_info *previous);
-void		reset_graph(void);
 
 void		reset_lists(void);
 

Modified: soc2012/gmiller/locking-head/lib/libwitness/wrappers.c
==============================================================================
--- soc2012/gmiller/locking-head/lib/libwitness/wrappers.c	Wed Aug  1 08:14:47 2012	(r239984)
+++ soc2012/gmiller/locking-head/lib/libwitness/wrappers.c	Wed Aug  1 08:15:11 2012	(r239985)
@@ -445,7 +445,6 @@
 	_pthread_mutex_lock(&witness_mtx);
 
 	reset_lists();
-	reset_graph();
 	reset_lock_info();
 
 	_pthread_mutex_unlock(&witness_mtx);

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20120801081512.1E64A106566C>