Commit 3344996e4f2980be568ecf0cd59cb85e646da029

Authored by Arnaldo Carvalho de Melo
1 parent ee021d4223

perf symbols: Constify some DSO methods parameters

Those methods are not supposed to change the data structures they
manipulate, so make that clearer by using the const qualifier in the
function signature and in some variables.

Suggested-by: Ingo Molnar <mingo@kernel.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/n/tip-j7oyakex7zy3r82h33rdw25x@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

Showing 4 changed files with 9 additions and 10 deletions Side-by-side Diff

tools/perf/util/build-id.c
... ... @@ -89,7 +89,7 @@
89 89 return raw - build_id;
90 90 }
91 91  
92   -char *dso__build_id_filename(struct dso *dso, char *bf, size_t size)
  92 +char *dso__build_id_filename(const struct dso *dso, char *bf, size_t size)
93 93 {
94 94 char build_id_hex[BUILD_ID_SIZE * 2 + 1];
95 95  
tools/perf/util/build-id.h
... ... @@ -10,7 +10,7 @@
10 10 struct dso;
11 11  
12 12 int build_id__sprintf(const u8 *build_id, int len, char *bf);
13   -char *dso__build_id_filename(struct dso *dso, char *bf, size_t size);
  13 +char *dso__build_id_filename(const struct dso *dso, char *bf, size_t size);
14 14  
15 15 int build_id__mark_dso_hit(struct perf_tool *tool, union perf_event *event,
16 16 struct perf_sample *sample, struct perf_evsel *evsel,
tools/perf/util/dso.c
... ... @@ -28,7 +28,7 @@
28 28 return origin[dso->symtab_type];
29 29 }
30 30  
31   -int dso__binary_type_file(struct dso *dso, enum dso_binary_type type,
  31 +int dso__binary_type_file(const struct dso *dso, enum dso_binary_type type,
32 32 char *root_dir, char *file, size_t size)
33 33 {
34 34 char build_id_hex[BUILD_ID_SIZE * 2 + 1];
35 35  
... ... @@ -200,11 +200,10 @@
200 200 }
201 201 }
202 202  
203   -static struct dso_cache*
204   -dso_cache__find(struct rb_root *root, u64 offset)
  203 +static struct dso_cache *dso_cache__find(const struct rb_root *root, u64 offset)
205 204 {
206   - struct rb_node **p = &root->rb_node;
207   - struct rb_node *parent = NULL;
  205 + struct rb_node * const *p = &root->rb_node;
  206 + const struct rb_node *parent = NULL;
208 207 struct dso_cache *cache;
209 208  
210 209 while (*p != NULL) {
... ... @@ -566,7 +565,7 @@
566 565 list_add_tail(&dso->node, head);
567 566 }
568 567  
569   -struct dso *dsos__find(struct list_head *head, const char *name, bool cmp_short)
  568 +struct dso *dsos__find(const struct list_head *head, const char *name, bool cmp_short)
570 569 {
571 570 struct dso *pos;
572 571  
tools/perf/util/dso.h
... ... @@ -128,7 +128,7 @@
128 128 int dso__kernel_module_get_build_id(struct dso *dso, const char *root_dir);
129 129  
130 130 char dso__symtab_origin(const struct dso *dso);
131   -int dso__binary_type_file(struct dso *dso, enum dso_binary_type type,
  131 +int dso__binary_type_file(const struct dso *dso, enum dso_binary_type type,
132 132 char *root_dir, char *file, size_t size);
133 133  
134 134 int dso__data_fd(struct dso *dso, struct machine *machine);
... ... @@ -143,7 +143,7 @@
143 143 const char *short_name, int dso_type);
144 144  
145 145 void dsos__add(struct list_head *head, struct dso *dso);
146   -struct dso *dsos__find(struct list_head *head, const char *name,
  146 +struct dso *dsos__find(const struct list_head *head, const char *name,
147 147 bool cmp_short);
148 148 struct dso *__dsos__findnew(struct list_head *head, const char *name);
149 149 bool __dsos__read_build_ids(struct list_head *head, bool with_hits);