projects
/
urcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename `urcu_assert()` to `urcu_assert_debug()`
[urcu.git]
/
tests
/
benchmark
/
test_perthreadlock.c
diff --git
a/tests/benchmark/test_perthreadlock.c
b/tests/benchmark/test_perthreadlock.c
index 512b1fc8ff1dc1f6697c28911ce382cec3c1ebe3..76cdee9afa306fa06adfa26f32ce246789c54090 100644
(file)
--- a/
tests/benchmark/test_perthreadlock.c
+++ b/
tests/benchmark/test_perthreadlock.c
@@
-33,7
+33,6
@@
#include <urcu/arch.h>
#include <urcu/tls-compat.h>
#include <urcu/arch.h>
#include <urcu/tls-compat.h>
-#include "cpuset.h"
#include "thread-id.h"
/* hardcoded number of CPUs */
#include "thread-id.h"
/* hardcoded number of CPUs */
@@
-90,7
+89,7
@@
pthread_mutex_t affinity_mutex = PTHREAD_MUTEX_INITIALIZER;
static void set_affinity(void)
{
static void set_affinity(void)
{
-#if HAVE_SCHED_SETAFFINITY
+#if
def
HAVE_SCHED_SETAFFINITY
cpu_set_t mask;
int cpu, ret;
#endif /* HAVE_SCHED_SETAFFINITY */
cpu_set_t mask;
int cpu, ret;
#endif /* HAVE_SCHED_SETAFFINITY */
@@
-98,7
+97,7
@@
static void set_affinity(void)
if (!use_affinity)
return;
if (!use_affinity)
return;
-#if HAVE_SCHED_SETAFFINITY
+#if
def
HAVE_SCHED_SETAFFINITY
ret = pthread_mutex_lock(&affinity_mutex);
if (ret) {
errno = ret;
ret = pthread_mutex_lock(&affinity_mutex);
if (ret) {
errno = ret;
@@
-114,11
+113,7
@@
static void set_affinity(void)
}
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 */
}
#endif /* HAVE_SCHED_SETAFFINITY */
}
@@
-170,6
+165,7
@@
static void urcu_mutex_unlock(pthread_mutex_t *lock)
}
}
}
}
+static
void *thr_reader(void *data)
{
unsigned long tidx = (unsigned long)data;
void *thr_reader(void *data)
{
unsigned long tidx = (unsigned long)data;
@@
-204,6
+200,7
@@
void *thr_reader(void *data)
}
}
+static
void *thr_writer(void *data)
{
unsigned long wtidx = (unsigned long)data;
void *thr_writer(void *data)
{
unsigned long wtidx = (unsigned long)data;
@@
-220,7
+217,7
@@
void *thr_writer(void *data)
cmm_smp_mb();
for (;;) {
cmm_smp_mb();
for (;;) {
- for (tidx = 0; tidx < nr_readers; tidx++) {
+ for (tidx = 0; tidx <
(long)
nr_readers; tidx++) {
urcu_mutex_lock(&per_thread_lock[tidx].lock);
}
test_array.a = 0;
urcu_mutex_lock(&per_thread_lock[tidx].lock);
}
test_array.a = 0;
@@
-243,7
+240,8
@@
void *thr_writer(void *data)
return ((void*)2);
}
return ((void*)2);
}
-void show_usage(int argc, char **argv)
+static
+void show_usage(char **argv)
{
printf("Usage : %s nr_readers nr_writers duration (s) <OPTIONS>\n",
argv[0]);
{
printf("Usage : %s nr_readers nr_writers duration (s) <OPTIONS>\n",
argv[0]);
@@
-266,26
+264,26
@@
int main(int argc, char **argv)
unsigned int i_thr;
if (argc < 4) {
unsigned int i_thr;
if (argc < 4) {
- show_usage(arg
c, arg
v);
+ show_usage(argv);
return -1;
}
cmm_smp_mb();
err = sscanf(argv[1], "%u", &nr_readers);
if (err != 1) {
return -1;
}
cmm_smp_mb();
err = sscanf(argv[1], "%u", &nr_readers);
if (err != 1) {
- show_usage(arg
c, arg
v);
+ show_usage(argv);
return -1;
}
err = sscanf(argv[2], "%u", &nr_writers);
if (err != 1) {
return -1;
}
err = sscanf(argv[2], "%u", &nr_writers);
if (err != 1) {
- show_usage(arg
c, arg
v);
+ show_usage(argv);
return -1;
}
err = sscanf(argv[3], "%lu", &duration);
if (err != 1) {
return -1;
}
err = sscanf(argv[3], "%lu", &duration);
if (err != 1) {
- show_usage(arg
c, arg
v);
+ show_usage(argv);
return -1;
}
return -1;
}
@@
-295,7
+293,7
@@
int main(int argc, char **argv)
switch (argv[i][1]) {
case 'a':
if (argc < i + 2) {
switch (argv[i][1]) {
case 'a':
if (argc < i + 2) {
- show_usage(arg
c, arg
v);
+ show_usage(argv);
return -1;
}
a = atoi(argv[++i]);
return -1;
}
a = atoi(argv[++i]);
@@
-305,21
+303,21
@@
int main(int argc, char **argv)
break;
case 'c':
if (argc < i + 2) {
break;
case 'c':
if (argc < i + 2) {
- show_usage(arg
c, arg
v);
+ show_usage(argv);
return -1;
}
rduration = atol(argv[++i]);
break;
case 'd':
if (argc < i + 2) {
return -1;
}
rduration = atol(argv[++i]);
break;
case 'd':
if (argc < i + 2) {
- show_usage(arg
c, arg
v);
+ show_usage(argv);
return -1;
}
wdelay = atol(argv[++i]);
break;
case 'e':
if (argc < i + 2) {
return -1;
}
wdelay = atol(argv[++i]);
break;
case 'e':
if (argc < i + 2) {
- show_usage(arg
c, arg
v);
+ show_usage(argv);
return -1;
}
wduration = atol(argv[++i]);
return -1;
}
wduration = atol(argv[++i]);
This page took
0.025572 seconds
and
4
git commands to generate.