socsvn commit: r239981 - in soc2012/gmiller/locking-head: . lib/libwitness

[gmiller at FreeBSD.org]

Author: gmiller
Date: Wed Aug  1 08:12:56 2012
New Revision: 239981
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=239981

Log:
   r240026 at FreeBSD-dev:  root | 2012-07-24 09:15:58 -0500
   Reverse the parent->child order in the lock order graph in order to make it
   more intuitive.

Modified:
  soc2012/gmiller/locking-head/   (props changed)
  soc2012/gmiller/locking-head/lib/libwitness/lists.c
  soc2012/gmiller/locking-head/lib/libwitness/wrappers.c

Modified: soc2012/gmiller/locking-head/lib/libwitness/lists.c
==============================================================================
--- soc2012/gmiller/locking-head/lib/libwitness/lists.c	Wed Aug  1 05:53:20 2012	(r239980)
+++ soc2012/gmiller/locking-head/lib/libwitness/lists.c	Wed Aug  1 08:12:56 2012	(r239981)
@@ -73,7 +73,7 @@
 
 	SLIST_INSERT_HEAD(&lock_head, entry, lock_next);
 
-	if (next != NULL && insert_lock(entry->lock, next->lock) < 0) {
+	if (next != NULL && insert_lock(next->lock, entry->lock) < 0) {
 		log_reversal(entry->lock, next->lock);
 	}
 }

Modified: soc2012/gmiller/locking-head/lib/libwitness/wrappers.c
==============================================================================
--- soc2012/gmiller/locking-head/lib/libwitness/wrappers.c	Wed Aug  1 05:53:20 2012	(r239980)
+++ soc2012/gmiller/locking-head/lib/libwitness/wrappers.c	Wed Aug  1 08:12:56 2012	(r239981)
@@ -384,7 +384,7 @@
 
 	_pthread_mutex_lock(&witness_mtx);
 
-	if (insert_lock(lookup_lock(second), lookup_lock(first)) < 0) {
+	if (insert_lock(lookup_lock(first), lookup_lock(second)) < 0) {
 		ret = EINVAL;
 	}