perf tools: Use __maybe_used for unused variables
perf defines both __used and __unused variables to use for marking
unused variables. The variable __used is defined to
__attribute__((__unused__)), which contradicts the kernel definition to
__attribute__((__used__)) for new gcc versions. On Android, __used is
also defined in system headers and this leads to warnings like: warning:
'__used__' attribute ignored
__unused is not defined in the kernel and is not a standard definition.
If __unused is included everywhere instead of __used, this leads to
conflicts with glibc headers, since glibc has a variables with this name
in its headers.
The best approach is to use __maybe_unused, the definition used in the
kernel for __attribute__((unused)). In this way there is only one
definition in perf sources (instead of 2 definitions that point to the
same thing: __used and __unused) and it works on both Linux and Android.
This patch simply replaces all instances of __used and __unused with
__maybe_unused.
Signed-off-by: Irina Tirdea <irina.tirdea@intel.com>
Acked-by: Pekka Enberg <penberg@kernel.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Namhyung Kim <namhyung.kim@lge.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Steven Rostedt <rostedt@goodmis.org>
Link: http://lkml.kernel.org/r/1347315303-29906-7-git-send-email-irina.tirdea@intel.com
[ committer note: fixed up conflict with a116e05
in builtin-sched.c ]
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:

committed by
Arnaldo Carvalho de Melo

