projects
/
urcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cleanup: missing sign compare fixes
[urcu.git]
/
tests
/
benchmark
/
test_urcu_assign.c
diff --git
a/tests/benchmark/test_urcu_assign.c
b/tests/benchmark/test_urcu_assign.c
index 6c4adc35f4f04ee25d702a46705cc5a897414b88..eaa04b32e416e2ee20ad276d029e0544bf1ef31f 100644
(file)
--- a/
tests/benchmark/test_urcu_assign.c
+++ b/
tests/benchmark/test_urcu_assign.c
@@
-20,8
+20,6
@@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#define _GNU_SOURCE
-#include "config.h"
#include <stdio.h>
#include <pthread.h>
#include <stdlib.h>
#include <stdio.h>
#include <pthread.h>
#include <stdlib.h>
@@
-37,14
+35,13
@@
#include <urcu/tls-compat.h>
#include "cpuset.h"
#include "thread-id.h"
#include <urcu/tls-compat.h>
#include "cpuset.h"
#include "thread-id.h"
+#include "../common/debug-yield.h"
/* hardcoded number of CPUs */
#define NR_CPUS 16384
#ifndef DYNAMIC_LINK_TEST
#define _LGPL_SOURCE
/* hardcoded number of CPUs */
#define NR_CPUS 16384
#ifndef DYNAMIC_LINK_TEST
#define _LGPL_SOURCE
-#else
-#define rcu_debug_yield_read()
#endif
#include <urcu.h>
#endif
#include <urcu.h>
@@
-168,8
+165,8
@@
void rcu_copy_mutex_unlock(void)
* both alloc and free, which insures we never run over our tail.
*/
#define ARRAY_SIZE (1048576 * nr_writers)
* both alloc and free, which insures we never run over our tail.
*/
#define ARRAY_SIZE (1048576 * nr_writers)
-#define ARRAY_POISON 0xDEADBEEF
-static int array_index;
+#define ARRAY_POISON
(int)
0xDEADBEEF
+static
unsigned
int array_index;
static struct test_array *test_array;
static struct test_array *test_array_alloc(void)
static struct test_array *test_array;
static struct test_array *test_array_alloc(void)
@@
-280,9
+277,7
@@
void show_usage(int argc, char **argv)
printf("Usage : %s nr_readers nr_writers duration (s) <OPTIONS>\n",
argv[0]);
printf("OPTIONS:\n");
printf("Usage : %s nr_readers nr_writers duration (s) <OPTIONS>\n",
argv[0]);
printf("OPTIONS:\n");
-#ifdef DEBUG_YIELD
printf(" [-r] [-w] (yield reader and/or writer)\n");
printf(" [-r] [-w] (yield reader and/or writer)\n");
-#endif
printf(" [-d delay] (writer period (us))\n");
printf(" [-c duration] (reader C.S. duration (in loops))\n");
printf(" [-e duration] (writer C.S. duration (in loops))\n");
printf(" [-d delay] (writer period (us))\n");
printf(" [-c duration] (reader C.S. duration (in loops))\n");
printf(" [-e duration] (writer C.S. duration (in loops))\n");
@@
-299,6
+294,7
@@
int main(int argc, char **argv)
unsigned long long *count_reader, *count_writer;
unsigned long long tot_reads = 0, tot_writes = 0;
int i, a;
unsigned long long *count_reader, *count_writer;
unsigned long long tot_reads = 0, tot_writes = 0;
int i, a;
+ unsigned int i_thr;
if (argc < 4) {
show_usage(argc, argv);
if (argc < 4) {
show_usage(argc, argv);
@@
-316,7
+312,7
@@
int main(int argc, char **argv)
show_usage(argc, argv);
return -1;
}
show_usage(argc, argv);
return -1;
}
-
+
err = sscanf(argv[3], "%lu", &duration);
if (err != 1) {
show_usage(argc, argv);
err = sscanf(argv[3], "%lu", &duration);
if (err != 1) {
show_usage(argc, argv);
@@
-327,14
+323,12
@@
int main(int argc, char **argv)
if (argv[i][0] != '-')
continue;
switch (argv[i][1]) {
if (argv[i][0] != '-')
continue;
switch (argv[i][1]) {
-#ifdef DEBUG_YIELD
case 'r':
case 'r':
- rcu_
yield_active |= RCU_YIELD_READ
;
+ rcu_
debug_yield_enable(RCU_YIELD_READ)
;
break;
case 'w':
break;
case 'w':
- rcu_
yield_active |= RCU_YIELD_WRITE
;
+ rcu_
debug_yield_enable(RCU_YIELD_WRITE)
;
break;
break;
-#endif
case 'a':
if (argc < i + 2) {
show_usage(argc, argv);
case 'a':
if (argc < i + 2) {
show_usage(argc, argv);
@@
-387,15
+381,15
@@
int main(int argc, char **argv)
next_aff = 0;
next_aff = 0;
- for (i
= 0; i < nr_readers; i
++) {
- err = pthread_create(&tid_reader[i], NULL, thr_reader,
- &count_reader[i]);
+ for (i
_thr = 0; i_thr < nr_readers; i_thr
++) {
+ err = pthread_create(&tid_reader[i
_thr
], NULL, thr_reader,
+ &count_reader[i
_thr
]);
if (err != 0)
exit(1);
}
if (err != 0)
exit(1);
}
- for (i
= 0; i < nr_writers; i
++) {
- err = pthread_create(&tid_writer[i], NULL, thr_writer,
- &count_writer[i]);
+ for (i
_thr = 0; i_thr < nr_writers; i_thr
++) {
+ err = pthread_create(&tid_writer[i
_thr
], NULL, thr_writer,
+ &count_writer[i
_thr
]);
if (err != 0)
exit(1);
}
if (err != 0)
exit(1);
}
@@
-408,19
+402,19
@@
int main(int argc, char **argv)
test_stop = 1;
test_stop = 1;
- for (i
= 0; i < nr_readers; i
++) {
- err = pthread_join(tid_reader[i], &tret);
+ for (i
_thr = 0; i_thr < nr_readers; i_thr
++) {
+ err = pthread_join(tid_reader[i
_thr
], &tret);
if (err != 0)
exit(1);
if (err != 0)
exit(1);
- tot_reads += count_reader[i];
+ tot_reads += count_reader[i
_thr
];
}
}
- for (i
= 0; i < nr_writers; i
++) {
- err = pthread_join(tid_writer[i], &tret);
+ for (i
_thr = 0; i_thr < nr_writers; i_thr
++) {
+ err = pthread_join(tid_writer[i
_thr
], &tret);
if (err != 0)
exit(1);
if (err != 0)
exit(1);
- tot_writes += count_writer[i];
+ tot_writes += count_writer[i
_thr
];
}
}
-
+
printf_verbose("total number of reads : %llu, writes %llu\n", tot_reads,
tot_writes);
printf("SUMMARY %-25s testdur %4lu nr_readers %3u rdur %6lu wdur %6lu "
printf_verbose("total number of reads : %llu, writes %llu\n", tot_reads,
tot_writes);
printf("SUMMARY %-25s testdur %4lu nr_readers %3u rdur %6lu wdur %6lu "
@@
-429,11
+423,13
@@
int main(int argc, char **argv)
argv[0], duration, nr_readers, rduration, wduration,
nr_writers, wdelay, tot_reads, tot_writes,
tot_reads + tot_writes);
argv[0], duration, nr_readers, rduration, wduration,
nr_writers, wdelay, tot_reads, tot_writes,
tot_reads + tot_writes);
+
test_array_free(test_rcu_pointer);
free(test_array);
free(tid_reader);
free(tid_writer);
free(count_reader);
free(count_writer);
test_array_free(test_rcu_pointer);
free(test_array);
free(tid_reader);
free(tid_writer);
free(count_reader);
free(count_writer);
+
return 0;
}
return 0;
}
This page took
0.024513 seconds
and
4
git commands to generate.