projects
/
urcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix runtests.sh
[urcu.git]
/
test_perthreadlock.c
diff --git
a/test_perthreadlock.c
b/test_perthreadlock.c
index 076d2473976da65fc0fad262aa409e9fc8f8177f..4f46d23c9da84fca94a8c7fe40ca2c44a585b119 100644
(file)
--- a/
test_perthreadlock.c
+++ b/
test_perthreadlock.c
@@
-20,6
+20,7
@@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
+#define _GNU_SOURCE
#include <stdio.h>
#include <pthread.h>
#include <stdlib.h>
#include <stdio.h>
#include <pthread.h>
#include <stdlib.h>
@@
-30,6
+31,7
@@
#include <stdio.h>
#include <assert.h>
#include <sys/syscall.h>
#include <stdio.h>
#include <assert.h>
#include <sys/syscall.h>
+#include <sched.h>
#include "arch.h"
#include "arch.h"
@@
-65,39
+67,25
@@
struct per_thread_lock {
static struct per_thread_lock *per_thread_lock;
static struct per_thread_lock *per_thread_lock;
-static volatile int test_go;
+static volatile int test_go
, test_stop
;
static int wdelay;
static int wdelay;
-static struct test_array test_array = { 8 };
+static
volatile
struct test_array test_array = { 8 };
static unsigned long duration;
static unsigned long duration;
-static time_t start_time;
-static unsigned long __thread duration_interval;
-#define DURATION_TEST_DELAY_WRITE 4
-#define DURATION_TEST_DELAY_READ 100
/*
* returns 0 if test should end.
*/
static int test_duration_write(void)
{
/*
* returns 0 if test should end.
*/
static int test_duration_write(void)
{
- if (duration_interval++ >= DURATION_TEST_DELAY_WRITE) {
- duration_interval = 0;
- if (time(NULL) - start_time >= duration)
- return 0;
- }
- return 1;
+ return !test_stop;
}
static int test_duration_read(void)
{
}
static int test_duration_read(void)
{
- if (duration_interval++ >= DURATION_TEST_DELAY_READ) {
- duration_interval = 0;
- if (time(NULL) - start_time >= duration)
- return 0;
- }
- return 1;
+ return !test_stop;
}
static unsigned long long __thread nr_writes;
}
static unsigned long long __thread nr_writes;
@@
-148,7
+136,7
@@
void *thr_reader(void *data)
assert(test_array.a == 8);
pthread_mutex_unlock(&per_thread_lock[tidx].lock);
nr_reads++;
assert(test_array.a == 8);
pthread_mutex_unlock(&per_thread_lock[tidx].lock);
nr_reads++;
- if (
!test_duration_read(
))
+ if (
unlikely(!test_duration_read()
))
break;
}
break;
}
@@
-176,14
+164,15
@@
void *thr_writer(void *data)
for (tidx = 0; tidx < nr_readers; tidx++) {
pthread_mutex_lock(&per_thread_lock[tidx].lock);
}
for (tidx = 0; tidx < nr_readers; tidx++) {
pthread_mutex_lock(&per_thread_lock[tidx].lock);
}
+ test_array.a = 0;
test_array.a = 8;
for (tidx = nr_readers - 1; tidx >= 0; tidx--) {
pthread_mutex_unlock(&per_thread_lock[tidx].lock);
}
nr_writes++;
test_array.a = 8;
for (tidx = nr_readers - 1; tidx >= 0; tidx--) {
pthread_mutex_unlock(&per_thread_lock[tidx].lock);
}
nr_writes++;
- if (
!test_duration_write(
))
+ if (
unlikely(!test_duration_write()
))
break;
break;
- if (
wdelay
)
+ if (
unlikely(wdelay)
)
usleep(wdelay);
}
usleep(wdelay);
}
@@
-200,9
+189,12
@@
void show_usage(int argc, char **argv)
printf(" [-r] [-w] (yield reader and/or writer)");
#endif
printf(" [-d delay] (writer period (us))");
printf(" [-r] [-w] (yield reader and/or writer)");
#endif
printf(" [-d delay] (writer period (us))");
+ printf(" [-a cpu#] [-a cpu#]... (affinity)");
printf("\n");
}
printf("\n");
}
+cpu_set_t affinity;
+
int main(int argc, char **argv)
{
int err;
int main(int argc, char **argv)
{
int err;
@@
-210,7
+202,8
@@
int main(int argc, char **argv)
void *tret;
unsigned long long *count_reader, *count_writer;
unsigned long long tot_reads = 0, tot_writes = 0;
void *tret;
unsigned long long *count_reader, *count_writer;
unsigned long long tot_reads = 0, tot_writes = 0;
- int i;
+ int i, a;
+ int use_affinity = 0;
if (argc < 4) {
show_usage(argc, argv);
if (argc < 4) {
show_usage(argc, argv);
@@
-236,6
+229,8
@@
int main(int argc, char **argv)
return -1;
}
return -1;
}
+ CPU_ZERO(&affinity);
+
for (i = 4; i < argc; i++) {
if (argv[i][0] != '-')
continue;
for (i = 4; i < argc; i++) {
if (argv[i][0] != '-')
continue;
@@
-248,6
+243,16
@@
int main(int argc, char **argv)
yield_active |= YIELD_WRITE;
break;
#endif
yield_active |= YIELD_WRITE;
break;
#endif
+ case 'a':
+ if (argc < i + 2) {
+ show_usage(argc, argv);
+ return -1;
+ }
+ a = atoi(argv[++i]);
+ CPU_SET(a, &affinity);
+ use_affinity = 1;
+ printf("Adding CPU %d affinity\n", a);
+ break;
case 'd':
if (argc < i + 2) {
show_usage(argc, argv);
case 'd':
if (argc < i + 2) {
show_usage(argc, argv);
@@
-264,6
+269,12
@@
int main(int argc, char **argv)
printf("thread %-6s, thread id : %lx, tid %lu\n",
"main", pthread_self(), (unsigned long)gettid());
printf("thread %-6s, thread id : %lx, tid %lu\n",
"main", pthread_self(), (unsigned long)gettid());
+ if (use_affinity
+ && sched_setaffinity(0, sizeof(affinity), &affinity) < 0) {
+ perror("sched_setaffinity");
+ exit(-1);
+ }
+
tid_reader = malloc(sizeof(*tid_reader) * nr_readers);
tid_writer = malloc(sizeof(*tid_writer) * nr_writers);
count_reader = malloc(sizeof(*count_reader) * nr_readers);
tid_reader = malloc(sizeof(*tid_reader) * nr_readers);
tid_writer = malloc(sizeof(*tid_writer) * nr_writers);
count_reader = malloc(sizeof(*count_reader) * nr_readers);
@@
-285,10
+296,14
@@
int main(int argc, char **argv)
exit(1);
}
exit(1);
}
- start_time = time(NULL);
- test_go = 1;
smp_mb();
smp_mb();
+ test_go = 1;
+
+ sleep(duration);
+
+ test_stop = 1;
+
for (i = 0; i < nr_readers; i++) {
err = pthread_join(tid_reader[i], &tret);
if (err != 0)
for (i = 0; i < nr_readers; i++) {
err = pthread_join(tid_reader[i], &tret);
if (err != 0)
This page took
0.033946 seconds
and
4
git commands to generate.