parent
7dbf4dcfe2
commit
1d037ca164
@@ -3,7 +3,8 @@
|
||||
static const char *alias_key;
|
||||
static char *alias_val;
|
||||
|
||||
static int alias_lookup_cb(const char *k, const char *v, void *cb __used)
|
||||
static int alias_lookup_cb(const char *k, const char *v,
|
||||
void *cb __maybe_unused)
|
||||
{
|
||||
if (!prefixcmp(k, "alias.") && !strcmp(k+6, alias_key)) {
|
||||
if (!v)
|
||||
|
@@ -313,8 +313,8 @@ static struct ins_ops dec_ops = {
|
||||
.scnprintf = dec__scnprintf,
|
||||
};
|
||||
|
||||
static int nop__scnprintf(struct ins *ins __used, char *bf, size_t size,
|
||||
struct ins_operands *ops __used)
|
||||
static int nop__scnprintf(struct ins *ins __maybe_unused, char *bf, size_t size,
|
||||
struct ins_operands *ops __maybe_unused)
|
||||
{
|
||||
return scnprintf(bf, size, "%-6.6s", "nop");
|
||||
}
|
||||
@@ -416,7 +416,7 @@ static struct ins *ins__find(const char *name)
|
||||
return bsearch(name, instructions, nmemb, sizeof(struct ins), ins__cmp);
|
||||
}
|
||||
|
||||
int symbol__annotate_init(struct map *map __used, struct symbol *sym)
|
||||
int symbol__annotate_init(struct map *map __maybe_unused, struct symbol *sym)
|
||||
{
|
||||
struct annotation *notes = symbol__annotation(sym);
|
||||
pthread_mutex_init(¬es->lock, NULL);
|
||||
|
@@ -126,7 +126,7 @@ int symbol__alloc_hist(struct symbol *sym);
|
||||
void symbol__annotate_zero_histograms(struct symbol *sym);
|
||||
|
||||
int symbol__annotate(struct symbol *sym, struct map *map, size_t privsize);
|
||||
int symbol__annotate_init(struct map *map __used, struct symbol *sym);
|
||||
int symbol__annotate_init(struct map *map __maybe_unused, struct symbol *sym);
|
||||
int symbol__annotate_printf(struct symbol *sym, struct map *map, int evidx,
|
||||
bool full_paths, int min_pcnt, int max_lines,
|
||||
int context);
|
||||
@@ -139,11 +139,12 @@ int symbol__tty_annotate(struct symbol *sym, struct map *map, int evidx,
|
||||
int max_lines);
|
||||
|
||||
#ifdef NO_NEWT_SUPPORT
|
||||
static inline int symbol__tui_annotate(struct symbol *sym __used,
|
||||
struct map *map __used,
|
||||
int evidx __used,
|
||||
void(*timer)(void *arg) __used,
|
||||
void *arg __used, int delay_secs __used)
|
||||
static inline int symbol__tui_annotate(struct symbol *sym __maybe_unused,
|
||||
struct map *map __maybe_unused,
|
||||
int evidx __maybe_unused,
|
||||
void(*timer)(void *arg) __maybe_unused,
|
||||
void *arg __maybe_unused,
|
||||
int delay_secs __maybe_unused)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
@@ -16,10 +16,10 @@
|
||||
#include "session.h"
|
||||
#include "tool.h"
|
||||
|
||||
static int build_id__mark_dso_hit(struct perf_tool *tool __used,
|
||||
static int build_id__mark_dso_hit(struct perf_tool *tool __maybe_unused,
|
||||
union perf_event *event,
|
||||
struct perf_sample *sample __used,
|
||||
struct perf_evsel *evsel __used,
|
||||
struct perf_sample *sample __maybe_unused,
|
||||
struct perf_evsel *evsel __maybe_unused,
|
||||
struct machine *machine)
|
||||
{
|
||||
struct addr_location al;
|
||||
@@ -41,9 +41,10 @@ static int build_id__mark_dso_hit(struct perf_tool *tool __used,
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int perf_event__exit_del_thread(struct perf_tool *tool __used,
|
||||
static int perf_event__exit_del_thread(struct perf_tool *tool __maybe_unused,
|
||||
union perf_event *event,
|
||||
struct perf_sample *sample __used,
|
||||
struct perf_sample *sample
|
||||
__maybe_unused,
|
||||
struct machine *machine)
|
||||
{
|
||||
struct thread *thread = machine__findnew_thread(machine, event->fork.tid);
|
||||
|
@@ -39,7 +39,7 @@ static inline void setup_browser(bool fallback_to_pager)
|
||||
if (fallback_to_pager)
|
||||
setup_pager();
|
||||
}
|
||||
static inline void exit_browser(bool wait_for_ok __used) {}
|
||||
static inline void exit_browser(bool wait_for_ok __maybe_unused) {}
|
||||
#else
|
||||
void setup_browser(bool fallback_to_pager);
|
||||
void exit_browser(bool wait_for_ok);
|
||||
@@ -49,7 +49,7 @@ static inline int ui__init(void)
|
||||
{
|
||||
return -1;
|
||||
}
|
||||
static inline void ui__exit(bool wait_for_ok __used) {}
|
||||
static inline void ui__exit(bool wait_for_ok __maybe_unused) {}
|
||||
#else
|
||||
int ui__init(void);
|
||||
void ui__exit(bool wait_for_ok);
|
||||
@@ -60,7 +60,7 @@ static inline int perf_gtk__init(void)
|
||||
{
|
||||
return -1;
|
||||
}
|
||||
static inline void perf_gtk__exit(bool wait_for_ok __used) {}
|
||||
static inline void perf_gtk__exit(bool wait_for_ok __maybe_unused) {}
|
||||
#else
|
||||
int perf_gtk__init(void);
|
||||
void perf_gtk__exit(bool wait_for_ok);
|
||||
|
@@ -93,7 +93,7 @@ __sort_chain_flat(struct rb_root *rb_root, struct callchain_node *node,
|
||||
*/
|
||||
static void
|
||||
sort_chain_flat(struct rb_root *rb_root, struct callchain_root *root,
|
||||
u64 min_hit, struct callchain_param *param __used)
|
||||
u64 min_hit, struct callchain_param *param __maybe_unused)
|
||||
{
|
||||
__sort_chain_flat(rb_root, &root->node, min_hit);
|
||||
}
|
||||
@@ -115,7 +115,7 @@ static void __sort_chain_graph_abs(struct callchain_node *node,
|
||||
|
||||
static void
|
||||
sort_chain_graph_abs(struct rb_root *rb_root, struct callchain_root *chain_root,
|
||||
u64 min_hit, struct callchain_param *param __used)
|
||||
u64 min_hit, struct callchain_param *param __maybe_unused)
|
||||
{
|
||||
__sort_chain_graph_abs(&chain_root->node, min_hit);
|
||||
rb_root->rb_node = chain_root->node.rb_root.rb_node;
|
||||
@@ -140,7 +140,7 @@ static void __sort_chain_graph_rel(struct callchain_node *node,
|
||||
|
||||
static void
|
||||
sort_chain_graph_rel(struct rb_root *rb_root, struct callchain_root *chain_root,
|
||||
u64 min_hit __used, struct callchain_param *param)
|
||||
u64 min_hit __maybe_unused, struct callchain_param *param)
|
||||
{
|
||||
__sort_chain_graph_rel(&chain_root->node, param->min_percent / 100.0);
|
||||
rb_root->rb_node = chain_root->node.rb_root.rb_node;
|
||||
|
@@ -138,8 +138,8 @@ void close_cgroup(struct cgroup_sel *cgrp)
|
||||
}
|
||||
}
|
||||
|
||||
int parse_cgroups(const struct option *opt __used, const char *str,
|
||||
int unset __used)
|
||||
int parse_cgroups(const struct option *opt __maybe_unused, const char *str,
|
||||
int unset __maybe_unused)
|
||||
{
|
||||
struct perf_evlist *evlist = *(struct perf_evlist **)opt->value;
|
||||
const char *p, *e, *eos = str + strlen(str);
|
||||
|
@@ -342,13 +342,15 @@ const char *perf_config_dirname(const char *name, const char *value)
|
||||
return value;
|
||||
}
|
||||
|
||||
static int perf_default_core_config(const char *var __used, const char *value __used)
|
||||
static int perf_default_core_config(const char *var __maybe_unused,
|
||||
const char *value __maybe_unused)
|
||||
{
|
||||
/* Add other config variables here. */
|
||||
return 0;
|
||||
}
|
||||
|
||||
int perf_default_config(const char *var, const char *value, void *dummy __used)
|
||||
int perf_default_config(const char *var, const char *value,
|
||||
void *dummy __maybe_unused)
|
||||
{
|
||||
if (!prefixcmp(var, "core."))
|
||||
return perf_default_core_config(var, value);
|
||||
|
@@ -16,19 +16,20 @@ struct ui_progress;
|
||||
struct perf_error_ops;
|
||||
|
||||
#if defined(NO_NEWT_SUPPORT) && defined(NO_GTK2_SUPPORT)
|
||||
static inline void ui_progress__update(u64 curr __used, u64 total __used,
|
||||
const char *title __used) {}
|
||||
static inline void ui_progress__update(u64 curr __maybe_unused,
|
||||
u64 total __maybe_unused,
|
||||
const char *title __maybe_unused) {}
|
||||
|
||||
#define ui__error(format, arg...) ui__warning(format, ##arg)
|
||||
|
||||
static inline int
|
||||
perf_error__register(struct perf_error_ops *eops __used)
|
||||
perf_error__register(struct perf_error_ops *eops __maybe_unused)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
static inline int
|
||||
perf_error__unregister(struct perf_error_ops *eops __used)
|
||||
perf_error__unregister(struct perf_error_ops *eops __maybe_unused)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
@@ -514,9 +514,9 @@ size_t perf_event__fprintf_comm(union perf_event *event, FILE *fp)
|
||||
return fprintf(fp, ": %s:%d\n", event->comm.comm, event->comm.tid);
|
||||
}
|
||||
|
||||
int perf_event__process_comm(struct perf_tool *tool __used,
|
||||
int perf_event__process_comm(struct perf_tool *tool __maybe_unused,
|
||||
union perf_event *event,
|
||||
struct perf_sample *sample __used,
|
||||
struct perf_sample *sample __maybe_unused,
|
||||
struct machine *machine)
|
||||
{
|
||||
struct thread *thread = machine__findnew_thread(machine, event->comm.tid);
|
||||
@@ -532,10 +532,10 @@ int perf_event__process_comm(struct perf_tool *tool __used,
|
||||
return 0;
|
||||
}
|
||||
|
||||
int perf_event__process_lost(struct perf_tool *tool __used,
|
||||
int perf_event__process_lost(struct perf_tool *tool __maybe_unused,
|
||||
union perf_event *event,
|
||||
struct perf_sample *sample __used,
|
||||
struct machine *machine __used)
|
||||
struct perf_sample *sample __maybe_unused,
|
||||
struct machine *machine __maybe_unused)
|
||||
{
|
||||
dump_printf(": id:%" PRIu64 ": lost:%" PRIu64 "\n",
|
||||
event->lost.id, event->lost.lost);
|
||||
@@ -555,7 +555,8 @@ static void perf_event__set_kernel_mmap_len(union perf_event *event,
|
||||
maps[MAP__FUNCTION]->end = ~0ULL;
|
||||
}
|
||||
|
||||
static int perf_event__process_kernel_mmap(struct perf_tool *tool __used,
|
||||
static int perf_event__process_kernel_mmap(struct perf_tool *tool
|
||||
__maybe_unused,
|
||||
union perf_event *event,
|
||||
struct machine *machine)
|
||||
{
|
||||
@@ -657,7 +658,7 @@ size_t perf_event__fprintf_mmap(union perf_event *event, FILE *fp)
|
||||
|
||||
int perf_event__process_mmap(struct perf_tool *tool,
|
||||
union perf_event *event,
|
||||
struct perf_sample *sample __used,
|
||||
struct perf_sample *sample __maybe_unused,
|
||||
struct machine *machine)
|
||||
{
|
||||
struct thread *thread;
|
||||
@@ -701,9 +702,9 @@ size_t perf_event__fprintf_task(union perf_event *event, FILE *fp)
|
||||
event->fork.ppid, event->fork.ptid);
|
||||
}
|
||||
|
||||
int perf_event__process_task(struct perf_tool *tool __used,
|
||||
int perf_event__process_task(struct perf_tool *tool __maybe_unused,
|
||||
union perf_event *event,
|
||||
struct perf_sample *sample __used,
|
||||
struct perf_sample *sample __maybe_unused,
|
||||
struct machine *machine)
|
||||
{
|
||||
struct thread *thread = machine__findnew_thread(machine, event->fork.tid);
|
||||
|
@@ -475,7 +475,7 @@ static bool perf_session__read_build_ids(struct perf_session *session, bool with
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int write_tracing_data(int fd, struct perf_header *h __used,
|
||||
static int write_tracing_data(int fd, struct perf_header *h __maybe_unused,
|
||||
struct perf_evlist *evlist)
|
||||
{
|
||||
return read_tracing_data(fd, &evlist->entries);
|
||||
@@ -483,7 +483,7 @@ static int write_tracing_data(int fd, struct perf_header *h __used,
|
||||
|
||||
|
||||
static int write_build_id(int fd, struct perf_header *h,
|
||||
struct perf_evlist *evlist __used)
|
||||
struct perf_evlist *evlist __maybe_unused)
|
||||
{
|
||||
struct perf_session *session;
|
||||
int err;
|
||||
@@ -504,8 +504,8 @@ static int write_build_id(int fd, struct perf_header *h,
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int write_hostname(int fd, struct perf_header *h __used,
|
||||
struct perf_evlist *evlist __used)
|
||||
static int write_hostname(int fd, struct perf_header *h __maybe_unused,
|
||||
struct perf_evlist *evlist __maybe_unused)
|
||||
{
|
||||
struct utsname uts;
|
||||
int ret;
|
||||
@@ -517,8 +517,8 @@ static int write_hostname(int fd, struct perf_header *h __used,
|
||||
return do_write_string(fd, uts.nodename);
|
||||
}
|
||||
|
||||
static int write_osrelease(int fd, struct perf_header *h __used,
|
||||
struct perf_evlist *evlist __used)
|
||||
static int write_osrelease(int fd, struct perf_header *h __maybe_unused,
|
||||
struct perf_evlist *evlist __maybe_unused)
|
||||
{
|
||||
struct utsname uts;
|
||||
int ret;
|
||||
@@ -530,8 +530,8 @@ static int write_osrelease(int fd, struct perf_header *h __used,
|
||||
return do_write_string(fd, uts.release);
|
||||
}
|
||||
|
||||
static int write_arch(int fd, struct perf_header *h __used,
|
||||
struct perf_evlist *evlist __used)
|
||||
static int write_arch(int fd, struct perf_header *h __maybe_unused,
|
||||
struct perf_evlist *evlist __maybe_unused)
|
||||
{
|
||||
struct utsname uts;
|
||||
int ret;
|
||||
@@ -543,14 +543,14 @@ static int write_arch(int fd, struct perf_header *h __used,
|
||||
return do_write_string(fd, uts.machine);
|
||||
}
|
||||
|
||||
static int write_version(int fd, struct perf_header *h __used,
|
||||
struct perf_evlist *evlist __used)
|
||||
static int write_version(int fd, struct perf_header *h __maybe_unused,
|
||||
struct perf_evlist *evlist __maybe_unused)
|
||||
{
|
||||
return do_write_string(fd, perf_version_string);
|
||||
}
|
||||
|
||||
static int write_cpudesc(int fd, struct perf_header *h __used,
|
||||
struct perf_evlist *evlist __used)
|
||||
static int write_cpudesc(int fd, struct perf_header *h __maybe_unused,
|
||||
struct perf_evlist *evlist __maybe_unused)
|
||||
{
|
||||
#ifndef CPUINFO_PROC
|
||||
#define CPUINFO_PROC NULL
|
||||
@@ -608,8 +608,8 @@ done:
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int write_nrcpus(int fd, struct perf_header *h __used,
|
||||
struct perf_evlist *evlist __used)
|
||||
static int write_nrcpus(int fd, struct perf_header *h __maybe_unused,
|
||||
struct perf_evlist *evlist __maybe_unused)
|
||||
{
|
||||
long nr;
|
||||
u32 nrc, nra;
|
||||
@@ -634,7 +634,7 @@ static int write_nrcpus(int fd, struct perf_header *h __used,
|
||||
return do_write(fd, &nra, sizeof(nra));
|
||||
}
|
||||
|
||||
static int write_event_desc(int fd, struct perf_header *h __used,
|
||||
static int write_event_desc(int fd, struct perf_header *h __maybe_unused,
|
||||
struct perf_evlist *evlist)
|
||||
{
|
||||
struct perf_evsel *evsel;
|
||||
@@ -691,8 +691,8 @@ static int write_event_desc(int fd, struct perf_header *h __used,
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int write_cmdline(int fd, struct perf_header *h __used,
|
||||
struct perf_evlist *evlist __used)
|
||||
static int write_cmdline(int fd, struct perf_header *h __maybe_unused,
|
||||
struct perf_evlist *evlist __maybe_unused)
|
||||
{
|
||||
char buf[MAXPATHLEN];
|
||||
char proc[32];
|
||||
@@ -860,8 +860,8 @@ static struct cpu_topo *build_cpu_topology(void)
|
||||
return tp;
|
||||
}
|
||||
|
||||
static int write_cpu_topology(int fd, struct perf_header *h __used,
|
||||
struct perf_evlist *evlist __used)
|
||||
static int write_cpu_topology(int fd, struct perf_header *h __maybe_unused,
|
||||
struct perf_evlist *evlist __maybe_unused)
|
||||
{
|
||||
struct cpu_topo *tp;
|
||||
u32 i;
|
||||
@@ -896,8 +896,8 @@ done:
|
||||
|
||||
|
||||
|
||||
static int write_total_mem(int fd, struct perf_header *h __used,
|
||||
struct perf_evlist *evlist __used)
|
||||
static int write_total_mem(int fd, struct perf_header *h __maybe_unused,
|
||||
struct perf_evlist *evlist __maybe_unused)
|
||||
{
|
||||
char *buf = NULL;
|
||||
FILE *fp;
|
||||
@@ -982,8 +982,8 @@ done:
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int write_numa_topology(int fd, struct perf_header *h __used,
|
||||
struct perf_evlist *evlist __used)
|
||||
static int write_numa_topology(int fd, struct perf_header *h __maybe_unused,
|
||||
struct perf_evlist *evlist __maybe_unused)
|
||||
{
|
||||
char *buf = NULL;
|
||||
size_t len = 0;
|
||||
@@ -1043,8 +1043,8 @@ done:
|
||||
* };
|
||||
*/
|
||||
|
||||
static int write_pmu_mappings(int fd, struct perf_header *h __used,
|
||||
struct perf_evlist *evlist __used)
|
||||
static int write_pmu_mappings(int fd, struct perf_header *h __maybe_unused,
|
||||
struct perf_evlist *evlist __maybe_unused)
|
||||
{
|
||||
struct perf_pmu *pmu = NULL;
|
||||
off_t offset = lseek(fd, 0, SEEK_CUR);
|
||||
@@ -1074,13 +1074,14 @@ static int write_pmu_mappings(int fd, struct perf_header *h __used,
|
||||
* default get_cpuid(): nothing gets recorded
|
||||
* actual implementation must be in arch/$(ARCH)/util/header.c
|
||||
*/
|
||||
int __attribute__((weak)) get_cpuid(char *buffer __used, size_t sz __used)
|
||||
int __attribute__ ((weak)) get_cpuid(char *buffer __maybe_unused,
|
||||
size_t sz __maybe_unused)
|
||||
{
|
||||
return -1;
|
||||
}
|
||||
|
||||
static int write_cpuid(int fd, struct perf_header *h __used,
|
||||
struct perf_evlist *evlist __used)
|
||||
static int write_cpuid(int fd, struct perf_header *h __maybe_unused,
|
||||
struct perf_evlist *evlist __maybe_unused)
|
||||
{
|
||||
char buffer[64];
|
||||
int ret;
|
||||
@@ -1094,8 +1095,9 @@ write_it:
|
||||
return do_write_string(fd, buffer);
|
||||
}
|
||||
|
||||
static int write_branch_stack(int fd __used, struct perf_header *h __used,
|
||||
struct perf_evlist *evlist __used)
|
||||
static int write_branch_stack(int fd __maybe_unused,
|
||||
struct perf_header *h __maybe_unused,
|
||||
struct perf_evlist *evlist __maybe_unused)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
@@ -1372,7 +1374,8 @@ static void print_event_desc(struct perf_header *ph, int fd, FILE *fp)
|
||||
free_event_desc(events);
|
||||
}
|
||||
|
||||
static void print_total_mem(struct perf_header *h __used, int fd, FILE *fp)
|
||||
static void print_total_mem(struct perf_header *h __maybe_unused, int fd,
|
||||
FILE *fp)
|
||||
{
|
||||
uint64_t mem;
|
||||
ssize_t ret;
|
||||
@@ -1390,7 +1393,8 @@ error:
|
||||
fprintf(fp, "# total memory : unknown\n");
|
||||
}
|
||||
|
||||
static void print_numa_topology(struct perf_header *h __used, int fd, FILE *fp)
|
||||
static void print_numa_topology(struct perf_header *h __maybe_unused, int fd,
|
||||
FILE *fp)
|
||||
{
|
||||
ssize_t ret;
|
||||
u32 nr, c, i;
|
||||
@@ -1450,7 +1454,8 @@ static void print_cpuid(struct perf_header *ph, int fd, FILE *fp)
|
||||
free(str);
|
||||
}
|
||||
|
||||
static void print_branch_stack(struct perf_header *ph __used, int fd __used,
|
||||
static void print_branch_stack(struct perf_header *ph __maybe_unused,
|
||||
int fd __maybe_unused,
|
||||
FILE *fp)
|
||||
{
|
||||
fprintf(fp, "# contains samples with branch stack\n");
|
||||
@@ -1649,9 +1654,10 @@ out:
|
||||
return err;
|
||||
}
|
||||
|
||||
static int process_tracing_data(struct perf_file_section *section __unused,
|
||||
struct perf_header *ph __unused,
|
||||
int feat __unused, int fd, void *data)
|
||||
static int process_tracing_data(struct perf_file_section *section
|
||||
__maybe_unused,
|
||||
struct perf_header *ph __maybe_unused,
|
||||
int feat __maybe_unused, int fd, void *data)
|
||||
{
|
||||
trace_report(fd, data, false);
|
||||
return 0;
|
||||
@@ -1659,7 +1665,8 @@ static int process_tracing_data(struct perf_file_section *section __unused,
|
||||
|
||||
static int process_build_id(struct perf_file_section *section,
|
||||
struct perf_header *ph,
|
||||
int feat __unused, int fd, void *data __used)
|
||||
int feat __maybe_unused, int fd,
|
||||
void *data __maybe_unused)
|
||||
{
|
||||
if (perf_header__read_build_ids(ph, fd, section->offset, section->size))
|
||||
pr_debug("Failed to read buildids, continuing...\n");
|
||||
@@ -1698,9 +1705,9 @@ perf_evlist__set_event_name(struct perf_evlist *evlist, struct perf_evsel *event
|
||||
}
|
||||
|
||||
static int
|
||||
process_event_desc(struct perf_file_section *section __unused,
|
||||
struct perf_header *header, int feat __unused, int fd,
|
||||
void *data __used)
|
||||
process_event_desc(struct perf_file_section *section __maybe_unused,
|
||||
struct perf_header *header, int feat __maybe_unused, int fd,
|
||||
void *data __maybe_unused)
|
||||
{
|
||||
struct perf_session *session = container_of(header, struct perf_session, header);
|
||||
struct perf_evsel *evsel, *events = read_event_desc(header, fd);
|
||||
@@ -2596,7 +2603,7 @@ int perf_event__synthesize_event_types(struct perf_tool *tool,
|
||||
return err;
|
||||
}
|
||||
|
||||
int perf_event__process_event_type(struct perf_tool *tool __unused,
|
||||
int perf_event__process_event_type(struct perf_tool *tool __maybe_unused,
|
||||
union perf_event *event)
|
||||
{
|
||||
if (perf_header__push_event(event->event_type.event_type.event_id,
|
||||
@@ -2613,7 +2620,7 @@ int perf_event__synthesize_tracing_data(struct perf_tool *tool, int fd,
|
||||
union perf_event ev;
|
||||
struct tracing_data *tdata;
|
||||
ssize_t size = 0, aligned_size = 0, padding;
|
||||
int err __used = 0;
|
||||
int err __maybe_unused = 0;
|
||||
|
||||
/*
|
||||
* We are going to store the size of the data followed
|
||||
@@ -2712,7 +2719,7 @@ int perf_event__synthesize_build_id(struct perf_tool *tool,
|
||||
return err;
|
||||
}
|
||||
|
||||
int perf_event__process_build_id(struct perf_tool *tool __used,
|
||||
int perf_event__process_build_id(struct perf_tool *tool __maybe_unused,
|
||||
union perf_event *event,
|
||||
struct perf_session *session)
|
||||
{
|
||||
|
@@ -332,7 +332,8 @@ const char *help_unknown_cmd(const char *cmd)
|
||||
exit(1);
|
||||
}
|
||||
|
||||
int cmd_version(int argc __used, const char **argv __used, const char *prefix __used)
|
||||
int cmd_version(int argc __maybe_unused, const char **argv __maybe_unused,
|
||||
const char *prefix __maybe_unused)
|
||||
{
|
||||
printf("perf version %s\n", perf_version_string);
|
||||
return 0;
|
||||
|
@@ -394,7 +394,7 @@ void hist_entry__free(struct hist_entry *he)
|
||||
* collapse the histogram
|
||||
*/
|
||||
|
||||
static bool hists__collapse_insert_entry(struct hists *hists __used,
|
||||
static bool hists__collapse_insert_entry(struct hists *hists __maybe_unused,
|
||||
struct rb_root *root,
|
||||
struct hist_entry *he)
|
||||
{
|
||||
|
@@ -156,20 +156,22 @@ struct perf_evlist;
|
||||
|
||||
#ifdef NO_NEWT_SUPPORT
|
||||
static inline
|
||||
int perf_evlist__tui_browse_hists(struct perf_evlist *evlist __used,
|
||||
const char *help __used,
|
||||
void(*timer)(void *arg) __used,
|
||||
void *arg __used,
|
||||
int refresh __used)
|
||||
int perf_evlist__tui_browse_hists(struct perf_evlist *evlist __maybe_unused,
|
||||
const char *help __maybe_unused,
|
||||
void(*timer)(void *arg) __maybe_unused,
|
||||
void *arg __maybe_unused,
|
||||
int refresh __maybe_unused)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
static inline int hist_entry__tui_annotate(struct hist_entry *self __used,
|
||||
int evidx __used,
|
||||
void(*timer)(void *arg) __used,
|
||||
void *arg __used,
|
||||
int delay_secs __used)
|
||||
static inline int hist_entry__tui_annotate(struct hist_entry *self
|
||||
__maybe_unused,
|
||||
int evidx __maybe_unused,
|
||||
void(*timer)(void *arg)
|
||||
__maybe_unused,
|
||||
void *arg __maybe_unused,
|
||||
int delay_secs __maybe_unused)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
@@ -187,11 +189,11 @@ int perf_evlist__tui_browse_hists(struct perf_evlist *evlist, const char *help,
|
||||
|
||||
#ifdef NO_GTK2_SUPPORT
|
||||
static inline
|
||||
int perf_evlist__gtk_browse_hists(struct perf_evlist *evlist __used,
|
||||
const char *help __used,
|
||||
void(*timer)(void *arg) __used,
|
||||
void *arg __used,
|
||||
int refresh __used)
|
||||
int perf_evlist__gtk_browse_hists(struct perf_evlist *evlist __maybe_unused,
|
||||
const char *help __maybe_unused,
|
||||
void(*timer)(void *arg) __maybe_unused,
|
||||
void *arg __maybe_unused,
|
||||
int refresh __maybe_unused)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
@@ -9,7 +9,9 @@
|
||||
#define __attribute_const__
|
||||
#endif
|
||||
|
||||
#define __used __attribute__((__unused__))
|
||||
#ifndef __maybe_unused
|
||||
#define __maybe_unused __attribute__((unused))
|
||||
#endif
|
||||
#define __packed __attribute__((__packed__))
|
||||
|
||||
#ifndef __force
|
||||
|
@@ -11,7 +11,7 @@
|
||||
|
||||
#include "intlist.h"
|
||||
|
||||
static struct rb_node *intlist__node_new(struct rblist *rblist __used,
|
||||
static struct rb_node *intlist__node_new(struct rblist *rblist __maybe_unused,
|
||||
const void *entry)
|
||||
{
|
||||
int i = (int)((long)entry);
|
||||
@@ -31,7 +31,7 @@ static void int_node__delete(struct int_node *ilist)
|
||||
free(ilist);
|
||||
}
|
||||
|
||||
static void intlist__node_delete(struct rblist *rblist __used,
|
||||
static void intlist__node_delete(struct rblist *rblist __maybe_unused,
|
||||
struct rb_node *rb_node)
|
||||
{
|
||||
struct int_node *node = container_of(rb_node, struct int_node, rb_node);
|
||||
|
@@ -96,7 +96,7 @@ static inline u64 map__unmap_ip(struct map *map, u64 ip)
|
||||
return ip + map->start - map->pgoff;
|
||||
}
|
||||
|
||||
static inline u64 identity__map_ip(struct map *map __used, u64 ip)
|
||||
static inline u64 identity__map_ip(struct map *map __maybe_unused, u64 ip)
|
||||
{
|
||||
return ip;
|
||||
}
|
||||
|
@@ -569,7 +569,7 @@ static int test__group2(struct perf_evlist *evlist)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int test__group3(struct perf_evlist *evlist __used)
|
||||
static int test__group3(struct perf_evlist *evlist __maybe_unused)
|
||||
{
|
||||
struct perf_evsel *evsel, *leader;
|
||||
|
||||
@@ -648,7 +648,7 @@ static int test__group3(struct perf_evlist *evlist __used)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int test__group4(struct perf_evlist *evlist __used)
|
||||
static int test__group4(struct perf_evlist *evlist __maybe_unused)
|
||||
{
|
||||
struct perf_evsel *evsel, *leader;
|
||||
|
||||
@@ -684,7 +684,7 @@ static int test__group4(struct perf_evlist *evlist __used)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int test__group5(struct perf_evlist *evlist __used)
|
||||
static int test__group5(struct perf_evlist *evlist __maybe_unused)
|
||||
{
|
||||
struct perf_evsel *evsel, *leader;
|
||||
|
||||
|
@@ -807,7 +807,8 @@ int parse_events_terms(struct list_head *terms, const char *str)
|
||||
return ret;
|
||||
}
|
||||
|
||||
int parse_events(struct perf_evlist *evlist, const char *str, int unset __used)
|
||||
int parse_events(struct perf_evlist *evlist, const char *str,
|
||||
int unset __maybe_unused)
|
||||
{
|
||||
struct parse_events_data__events data = {
|
||||
.list = LIST_HEAD_INIT(data.list),
|
||||
@@ -833,14 +834,14 @@ int parse_events(struct perf_evlist *evlist, const char *str, int unset __used)
|
||||
}
|
||||
|
||||
int parse_events_option(const struct option *opt, const char *str,
|
||||
int unset __used)
|
||||
int unset __maybe_unused)
|
||||
{
|
||||
struct perf_evlist *evlist = *(struct perf_evlist **)opt->value;
|
||||
return parse_events(evlist, str, unset);
|
||||
}
|
||||
|
||||
int parse_filter(const struct option *opt, const char *str,
|
||||
int unset __used)
|
||||
int unset __maybe_unused)
|
||||
{
|
||||
struct perf_evlist *evlist = *(struct perf_evlist **)opt->value;
|
||||
struct perf_evsel *last = NULL;
|
||||
|
@@ -207,7 +207,7 @@ r{num_raw_hex} { return raw(yyscanner); }
|
||||
|
||||
%%
|
||||
|
||||
int parse_events_wrap(void *scanner __used)
|
||||
int parse_events_wrap(void *scanner __maybe_unused)
|
||||
{
|
||||
return 1;
|
||||
}
|
||||
|
@@ -391,7 +391,7 @@ sep_slash_dc: '/' | ':' |
|
||||
|
||||
%%
|
||||
|
||||
void parse_events_error(void *data __used, void *scanner __used,
|
||||
char const *msg __used)
|
||||
void parse_events_error(void *data __maybe_unused, void *scanner __maybe_unused,
|
||||
char const *msg __maybe_unused)
|
||||
{
|
||||
}
|
||||
|
@@ -557,7 +557,8 @@ int parse_options_usage(const char * const *usagestr,
|
||||
}
|
||||
|
||||
|
||||
int parse_opt_verbosity_cb(const struct option *opt, const char *arg __used,
|
||||
int parse_opt_verbosity_cb(const struct option *opt,
|
||||
const char *arg __maybe_unused,
|
||||
int unset)
|
||||
{
|
||||
int *target = opt->value;
|
||||
|
@@ -6,7 +6,7 @@
|
||||
#else
|
||||
#define PERF_REGS_MASK 0
|
||||
|
||||
static inline const char *perf_reg_name(int id __used)
|
||||
static inline const char *perf_reg_name(int id __maybe_unused)
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
|
@@ -86,8 +86,8 @@ PP_VALUE
|
||||
|
||||
%%
|
||||
|
||||
void perf_pmu_error(struct list_head *list __used,
|
||||
char *name __used,
|
||||
char const *msg __used)
|
||||
void perf_pmu_error(struct list_head *list __maybe_unused,
|
||||
char *name __maybe_unused,
|
||||
char const *msg __maybe_unused)
|
||||
{
|
||||
}
|
||||
|
@@ -41,7 +41,7 @@
|
||||
#include "symbol.h"
|
||||
#include "thread.h"
|
||||
#include "debugfs.h"
|
||||
#include "trace-event.h" /* For __unused */
|
||||
#include "trace-event.h" /* For __maybe_unused */
|
||||
#include "probe-event.h"
|
||||
#include "probe-finder.h"
|
||||
#include "session.h"
|
||||
@@ -647,8 +647,8 @@ static int kprobe_convert_to_perf_probe(struct probe_trace_point *tp,
|
||||
}
|
||||
|
||||
static int try_to_find_probe_trace_events(struct perf_probe_event *pev,
|
||||
struct probe_trace_event **tevs __unused,
|
||||
int max_tevs __unused, const char *target)
|
||||
struct probe_trace_event **tevs __maybe_unused,
|
||||
int max_tevs __maybe_unused, const char *target)
|
||||
{
|
||||
if (perf_probe_event_need_dwarf(pev)) {
|
||||
pr_warning("Debuginfo-analysis is not supported.\n");
|
||||
@@ -661,17 +661,18 @@ static int try_to_find_probe_trace_events(struct perf_probe_event *pev,
|
||||
return 0;
|
||||
}
|
||||
|
||||
int show_line_range(struct line_range *lr __unused, const char *module __unused)
|
||||
int show_line_range(struct line_range *lr __maybe_unused,
|
||||
const char *module __maybe_unused)
|
||||
{
|
||||
pr_warning("Debuginfo-analysis is not supported.\n");
|
||||
return -ENOSYS;
|
||||
}
|
||||
|
||||
int show_available_vars(struct perf_probe_event *pevs __unused,
|
||||
int npevs __unused, int max_vls __unused,
|
||||
const char *module __unused,
|
||||
struct strfilter *filter __unused,
|
||||
bool externs __unused)
|
||||
int show_available_vars(struct perf_probe_event *pevs __maybe_unused,
|
||||
int npevs __maybe_unused, int max_vls __maybe_unused,
|
||||
const char *module __maybe_unused,
|
||||
struct strfilter *filter __maybe_unused,
|
||||
bool externs __maybe_unused)
|
||||
{
|
||||
pr_warning("Debuginfo-analysis is not supported.\n");
|
||||
return -ENOSYS;
|
||||
@@ -2183,7 +2184,7 @@ static struct strfilter *available_func_filter;
|
||||
* If a symbol corresponds to a function with global binding and
|
||||
* matches filter return 0. For all others return 1.
|
||||
*/
|
||||
static int filter_available_functions(struct map *map __unused,
|
||||
static int filter_available_functions(struct map *map __maybe_unused,
|
||||
struct symbol *sym)
|
||||
{
|
||||
if (sym->binding == STB_GLOBAL &&
|
||||
|
@@ -207,7 +207,7 @@ static int debuginfo__init_online_kernel_dwarf(struct debuginfo *self,
|
||||
#else
|
||||
/* With older elfutils, this just support kernel module... */
|
||||
static int debuginfo__init_online_kernel_dwarf(struct debuginfo *self,
|
||||
Dwarf_Addr addr __used)
|
||||
Dwarf_Addr addr __maybe_unused)
|
||||
{
|
||||
const char *path = kernel_get_module_path("kernel");
|
||||
|
||||
@@ -1419,7 +1419,7 @@ static int line_range_add_line(const char *src, unsigned int lineno,
|
||||
}
|
||||
|
||||
static int line_range_walk_cb(const char *fname, int lineno,
|
||||
Dwarf_Addr addr __used,
|
||||
Dwarf_Addr addr __maybe_unused,
|
||||
void *data)
|
||||
{
|
||||
struct line_finder *lf = data;
|
||||
|
@@ -672,7 +672,7 @@ struct pyrf_evlist {
|
||||
};
|
||||
|
||||
static int pyrf_evlist__init(struct pyrf_evlist *pevlist,
|
||||
PyObject *args, PyObject *kwargs __used)
|
||||
PyObject *args, PyObject *kwargs __maybe_unused)
|
||||
{
|
||||
PyObject *pcpus = NULL, *pthreads = NULL;
|
||||
struct cpu_map *cpus;
|
||||
@@ -733,7 +733,8 @@ static PyObject *pyrf_evlist__poll(struct pyrf_evlist *pevlist,
|
||||
}
|
||||
|
||||
static PyObject *pyrf_evlist__get_pollfd(struct pyrf_evlist *pevlist,
|
||||
PyObject *args __used, PyObject *kwargs __used)
|
||||
PyObject *args __maybe_unused,
|
||||
PyObject *kwargs __maybe_unused)
|
||||
{
|
||||
struct perf_evlist *evlist = &pevlist->evlist;
|
||||
PyObject *list = PyList_New(0);
|
||||
@@ -765,7 +766,8 @@ free_list:
|
||||
|
||||
|
||||
static PyObject *pyrf_evlist__add(struct pyrf_evlist *pevlist,
|
||||
PyObject *args, PyObject *kwargs __used)
|
||||
PyObject *args,
|
||||
PyObject *kwargs __maybe_unused)
|
||||
{
|
||||
struct perf_evlist *evlist = &pevlist->evlist;
|
||||
PyObject *pevsel;
|
||||
|
@@ -257,10 +257,10 @@ static inline struct event_format *find_cache_event(struct perf_evsel *evsel)
|
||||
return event;
|
||||
}
|
||||
|
||||
static void perl_process_tracepoint(union perf_event *perf_event __unused,
|
||||
static void perl_process_tracepoint(union perf_event *perf_event __maybe_unused,
|
||||
struct perf_sample *sample,
|
||||
struct perf_evsel *evsel,
|
||||
struct machine *machine __unused,
|
||||
struct machine *machine __maybe_unused,
|
||||
struct addr_location *al)
|
||||
{
|
||||
struct format_field *field;
|
||||
@@ -349,8 +349,8 @@ static void perl_process_tracepoint(union perf_event *perf_event __unused,
|
||||
static void perl_process_event_generic(union perf_event *event,
|
||||
struct perf_sample *sample,
|
||||
struct perf_evsel *evsel,
|
||||
struct machine *machine __unused,
|
||||
struct addr_location *al __unused)
|
||||
struct machine *machine __maybe_unused,
|
||||
struct addr_location *al __maybe_unused)
|
||||
{
|
||||
dSP;
|
||||
|
||||
|
@@ -221,10 +221,11 @@ static inline struct event_format *find_cache_event(struct perf_evsel *evsel)
|
||||
return event;
|
||||
}
|
||||
|
||||
static void python_process_tracepoint(union perf_event *perf_event __unused,
|
||||
static void python_process_tracepoint(union perf_event *perf_event
|
||||
__maybe_unused,
|
||||
struct perf_sample *sample,
|
||||
struct perf_evsel *evsel,
|
||||
struct machine *machine __unused,
|
||||
struct machine *machine __maybe_unused,
|
||||
struct addr_location *al)
|
||||
{
|
||||
PyObject *handler, *retval, *context, *t, *obj, *dict = NULL;
|
||||
@@ -339,10 +340,11 @@ static void python_process_tracepoint(union perf_event *perf_event __unused,
|
||||
Py_DECREF(t);
|
||||
}
|
||||
|
||||
static void python_process_general_event(union perf_event *perf_event __unused,
|
||||
static void python_process_general_event(union perf_event *perf_event
|
||||
__maybe_unused,
|
||||
struct perf_sample *sample,
|
||||
struct perf_evsel *evsel,
|
||||
struct machine *machine __unused,
|
||||
struct machine *machine __maybe_unused,
|
||||
struct addr_location *al)
|
||||
{
|
||||
PyObject *handler, *retval, *t, *dict;
|
||||
|
@@ -401,49 +401,53 @@ int machine__resolve_callchain(struct machine *machine,
|
||||
|
||||
}
|
||||
|
||||
static int process_event_synth_tracing_data_stub(union perf_event *event __used,
|
||||
struct perf_session *session __used)
|
||||
static int process_event_synth_tracing_data_stub(union perf_event *event
|
||||
__maybe_unused,
|
||||
struct perf_session *session
|
||||
__maybe_unused)
|
||||
{
|
||||
dump_printf(": unhandled!\n");
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int process_event_synth_attr_stub(union perf_event *event __used,
|
||||
struct perf_evlist **pevlist __used)
|
||||
static int process_event_synth_attr_stub(union perf_event *event __maybe_unused,
|
||||
struct perf_evlist **pevlist
|
||||
__maybe_unused)
|
||||
{
|
||||
dump_printf(": unhandled!\n");
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int process_event_sample_stub(struct perf_tool *tool __used,
|
||||
union perf_event *event __used,
|
||||
struct perf_sample *sample __used,
|
||||
struct perf_evsel *evsel __used,
|
||||
struct machine *machine __used)
|
||||
static int process_event_sample_stub(struct perf_tool *tool __maybe_unused,
|
||||
union perf_event *event __maybe_unused,
|
||||
struct perf_sample *sample __maybe_unused,
|
||||
struct perf_evsel *evsel __maybe_unused,
|
||||
struct machine *machine __maybe_unused)
|
||||
{
|
||||
dump_printf(": unhandled!\n");
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int process_event_stub(struct perf_tool *tool __used,
|
||||
union perf_event *event __used,
|
||||
struct perf_sample *sample __used,
|
||||
struct machine *machine __used)
|
||||
static int process_event_stub(struct perf_tool *tool __maybe_unused,
|
||||
union perf_event *event __maybe_unused,
|
||||
struct perf_sample *sample __maybe_unused,
|
||||
struct machine *machine __maybe_unused)
|
||||
{
|
||||
dump_printf(": unhandled!\n");
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int process_finished_round_stub(struct perf_tool *tool __used,
|
||||
union perf_event *event __used,
|
||||
struct perf_session *perf_session __used)
|
||||
static int process_finished_round_stub(struct perf_tool *tool __maybe_unused,
|
||||
union perf_event *event __maybe_unused,
|
||||
struct perf_session *perf_session
|
||||
__maybe_unused)
|
||||
{
|
||||
dump_printf(": unhandled!\n");
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int process_event_type_stub(struct perf_tool *tool __used,
|
||||
union perf_event *event __used)
|
||||
static int process_event_type_stub(struct perf_tool *tool __maybe_unused,
|
||||
union perf_event *event __maybe_unused)
|
||||
{
|
||||
dump_printf(": unhandled!\n");
|
||||
return 0;
|
||||
@@ -520,7 +524,7 @@ static void swap_sample_id_all(union perf_event *event, void *data)
|
||||
}
|
||||
|
||||
static void perf_event__all64_swap(union perf_event *event,
|
||||
bool sample_id_all __used)
|
||||
bool sample_id_all __maybe_unused)
|
||||
{
|
||||
struct perf_event_header *hdr = &event->header;
|
||||
mem_bswap_64(hdr + 1, event->header.size - sizeof(*hdr));
|
||||
@@ -631,7 +635,7 @@ void perf_event__attr_swap(struct perf_event_attr *attr)
|
||||
}
|
||||
|
||||
static void perf_event__hdr_attr_swap(union perf_event *event,
|
||||
bool sample_id_all __used)
|
||||
bool sample_id_all __maybe_unused)
|
||||
{
|
||||
size_t size;
|
||||
|
||||
@@ -643,14 +647,14 @@ static void perf_event__hdr_attr_swap(union perf_event *event,
|
||||
}
|
||||
|
||||
static void perf_event__event_type_swap(union perf_event *event,
|
||||
bool sample_id_all __used)
|
||||
bool sample_id_all __maybe_unused)
|
||||
{
|
||||
event->event_type.event_type.event_id =
|
||||
bswap_64(event->event_type.event_type.event_id);
|
||||
}
|
||||
|
||||
static void perf_event__tracing_data_swap(union perf_event *event,
|
||||
bool sample_id_all __used)
|
||||
bool sample_id_all __maybe_unused)
|
||||
{
|
||||
event->tracing_data.size = bswap_32(event->tracing_data.size);
|
||||
}
|
||||
@@ -791,7 +795,7 @@ static int flush_sample_queue(struct perf_session *s,
|
||||
* etc...
|
||||
*/
|
||||
static int process_finished_round(struct perf_tool *tool,
|
||||
union perf_event *event __used,
|
||||
union perf_event *event __maybe_unused,
|
||||
struct perf_session *session)
|
||||
{
|
||||
int ret = flush_sample_queue(session, tool);
|
||||
|
@@ -170,7 +170,7 @@ static int hist_entry__dso_snprintf(struct hist_entry *self, char *bf,
|
||||
|
||||
static int _hist_entry__sym_snprintf(struct map *map, struct symbol *sym,
|
||||
u64 ip, char level, char *bf, size_t size,
|
||||
unsigned int width __used)
|
||||
unsigned int width __maybe_unused)
|
||||
{
|
||||
size_t ret = 0;
|
||||
|
||||
@@ -205,7 +205,8 @@ struct sort_entry sort_dso = {
|
||||
};
|
||||
|
||||
static int hist_entry__sym_snprintf(struct hist_entry *self, char *bf,
|
||||
size_t size, unsigned int width __used)
|
||||
size_t size,
|
||||
unsigned int width __maybe_unused)
|
||||
{
|
||||
return _hist_entry__sym_snprintf(self->ms.map, self->ms.sym, self->ip,
|
||||
self->level, bf, size, width);
|
||||
@@ -248,7 +249,8 @@ sort__srcline_cmp(struct hist_entry *left, struct hist_entry *right)
|
||||
}
|
||||
|
||||
static int hist_entry__srcline_snprintf(struct hist_entry *self, char *bf,
|
||||
size_t size, unsigned int width __used)
|
||||
size_t size,
|
||||
unsigned int width __maybe_unused)
|
||||
{
|
||||
FILE *fp;
|
||||
char cmd[PATH_MAX + 2], *path = self->srcline, *nl;
|
||||
@@ -397,7 +399,8 @@ sort__sym_to_cmp(struct hist_entry *left, struct hist_entry *right)
|
||||
}
|
||||
|
||||
static int hist_entry__sym_from_snprintf(struct hist_entry *self, char *bf,
|
||||
size_t size, unsigned int width __used)
|
||||
size_t size,
|
||||
unsigned int width __maybe_unused)
|
||||
{
|
||||
struct addr_map_symbol *from = &self->branch_info->from;
|
||||
return _hist_entry__sym_snprintf(from->map, from->sym, from->addr,
|
||||
@@ -406,7 +409,8 @@ static int hist_entry__sym_from_snprintf(struct hist_entry *self, char *bf,
|
||||
}
|
||||
|
||||
static int hist_entry__sym_to_snprintf(struct hist_entry *self, char *bf,
|
||||
size_t size, unsigned int width __used)
|
||||
size_t size,
|
||||
unsigned int width __maybe_unused)
|
||||
{
|
||||
struct addr_map_symbol *to = &self->branch_info->to;
|
||||
return _hist_entry__sym_snprintf(to->map, to->sym, to->addr,
|
||||
|
@@ -69,8 +69,9 @@ static int read_build_id(void *note_data, size_t note_len, void *bf,
|
||||
return -1;
|
||||
}
|
||||
|
||||
int filename__read_debuglink(const char *filename __used,
|
||||
char *debuglink __used, size_t size __used)
|
||||
int filename__read_debuglink(const char *filename __maybe_unused,
|
||||
char *debuglink __maybe_unused,
|
||||
size_t size __maybe_unused)
|
||||
{
|
||||
return -1;
|
||||
}
|
||||
@@ -241,7 +242,8 @@ out:
|
||||
return ret;
|
||||
}
|
||||
|
||||
int symsrc__init(struct symsrc *ss, struct dso *dso __used, const char *name,
|
||||
int symsrc__init(struct symsrc *ss, struct dso *dso __maybe_unused,
|
||||
const char *name,
|
||||
enum dso_binary_type type)
|
||||
{
|
||||
int fd = open(name, O_RDONLY);
|
||||
@@ -260,13 +262,13 @@ out_close:
|
||||
return -1;
|
||||
}
|
||||
|
||||
bool symsrc__possibly_runtime(struct symsrc *ss __used)
|
||||
bool symsrc__possibly_runtime(struct symsrc *ss __maybe_unused)
|
||||
{
|
||||
/* Assume all sym sources could be a runtime image. */
|
||||
return true;
|
||||
}
|
||||
|
||||
bool symsrc__has_symtab(struct symsrc *ss __used)
|
||||
bool symsrc__has_symtab(struct symsrc *ss __maybe_unused)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
@@ -277,17 +279,19 @@ void symsrc__destroy(struct symsrc *ss)
|
||||
close(ss->fd);
|
||||
}
|
||||
|
||||
int dso__synthesize_plt_symbols(struct dso *dso __used,
|
||||
struct symsrc *ss __used,
|
||||
struct map *map __used,
|
||||
symbol_filter_t filter __used)
|
||||
int dso__synthesize_plt_symbols(struct dso *dso __maybe_unused,
|
||||
struct symsrc *ss __maybe_unused,
|
||||
struct map *map __maybe_unused,
|
||||
symbol_filter_t filter __maybe_unused)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
int dso__load_sym(struct dso *dso, struct map *map __used, struct symsrc *ss,
|
||||
struct symsrc *runtime_ss __used,
|
||||
symbol_filter_t filter __used, int kmodule __used)
|
||||
int dso__load_sym(struct dso *dso, struct map *map __maybe_unused,
|
||||
struct symsrc *ss,
|
||||
struct symsrc *runtime_ss __maybe_unused,
|
||||
symbol_filter_t filter __maybe_unused,
|
||||
int kmodule __maybe_unused)
|
||||
{
|
||||
unsigned char *build_id[BUILD_ID_SIZE];
|
||||
|
||||
|
@@ -1755,7 +1755,7 @@ struct process_args {
|
||||
};
|
||||
|
||||
static int symbol__in_kernel(void *arg, const char *name,
|
||||
char type __used, u64 start)
|
||||
char type __maybe_unused, u64 start)
|
||||
{
|
||||
struct process_args *args = arg;
|
||||
|
||||
|
@@ -21,14 +21,15 @@
|
||||
#ifdef HAVE_CPLUS_DEMANGLE
|
||||
extern char *cplus_demangle(const char *, int);
|
||||
|
||||
static inline char *bfd_demangle(void __used *v, const char *c, int i)
|
||||
static inline char *bfd_demangle(void __maybe_unused *v, const char *c, int i)
|
||||
{
|
||||
return cplus_demangle(c, i);
|
||||
}
|
||||
#else
|
||||
#ifdef NO_DEMANGLE
|
||||
static inline char *bfd_demangle(void __used *v, const char __used *c,
|
||||
int __used i)
|
||||
static inline char *bfd_demangle(void __maybe_unused *v,
|
||||
const char __maybe_unused *c,
|
||||
int __maybe_unused i)
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
|
@@ -221,7 +221,7 @@ void print_event(struct pevent *pevent, int cpu, void *data, int size,
|
||||
}
|
||||
|
||||
void parse_proc_kallsyms(struct pevent *pevent,
|
||||
char *file, unsigned int size __unused)
|
||||
char *file, unsigned int size __maybe_unused)
|
||||
{
|
||||
unsigned long long addr;
|
||||
char *func;
|
||||
@@ -253,7 +253,7 @@ void parse_proc_kallsyms(struct pevent *pevent,
|
||||
}
|
||||
|
||||
void parse_ftrace_printk(struct pevent *pevent,
|
||||
char *file, unsigned int size __unused)
|
||||
char *file, unsigned int size __maybe_unused)
|
||||
{
|
||||
unsigned long long addr;
|
||||
char *printk;
|
||||
|
@@ -35,11 +35,11 @@ static int stop_script_unsupported(void)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void process_event_unsupported(union perf_event *event __unused,
|
||||
struct perf_sample *sample __unused,
|
||||
struct perf_evsel *evsel __unused,
|
||||
struct machine *machine __unused,
|
||||
struct addr_location *al __unused)
|
||||
static void process_event_unsupported(union perf_event *event __maybe_unused,
|
||||
struct perf_sample *sample __maybe_unused,
|
||||
struct perf_evsel *evsel __maybe_unused,
|
||||
struct machine *machine __maybe_unused,
|
||||
struct addr_location *al __maybe_unused)
|
||||
{
|
||||
}
|
||||
|
||||
@@ -52,17 +52,19 @@ static void print_python_unsupported_msg(void)
|
||||
"\n etc.\n");
|
||||
}
|
||||
|
||||
static int python_start_script_unsupported(const char *script __unused,
|
||||
int argc __unused,
|
||||
const char **argv __unused)
|
||||
static int python_start_script_unsupported(const char *script __maybe_unused,
|
||||
int argc __maybe_unused,
|
||||
const char **argv __maybe_unused)
|
||||
{
|
||||
print_python_unsupported_msg();
|
||||
|
||||
return -1;
|
||||
}
|
||||
|
||||
static int python_generate_script_unsupported(struct pevent *pevent __unused,
|
||||
const char *outfile __unused)
|
||||
static int python_generate_script_unsupported(struct pevent *pevent
|
||||
__maybe_unused,
|
||||
const char *outfile
|
||||
__maybe_unused)
|
||||
{
|
||||
print_python_unsupported_msg();
|
||||
|
||||
@@ -114,17 +116,18 @@ static void print_perl_unsupported_msg(void)
|
||||
"\n etc.\n");
|
||||
}
|
||||
|
||||
static int perl_start_script_unsupported(const char *script __unused,
|
||||
int argc __unused,
|
||||
const char **argv __unused)
|
||||
static int perl_start_script_unsupported(const char *script __maybe_unused,
|
||||
int argc __maybe_unused,
|
||||
const char **argv __maybe_unused)
|
||||
{
|
||||
print_perl_unsupported_msg();
|
||||
|
||||
return -1;
|
||||
}
|
||||
|
||||
static int perl_generate_script_unsupported(struct pevent *pevent __unused,
|
||||
const char *outfile __unused)
|
||||
static int perl_generate_script_unsupported(struct pevent *pevent
|
||||
__maybe_unused,
|
||||
const char *outfile __maybe_unused)
|
||||
{
|
||||
print_perl_unsupported_msg();
|
||||
|
||||
|
@@ -307,32 +307,36 @@ find_proc_info(unw_addr_space_t as, unw_word_t ip, unw_proc_info_t *pi,
|
||||
need_unwind_info, arg);
|
||||
}
|
||||
|
||||
static int access_fpreg(unw_addr_space_t __used as, unw_regnum_t __used num,
|
||||
unw_fpreg_t __used *val, int __used __write,
|
||||
void __used *arg)
|
||||
static int access_fpreg(unw_addr_space_t __maybe_unused as,
|
||||
unw_regnum_t __maybe_unused num,
|
||||
unw_fpreg_t __maybe_unused *val,
|
||||
int __maybe_unused __write,
|
||||
void __maybe_unused *arg)
|
||||
{
|
||||
pr_err("unwind: access_fpreg unsupported\n");
|
||||
return -UNW_EINVAL;
|
||||
}
|
||||
|
||||
static int get_dyn_info_list_addr(unw_addr_space_t __used as,
|
||||
unw_word_t __used *dil_addr,
|
||||
void __used *arg)
|
||||
static int get_dyn_info_list_addr(unw_addr_space_t __maybe_unused as,
|
||||
unw_word_t __maybe_unused *dil_addr,
|
||||
void __maybe_unused *arg)
|
||||
{
|
||||
return -UNW_ENOINFO;
|
||||
}
|
||||
|
||||
static int resume(unw_addr_space_t __used as, unw_cursor_t __used *cu,
|
||||
void __used *arg)
|
||||
static int resume(unw_addr_space_t __maybe_unused as,
|
||||
unw_cursor_t __maybe_unused *cu,
|
||||
void __maybe_unused *arg)
|
||||
{
|
||||
pr_err("unwind: resume unsupported\n");
|
||||
return -UNW_EINVAL;
|
||||
}
|
||||
|
||||
static int
|
||||
get_proc_name(unw_addr_space_t __used as, unw_word_t __used addr,
|
||||
char __used *bufp, size_t __used buf_len,
|
||||
unw_word_t __used *offp, void __used *arg)
|
||||
get_proc_name(unw_addr_space_t __maybe_unused as,
|
||||
unw_word_t __maybe_unused addr,
|
||||
char __maybe_unused *bufp, size_t __maybe_unused buf_len,
|
||||
unw_word_t __maybe_unused *offp, void __maybe_unused *arg)
|
||||
{
|
||||
pr_err("unwind: get_proc_name unsupported\n");
|
||||
return -UNW_EINVAL;
|
||||
@@ -377,7 +381,7 @@ static int reg_value(unw_word_t *valp, struct regs_dump *regs, int id,
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int access_mem(unw_addr_space_t __used as,
|
||||
static int access_mem(unw_addr_space_t __maybe_unused as,
|
||||
unw_word_t addr, unw_word_t *valp,
|
||||
int __write, void *arg)
|
||||
{
|
||||
@@ -422,7 +426,7 @@ static int access_mem(unw_addr_space_t __used as,
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int access_reg(unw_addr_space_t __used as,
|
||||
static int access_reg(unw_addr_space_t __maybe_unused as,
|
||||
unw_regnum_t regnum, unw_word_t *valp,
|
||||
int __write, void *arg)
|
||||
{
|
||||
@@ -454,9 +458,9 @@ static int access_reg(unw_addr_space_t __used as,
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void put_unwind_info(unw_addr_space_t __used as,
|
||||
unw_proc_info_t *pi __used,
|
||||
void *arg __used)
|
||||
static void put_unwind_info(unw_addr_space_t __maybe_unused as,
|
||||
unw_proc_info_t *pi __maybe_unused,
|
||||
void *arg __maybe_unused)
|
||||
{
|
||||
pr_debug("unwind: put_unwind_info called\n");
|
||||
}
|
||||
|
@@ -22,11 +22,12 @@ int unwind__get_entries(unwind_entry_cb_t cb, void *arg,
|
||||
int unwind__arch_reg_id(int regnum);
|
||||
#else
|
||||
static inline int
|
||||
unwind__get_entries(unwind_entry_cb_t cb __used, void *arg __used,
|
||||
struct machine *machine __used,
|
||||
struct thread *thread __used,
|
||||
u64 sample_uregs __used,
|
||||
struct perf_sample *data __used)
|
||||
unwind__get_entries(unwind_entry_cb_t cb __maybe_unused,
|
||||
void *arg __maybe_unused,
|
||||
struct machine *machine __maybe_unused,
|
||||
struct thread *thread __maybe_unused,
|
||||
u64 sample_uregs __maybe_unused,
|
||||
struct perf_sample *data __maybe_unused)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
@@ -7,7 +7,8 @@
|
||||
* There's no pack memory to release - but stay close to the Git
|
||||
* version so wrap this away:
|
||||
*/
|
||||
static inline void release_pack_memory(size_t size __used, int flag __used)
|
||||
static inline void release_pack_memory(size_t size __maybe_unused,
|
||||
int flag __maybe_unused)
|
||||
{
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user