projects
/
urcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove unused jhash.h file
[urcu.git]
/
tests
/
test_urcu_hash.c
diff --git
a/tests/test_urcu_hash.c
b/tests/test_urcu_hash.c
index adeac3c27df7561ba065a2ab9aad89a0e0bd07e5..aac1db88cbc2a09425d87f3ef12adf6e54423161 100644
(file)
--- a/
tests/test_urcu_hash.c
+++ b/
tests/test_urcu_hash.c
@@
-21,6
+21,7
@@
*/
#define _GNU_SOURCE
*/
#define _GNU_SOURCE
+#include "../config.h"
#include <stdio.h>
#include <pthread.h>
#include <stdlib.h>
#include <stdio.h>
#include <pthread.h>
#include <stdlib.h>
@@
-32,6
+33,7
@@
#include <assert.h>
#include <sched.h>
#include <errno.h>
#include <assert.h>
#include <sched.h>
#include <errno.h>
+#include <signal.h>
#ifdef __linux__
#include <syscall.h>
#ifdef __linux__
#include <syscall.h>
@@
-187,6
+189,12
@@
static int use_affinity = 0;
pthread_mutex_t affinity_mutex = PTHREAD_MUTEX_INITIALIZER;
pthread_mutex_t affinity_mutex = PTHREAD_MUTEX_INITIALIZER;
+#ifndef HAVE_CPU_SET_T
+typedef unsigned long cpu_set_t;
+# define CPU_ZERO(cpuset) do { *(cpuset) = 0; } while(0)
+# define CPU_SET(cpu, cpuset) do { *(cpuset) |= (1UL << (cpu)); } while(0)
+#endif
+
static void set_affinity(void)
{
cpu_set_t mask;
static void set_affinity(void)
{
cpu_set_t mask;
@@
-196,6
+204,7
@@
static void set_affinity(void)
if (!use_affinity)
return;
if (!use_affinity)
return;
+#if HAVE_SCHED_SETAFFINITY
ret = pthread_mutex_lock(&affinity_mutex);
if (ret) {
perror("Error in pthread mutex lock");
ret = pthread_mutex_lock(&affinity_mutex);
if (ret) {
perror("Error in pthread mutex lock");
@@
-209,7
+218,12
@@
static void set_affinity(void)
}
CPU_ZERO(&mask);
CPU_SET(cpu, &mask);
}
CPU_ZERO(&mask);
CPU_SET(cpu, &mask);
- sched_setaffinity(0, sizeof(mask), &mask);
+#if SCHED_SETAFFINITY_ARGS == 2
+ sched_setaffinity(0, &mask);
+#else
+ sched_setaffinity(0, sizeof(mask), &mask);
+#endif
+#endif /* HAVE_SCHED_SETAFFINITY */
}
static enum {
}
static enum {
@@
-1001,7
+1015,9
@@
int main(int argc, char **argv)
count_writer = malloc(sizeof(*count_writer) * nr_writers);
err = create_all_cpu_call_rcu_data(0);
count_writer = malloc(sizeof(*count_writer) * nr_writers);
err = create_all_cpu_call_rcu_data(0);
- assert(!err);
+ if (err) {
+ printf("Per-CPU call_rcu() worker threads unavailable. Using default global worker thread.\n");
+ }
if (memory_backend) {
test_ht = _cds_lfht_new(init_hash_size, min_hash_alloc_size,
if (memory_backend) {
test_ht = _cds_lfht_new(init_hash_size, min_hash_alloc_size,
This page took
0.023646 seconds
and
4
git commands to generate.