From f1773a765d6443692f75402b2740b22cb85cb108 Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Fri, 17 Dec 2021 11:28:04 -0500 Subject: [PATCH] Revert "Fix: bump minimal urcu dependency to 0.11" This reverts commit 15076a788437a143af0b3841ce2b223fba2cbf29 to bring back the dependency on liburcu back to version 0.9. This only works if liburcu is custom-modified to include the worker thread for the lock-free hash table. Signed-off-by: Mathieu Desnoyers Change-Id: I34d15da476a099f6cfb76faf2216478c1c8b8eed --- README.md | 2 +- configure.ac | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 6c67291d6..92df20daf 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ components: that, the kernel version may probably be older, but we can't provide any guarantee. Please let us know if you are able to go lower without any problems. - - **[`liburcu`](http://www.liburcu.org/) >= 0.11.0**: userspace RCU library, + - **[`liburcu`](http://www.liburcu.org/) >= 0.9.0**: userspace RCU library, by Mathieu Desnoyers and Paul E. McKenney. - **`libpopt` >= 1.13**: command line arguments parsing library. - Debian/Ubuntu package: `libpopt-dev` diff --git a/configure.ac b/configure.ac index 4325104c4..b23833dfe 100644 --- a/configure.ac +++ b/configure.ac @@ -479,7 +479,7 @@ PKG_CHECK_MODULES([libxml2], [libxml-2.0 >= 2.7.6]) AC_CHECK_FUNC([clock_gettime], [AC_DEFINE_UNQUOTED([LTTNG_HAVE_CLOCK_GETTIME], 1, [Has clock_gettime() support.])]) # URCU library version needed or newer -m4_define([WRONG_LIBURCU_MSG], [Userspace RCU (liburcu) >= 0.11.0 is needed]) +m4_define([WRONG_LIBURCU_MSG], [Userspace RCU (liburcu) >= 0.9.0 is needed]) # Check liburcu needed function calls AC_CHECK_DECL([cds_list_add], [], @@ -504,9 +504,9 @@ AC_CHECK_DECL([cmm_smp_mb__before_uatomic_or], [], [AC_MSG_ERROR([WRONG_LIBURCU_MSG])], [[#include ]] ) -#Function added in urcu 0.11.0 -AC_CHECK_DECL([urcu_memb_barrier], [], - [AC_MSG_ERROR([WRONG_LIBURCU_MSG])], [[#include ]] +#Function added in urcu 0.9.0 +AC_CHECK_DECL([urcu_ref_get_unless_zero], [], + [AC_MSG_ERROR([WRONG_LIBURCU_MSG])], [[#include ]] ) # Check for libkmod, it will be auto-neabled if found but won't fail if it's not, -- 2.34.1