projects
/
userspace-rcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rculfhash: diminish index table memory consumption
[userspace-rcu.git]
/
tests
/
test_rwlock.c
diff --git
a/tests/test_rwlock.c
b/tests/test_rwlock.c
index 837b800df6c40b22b38fce0f249f6a0c9b294725..9c8f97e39cf2232be5f461a655102ba1c3feac07 100644
(file)
--- a/
tests/test_rwlock.c
+++ b/
tests/test_rwlock.c
@@
-3,7
+3,7
@@
*
* Userspace RCU library - test program
*
*
* Userspace RCU library - test program
*
- * Copyright February 2009 - Mathieu Desnoyers <mathieu.desnoyers@
polymtl.ca
>
+ * Copyright February 2009 - Mathieu Desnoyers <mathieu.desnoyers@
efficios.com
>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@
-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>
@@
-30,12
+31,15
@@
#include <unistd.h>
#include <stdio.h>
#include <assert.h>
#include <unistd.h>
#include <stdio.h>
#include <assert.h>
-#include <sys/syscall.h>
#include <sched.h>
#include <errno.h>
#include <urcu/arch.h>
#include <sched.h>
#include <errno.h>
#include <urcu/arch.h>
+#ifdef __linux__
+#include <syscall.h>
+#endif
+
/* hardcoded number of CPUs */
#define NR_CPUS 16384
/* hardcoded number of CPUs */
#define NR_CPUS 16384
@@
-78,10
+82,13
@@
static unsigned long duration;
/* read-side C.S. duration, in loops */
static unsigned long rduration;
/* read-side C.S. duration, in loops */
static unsigned long rduration;
+/* write-side C.S. duration, in loops */
+static unsigned long wduration;
+
static inline void loop_sleep(unsigned long l)
{
while(l-- != 0)
static inline void loop_sleep(unsigned long l)
{
while(l-- != 0)
- cpu_relax();
+ c
aa_c
pu_relax();
}
static int verbose_mode;
}
static int verbose_mode;
@@
-98,6
+105,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;
@@
-107,6
+120,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");
@@
-118,9
+132,15
@@
static void set_affinity(void)
perror("Error in pthread mutex unlock");
exit(-1);
}
perror("Error in pthread mutex unlock");
exit(-1);
}
+
CPU_ZERO(&mask);
CPU_SET(cpu, &mask);
CPU_ZERO(&mask);
CPU_SET(cpu, &mask);
+#if SCHED_SETAFFINITY_ARGS == 2
+ sched_setaffinity(0, &mask);
+#else
sched_setaffinity(0, sizeof(mask), &mask);
sched_setaffinity(0, sizeof(mask), &mask);
+#endif
+#endif /* HAVE_SCHED_SETAFFINITY */
}
/*
}
/*
@@
-208,12
+228,14
@@
void *thr_writer(void *_count)
while (!test_go)
{
}
while (!test_go)
{
}
- smp_mb();
+
cmm_
smp_mb();
for (;;) {
pthread_rwlock_wrlock(&lock);
test_array.a = 0;
test_array.a = 8;
for (;;) {
pthread_rwlock_wrlock(&lock);
test_array.a = 0;
test_array.a = 8;
+ if (unlikely(wduration))
+ loop_sleep(wduration);
pthread_rwlock_unlock(&lock);
nr_writes++;
if (unlikely(!test_duration_write()))
pthread_rwlock_unlock(&lock);
nr_writes++;
if (unlikely(!test_duration_write()))
@@
-236,6
+258,7
@@
void show_usage(int argc, char **argv)
#endif
printf(" [-d delay] (writer period (us))");
printf(" [-c duration] (reader C.S. duration (in loops))");
#endif
printf(" [-d delay] (writer period (us))");
printf(" [-c duration] (reader C.S. duration (in loops))");
+ printf(" [-e duration] (writer C.S. duration (in loops))");
printf(" [-v] (verbose output)");
printf(" [-a cpu#] [-a cpu#]... (affinity)");
printf("\n");
printf(" [-v] (verbose output)");
printf(" [-a cpu#] [-a cpu#]... (affinity)");
printf("\n");
@@
-254,7
+277,7
@@
int main(int argc, char **argv)
show_usage(argc, argv);
return -1;
}
show_usage(argc, argv);
return -1;
}
- smp_mb();
+
cmm_
smp_mb();
err = sscanf(argv[1], "%u", &nr_readers);
if (err != 1) {
err = sscanf(argv[1], "%u", &nr_readers);
if (err != 1) {
@@
-310,6
+333,13
@@
int main(int argc, char **argv)
}
wdelay = atol(argv[++i]);
break;
}
wdelay = atol(argv[++i]);
break;
+ case 'e':
+ if (argc < i + 2) {
+ show_usage(argc, argv);
+ return -1;
+ }
+ wduration = atol(argv[++i]);
+ break;
case 'v':
verbose_mode = 1;
break;
case 'v':
verbose_mode = 1;
break;
@@
-343,7
+373,7
@@
int main(int argc, char **argv)
exit(1);
}
exit(1);
}
- smp_mb();
+
cmm_
smp_mb();
test_go = 1;
test_go = 1;
@@
-366,10
+396,10
@@
int main(int argc, char **argv)
printf_verbose("total number of reads : %llu, writes %llu\n", tot_reads,
tot_writes);
printf_verbose("total number of reads : %llu, writes %llu\n", tot_reads,
tot_writes);
- printf("SUMMARY %-25s testdur %4lu nr_readers %3u rdur %6lu "
+ printf("SUMMARY %-25s testdur %4lu nr_readers %3u rdur %6lu
wdur %6lu
"
"nr_writers %3u "
"wdelay %6lu nr_reads %12llu nr_writes %12llu nr_ops %12llu\n",
"nr_writers %3u "
"wdelay %6lu nr_reads %12llu nr_writes %12llu nr_ops %12llu\n",
- argv[0], duration, nr_readers, rduration,
+ argv[0], duration, nr_readers, rduration,
wduration,
nr_writers, wdelay, tot_reads, tot_writes,
tot_reads + tot_writes);
nr_writers, wdelay, tot_reads, tot_writes,
tot_reads + tot_writes);
This page took
0.025103 seconds
and
4
git commands to generate.