X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=tests%2Fbenchmark%2Ftest_urcu_wfs.c;h=982be197976352ca0a5c47fa6eeb508572045b97;hb=bd23a6c64e8ccff9a666441958e34793748ebd3a;hp=2c82c019577a5454fef2047c1c570b5813d26465;hpb=83e334d03eaba62df373cf44298616458900078a;p=userspace-rcu.git

diff --git a/tests/benchmark/test_urcu_wfs.c b/tests/benchmark/test_urcu_wfs.c
index 2c82c01..982be19 100644
--- a/tests/benchmark/test_urcu_wfs.c
+++ b/tests/benchmark/test_urcu_wfs.c
@@ -37,7 +37,6 @@
 #include <urcu/arch.h>
 #include <urcu/tls-compat.h>
 #include <urcu/uatomic.h>
-#include "cpuset.h"
 #include "thread-id.h"
 
 /* hardcoded number of CPUs */
@@ -117,11 +116,7 @@ static void set_affinity(void)
 
 	CPU_ZERO(&mask);
 	CPU_SET(cpu, &mask);
-#if SCHED_SETAFFINITY_ARGS == 2
-	sched_setaffinity(0, &mask);
-#else
 	sched_setaffinity(0, sizeof(mask), &mask);
-#endif
 #endif /* HAVE_SCHED_SETAFFINITY */
 }
 
@@ -296,19 +291,19 @@ static void *thr_dequeuer(void *_count)
 	return ((void*)2);
 }
 
-static void test_end(struct cds_wfs_stack *s, unsigned long long *nr_dequeues,
-		unsigned long long *nr_pop_last)
+static void test_end(unsigned long long *nr_dequeues_l,
+		unsigned long long *nr_pop_last_l)
 {
 	struct cds_wfs_node *node;
 	int state;
 
 	do {
-		node = cds_wfs_pop_with_state_blocking(s, &state);
+		node = cds_wfs_pop_with_state_blocking(&s, &state);
 		if (node) {
 			if (state & CDS_WFS_STATE_LAST)
-				(*nr_pop_last)++;
+				(*nr_pop_last_l)++;
 			free(node);
-			(*nr_dequeues)++;
+			(*nr_dequeues_l)++;
 		}
 	} while (node);
 }
@@ -515,7 +510,7 @@ int main(int argc, char **argv)
 		tot_pop_last += count_dequeuer[4 * i_thr + 3];
 	}
 
-	test_end(&s, &end_dequeues, &tot_pop_last);
+	test_end(&end_dequeues, &tot_pop_last);
 
 	printf_verbose("total number of enqueues : %llu, dequeues %llu\n",
 		       tot_enqueues, tot_dequeues);