add new system file

hc

2024-02-20 102a0743326a03cd1a1202ceda21e175b7d3575c

 kernel/tools/perf/bench/futex-hash.c
..
..
@@ -18,13 +18,15 @@
18
18
 #include <stdlib.h>
19
19
 #include <linux/compiler.h>
20
20
 #include <linux/kernel.h>
21
+#include <linux/zalloc.h>
21
22
 #include <sys/time.h>
23
+#include <internal/cpumap.h>
24
+#include <perf/cpumap.h>
22
25
 
23
26
 #include "../util/stat.h"
24
27
 #include <subcmd/parse-options.h>
25
28
 #include "bench.h"
26
29
 #include "futex.h"
27
-#include "cpumap.h"
28
30
 
29
31
 #include <err.h>
30
32
 
..
..
@@ -35,7 +37,7 @@
35
37
 static bool fshared = false, done = false, silent = false;
36
38
 static int futex_flag = 0;
37
39
 
38
-struct timeval start, end, runtime;
40
+struct timeval bench__start, bench__end, bench__runtime;
39
41
 static pthread_mutex_t thread_lock;
40
42
 static unsigned int threads_starting;
41
43
 static struct stats throughput_stats;
..
..
@@ -101,8 +103,8 @@
101
103
 {
102
104
 	/* inform all threads that we're done for the day */
103
105
 	done = true;
104
-	gettimeofday(&end, NULL);
105
-	timersub(&end, &start, &runtime);
106
+	gettimeofday(&bench__end, NULL);
107
+	timersub(&bench__end, &bench__start, &bench__runtime);
106
108
 }
107
109
 
108
110
 static void print_summary(void)
..
..
@@ -112,7 +114,7 @@
112
114
 
113
115
 	printf("%sAveraged %ld operations/sec (+- %.2f%%), total secs = %d\n",
114
116
 	       !silent ? "\n" : "", avg, rel_stddev_stats(stddev, avg),
115
-	       (int) runtime.tv_sec);
117
+	       (int)bench__runtime.tv_sec);
116
118
 }
117
119
 
118
120
 int bench_futex_hash(int argc, const char **argv)
..
..
@@ -123,7 +125,7 @@
123
125
 	unsigned int i;
124
126
 	pthread_attr_t thread_attr;
125
127
 	struct worker *worker = NULL;
126
-	struct cpu_map *cpu;
128
+	struct perf_cpu_map *cpu;
127
129
 
128
130
 	argc = parse_options(argc, argv, options, bench_futex_hash_usage, 0);
129
131
 	if (argc) {
..
..
@@ -131,10 +133,11 @@
131
133
 		exit(EXIT_FAILURE);
132
134
 	}
133
135
 
134
-	cpu = cpu_map__new(NULL);
136
+	cpu = perf_cpu_map__new(NULL);
135
137
 	if (!cpu)
136
138
 		goto errmem;
137
139
 
140
+	memset(&act, 0, sizeof(act));
138
141
 	sigfillset(&act.sa_mask);
139
142
 	act.sa_sigaction = toggle_done;
140
143
 	sigaction(SIGINT, &act, NULL);
..
..
@@ -159,7 +162,7 @@
159
162
 
160
163
 	threads_starting = nthreads;
161
164
 	pthread_attr_init(&thread_attr);
162
-	gettimeofday(&start, NULL);
165
+	gettimeofday(&bench__start, NULL);
163
166
 	for (i = 0; i < nthreads; i++) {
164
167
 		worker[i].tid = i;
165
168
 		worker[i].futex = calloc(nfutexes, sizeof(*worker[i].futex));
..
..
@@ -202,7 +205,8 @@
202
205
 	pthread_mutex_destroy(&thread_lock);
203
206
 
204
207
 	for (i = 0; i < nthreads; i++) {
205
-		unsigned long t = worker[i].ops/runtime.tv_sec;
208
+		unsigned long t = bench__runtime.tv_sec > 0 ?
209
+			worker[i].ops / bench__runtime.tv_sec : 0;
206
210
 		update_stats(&throughput_stats, t);
207
211
 		if (!silent) {
208
212
 			if (nfutexes == 1)
..
..
@@ -214,7 +218,7 @@
214
218
 				       &worker[i].futex[nfutexes-1], t);
215
219
 		}
216
220
 
217
-		free(worker[i].futex);
221
+		zfree(&worker[i].futex);
218
222
 	}
219
223
 
220
224
 	print_summary();