X-Git-Url: https://git.lttng.org/?p=urcu.git;a=blobdiff_plain;f=tests%2Fbenchmark%2Ftest_urcu_qsbr.c;h=1fcdfb194f383349284a0c15006dd61233038969;hp=e8ba5f6937470006645648e7b1677739a3248e49;hb=c278ffc739374fbcc6d2fb35eca26b57da4c6447;hpb=f5ab766ee2c8300cb00ca5878b1cb464f960a66d

diff --git a/tests/benchmark/test_urcu_qsbr.c b/tests/benchmark/test_urcu_qsbr.c
index e8ba5f6..1fcdfb1 100644
--- a/tests/benchmark/test_urcu_qsbr.c
+++ b/tests/benchmark/test_urcu_qsbr.c
@@ -20,8 +20,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#define _GNU_SOURCE
-#include "config.h"
 #include <stdio.h>
 #include <pthread.h>
 #include <stdlib.h>
@@ -37,14 +35,13 @@
 #include <urcu/tls-compat.h>
 #include "cpuset.h"
 #include "thread-id.h"
+#include "../common/debug-yield.h"
 
 /* hardcoded number of CPUs */
 #define NR_CPUS 16384
 
 #ifndef DYNAMIC_LINK_TEST
 #define _LGPL_SOURCE
-#else
-#define rcu_debug_yield_read()
 #endif
 #include "urcu-qsbr.h"
 
@@ -253,9 +250,7 @@ void show_usage(int argc, char **argv)
 	printf("Usage : %s nr_readers nr_writers duration (s) <OPTIONS>\n",
 		argv[0]);
 	printf("OPTIONS:\n");
-#ifdef DEBUG_YIELD
 	printf("	[-r] [-w] (yield reader and/or writer)\n");
-#endif
 	printf("	[-d delay] (writer period (us))\n");
 	printf("	[-c duration] (reader C.S. duration (in loops))\n");
 	printf("	[-e duration] (writer C.S. duration (in loops))\n");
@@ -300,14 +295,12 @@ int main(int argc, char **argv)
 		if (argv[i][0] != '-')
 			continue;
 		switch (argv[i][1]) {
-#ifdef DEBUG_YIELD
 		case 'r':
-			rcu_yield_active |= RCU_RCU_YIELD_READ;
+			rcu_debug_yield_enable(RCU_YIELD_READ);
 			break;
 		case 'w':
-			rcu_yield_active |= RCU_RCU_YIELD_WRITE;
+			rcu_debug_yield_enable(RCU_YIELD_WRITE);
 			break;
-#endif
 		case 'a':
 			if (argc < i + 2) {
 				show_usage(argc, argv);