From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Thu, 29 Sep 2011 21:14:54 +0000 (-0400)
Subject: Merge branch 'master' into urcu/ht-shrink
X-Git-Tag: v0.7.0~43^2~110
X-Git-Url: https://git.liburcu.org/?p=urcu.git;a=commitdiff_plain;h=1f689e13ea7e519b1afc001e9c55a7b1b60b599f;hp=-c

Merge branch 'master' into urcu/ht-shrink
---

1f689e13ea7e519b1afc001e9c55a7b1b60b599f
diff --combined urcu-qsbr.c
index 6b6d3af,a59a87a..5530295
--- a/urcu-qsbr.c
+++ b/urcu-qsbr.c
@@@ -39,6 -39,7 +39,7 @@@
  #include "urcu/map/urcu-qsbr.h"
  #define BUILD_QSBR_LIB
  #include "urcu/static/urcu-qsbr.h"
+ #include "urcu-pointer.h"
  
  /* Do not #define _LGPL_SOURCE to ensure we can emit the wrapper symbols */
  #undef _LGPL_SOURCE
@@@ -348,11 -349,7 +349,11 @@@ void rcu_unregister_thread(void
  
  void rcu_exit(void)
  {
 -	assert(cds_list_empty(&registry));
 +	/*
 +	 * Assertion disabled because call_rcu threads are now rcu
 +	 * readers, and left running at exit.
 +	 * assert(cds_list_empty(&registry));
 +	 */
  }
  
  #include "urcu-call-rcu-impl.h"