projects
/
userspace-rcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add `urcu_posix_assert()` as `assert()` replacement
[userspace-rcu.git]
/
tests
/
benchmark
/
test_urcu_wfs.c
diff --git
a/tests/benchmark/test_urcu_wfs.c
b/tests/benchmark/test_urcu_wfs.c
index 2c82c019577a5454fef2047c1c570b5813d26465..c285feb30577a60cca79b8ed055fbb3fbc7fc1d3 100644
(file)
--- a/
tests/benchmark/test_urcu_wfs.c
+++ b/
tests/benchmark/test_urcu_wfs.c
@@
-31,13
+31,12
@@
#include <sys/wait.h>
#include <unistd.h>
#include <stdio.h>
#include <sys/wait.h>
#include <unistd.h>
#include <stdio.h>
-#include <assert.h>
#include <errno.h>
#include <urcu/arch.h>
#include <errno.h>
#include <urcu/arch.h>
+#include <urcu/assert.h>
#include <urcu/tls-compat.h>
#include <urcu/uatomic.h>
#include <urcu/tls-compat.h>
#include <urcu/uatomic.h>
-#include "cpuset.h"
#include "thread-id.h"
/* hardcoded number of CPUs */
#include "thread-id.h"
/* hardcoded number of CPUs */
@@
-94,7
+93,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 */
@@
-102,7
+101,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) {
perror("Error in pthread mutex lock");
ret = pthread_mutex_lock(&affinity_mutex);
if (ret) {
perror("Error in pthread mutex lock");
@@
-117,11
+116,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 */
}
@@
-260,7
+255,7
@@
static void *thr_dequeuer(void *_count)
}
cmm_smp_mb();
}
cmm_smp_mb();
- assert(test_pop || test_pop_all);
+
urcu_posix_
assert(test_pop || test_pop_all);
for (;;) {
if (test_pop && test_pop_all) {
for (;;) {
if (test_pop && test_pop_all) {
@@
-296,24
+291,24
@@
static void *thr_dequeuer(void *_count)
return ((void*)2);
}
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 {
{
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)
if (node) {
if (state & CDS_WFS_STATE_LAST)
- (*nr_pop_last)++;
+ (*nr_pop_last
_l
)++;
free(node);
free(node);
- (*nr_dequeues)++;
+ (*nr_dequeues
_l
)++;
}
} while (node);
}
}
} while (node);
}
-static void show_usage(
int argc,
char **argv)
+static void show_usage(char **argv)
{
printf("Usage : %s nr_dequeuers nr_enqueuers duration (s) <OPTIONS>\n",
argv[0]);
{
printf("Usage : %s nr_dequeuers nr_enqueuers duration (s) <OPTIONS>\n",
argv[0]);
@@
-347,25
+342,25
@@
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;
}
err = sscanf(argv[1], "%u", &nr_dequeuers);
if (err != 1) {
return -1;
}
err = sscanf(argv[1], "%u", &nr_dequeuers);
if (err != 1) {
- show_usage(arg
c, arg
v);
+ show_usage(argv);
return -1;
}
err = sscanf(argv[2], "%u", &nr_enqueuers);
if (err != 1) {
return -1;
}
err = sscanf(argv[2], "%u", &nr_enqueuers);
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;
}
@@
-375,7
+370,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]);
@@
-385,14
+380,14
@@
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]);
return -1;
}
wdelay = atol(argv[++i]);
@@
-515,7
+510,7
@@
int main(int argc, char **argv)
tot_pop_last += count_dequeuer[4 * i_thr + 3];
}
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);
printf_verbose("total number of enqueues : %llu, dequeues %llu\n",
tot_enqueues, tot_dequeues);
This page took
0.027327 seconds
and
4
git commands to generate.