kernel_5.10 no rt

hc

2023-12-11 6778948f9de86c3cfaf36725a7c87dcff9ba247f

 kernel/tools/perf/util/cpumap.h
..
..
@@ -4,36 +4,31 @@
4
4
 
5
5
 #include <stdio.h>
6
6
 #include <stdbool.h>
7
-#include <linux/refcount.h>
7
+#include <internal/cpumap.h>
8
+#include <perf/cpumap.h>
8
9
 
9
-#include "perf.h"
10
-#include "util/debug.h"
10
+struct perf_record_cpu_map_data;
11
11
 
12
-struct cpu_map {
13
-	refcount_t refcnt;
14
-	int nr;
15
-	int map[];
16
-};
17
-
18
-struct cpu_map *cpu_map__new(const char *cpu_list);
19
-struct cpu_map *cpu_map__empty_new(int nr);
20
-struct cpu_map *cpu_map__dummy_new(void);
21
-struct cpu_map *cpu_map__new_data(struct cpu_map_data *data);
22
-struct cpu_map *cpu_map__read(FILE *file);
23
-size_t cpu_map__snprint(struct cpu_map *map, char *buf, size_t size);
24
-size_t cpu_map__snprint_mask(struct cpu_map *map, char *buf, size_t size);
25
-size_t cpu_map__fprintf(struct cpu_map *map, FILE *fp);
12
+struct perf_cpu_map *perf_cpu_map__empty_new(int nr);
13
+struct perf_cpu_map *cpu_map__new_data(struct perf_record_cpu_map_data *data);
14
+size_t cpu_map__snprint(struct perf_cpu_map *map, char *buf, size_t size);
15
+size_t cpu_map__snprint_mask(struct perf_cpu_map *map, char *buf, size_t size);
16
+size_t cpu_map__fprintf(struct perf_cpu_map *map, FILE *fp);
26
17
 int cpu_map__get_socket_id(int cpu);
27
-int cpu_map__get_socket(struct cpu_map *map, int idx, void *data);
18
+int cpu_map__get_socket(struct perf_cpu_map *map, int idx, void *data);
19
+int cpu_map__get_die_id(int cpu);
20
+int cpu_map__get_die(struct perf_cpu_map *map, int idx, void *data);
28
21
 int cpu_map__get_core_id(int cpu);
29
-int cpu_map__get_core(struct cpu_map *map, int idx, void *data);
30
-int cpu_map__build_socket_map(struct cpu_map *cpus, struct cpu_map **sockp);
31
-int cpu_map__build_core_map(struct cpu_map *cpus, struct cpu_map **corep);
22
+int cpu_map__get_core(struct perf_cpu_map *map, int idx, void *data);
23
+int cpu_map__get_node_id(int cpu);
24
+int cpu_map__get_node(struct perf_cpu_map *map, int idx, void *data);
25
+int cpu_map__build_socket_map(struct perf_cpu_map *cpus, struct perf_cpu_map **sockp);
26
+int cpu_map__build_die_map(struct perf_cpu_map *cpus, struct perf_cpu_map **diep);
27
+int cpu_map__build_core_map(struct perf_cpu_map *cpus, struct perf_cpu_map **corep);
28
+int cpu_map__build_node_map(struct perf_cpu_map *cpus, struct perf_cpu_map **nodep);
29
+const struct perf_cpu_map *cpu_map__online(void); /* thread unsafe */
32
30
 
33
-struct cpu_map *cpu_map__get(struct cpu_map *map);
34
-void cpu_map__put(struct cpu_map *map);
35
-
36
-static inline int cpu_map__socket(struct cpu_map *sock, int s)
31
+static inline int cpu_map__socket(struct perf_cpu_map *sock, int s)
37
32
 {
38
33
 	if (!sock || s > sock->nr || s < 0)
39
34
 		return 0;
..
..
@@ -42,22 +37,17 @@
42
37
 
43
38
 static inline int cpu_map__id_to_socket(int id)
44
39
 {
45
-	return id >> 16;
40
+	return id >> 24;
41
+}
42
+
43
+static inline int cpu_map__id_to_die(int id)
44
+{
45
+	return (id >> 16) & 0xff;
46
46
 }
47
47
 
48
48
 static inline int cpu_map__id_to_cpu(int id)
49
49
 {
50
50
 	return id & 0xffff;
51
-}
52
-
53
-static inline int cpu_map__nr(const struct cpu_map *map)
54
-{
55
-	return map ? map->nr : 1;
56
-}
57
-
58
-static inline bool cpu_map__empty(const struct cpu_map *map)
59
-{
60
-	return map ? map->map[0] == -1 : true;
61
51
 }
62
52
 
63
53
 int cpu__setup_cpunode_map(void);
..
..
@@ -67,11 +57,11 @@
67
57
 int cpu__max_present_cpu(void);
68
58
 int cpu__get_node(int cpu);
69
59
 
70
-int cpu_map__build_map(struct cpu_map *cpus, struct cpu_map **res,
71
-		       int (*f)(struct cpu_map *map, int cpu, void *data),
60
+int cpu_map__build_map(struct perf_cpu_map *cpus, struct perf_cpu_map **res,
61
+		       int (*f)(struct perf_cpu_map *map, int cpu, void *data),
72
62
 		       void *data);
73
63
 
74
-int cpu_map__cpu(struct cpu_map *cpus, int idx);
75
-bool cpu_map__has(struct cpu_map *cpus, int cpu);
76
-int cpu_map__idx(struct cpu_map *cpus, int cpu);
64
+int cpu_map__cpu(struct perf_cpu_map *cpus, int idx);
65
+bool cpu_map__has(struct perf_cpu_map *cpus, int cpu);
66
+
77
67
 #endif /* __PERF_CPUMAP_H */