Commit afaed6d3 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

tools: Adopt __printf from kernel sources 

To have a more compact way to ask the compiler to perform printf like
vargargs validation.

v2: Fixed up build on arm, squashing a patch by Kim Phillips, thanks!

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Kim Phillips <kim.phillips@arm.com>
Cc: Mathieu Poirier <mathieu.poirier@linaro.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/n/tip-dopkqmmuqs04cxzql0024nnu@git.kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 6c346643

tools/include/linux/compiler-gcc.h

+2 −0
Original line number Diff line number Diff line
@@ -21,3 +21,5 @@ 
#define __must_be_array(a)	BUILD_BUG_ON_ZERO(__same_type((a), &(a)[0]))



#define __noreturn	__attribute__((noreturn))



#define __printf(a, b)	__attribute__((format(printf, a, b)))

tools/perf/arch/arm/util/cs-etm.c

+2 −2
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 


#include <api/fs/fs.h>

#include <linux/bitops.h>

#include <linux/compiler.h>

#include <linux/coresight-pmu.h>

#include <linux/kernel.h>

#include <linux/log2.h>
@@ -583,8 +584,7 @@ static FILE *cs_device__open_file(const char *name) 


}



static __attribute__((format(printf, 2, 3)))

int cs_device__print_file(const char *name, const char *fmt, ...)

static int __printf(2, 3) cs_device__print_file(const char *name, const char *fmt, ...)

{

	va_list args;

	FILE *file;

tools/perf/util/cache.h

+2 −1
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
#include <subcmd/pager.h>

#include "../ui/ui.h"



#include <linux/compiler.h>

#include <linux/string.h>



#define CMD_EXEC_PATH "--exec-path"
@@ -24,6 +25,6 @@ static inline int is_absolute_path(const char *path) 
	return path[0] == '/';

}



char *mkpath(const char *fmt, ...) __attribute__((format (printf, 1, 2)));

char *mkpath(const char *fmt, ...) __printf(1, 2);



#endif /* __PERF_CACHE_H */

tools/perf/util/debug.h

+6 −5
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 


#include <stdbool.h>

#include <string.h>

#include <linux/compiler.h>

#include "event.h"

#include "../ui/helpline.h"

#include "../ui/progress.h"
@@ -40,16 +41,16 @@ extern int debug_data_convert; 


#define STRERR_BUFSIZE	128	/* For the buffer size of str_error_r */



int dump_printf(const char *fmt, ...) __attribute__((format(printf, 1, 2)));

int dump_printf(const char *fmt, ...) __printf(1, 2);

void trace_event(union perf_event *event);



int ui__error(const char *format, ...) __attribute__((format(printf, 1, 2)));

int ui__warning(const char *format, ...) __attribute__((format(printf, 1, 2)));

int ui__error(const char *format, ...) __printf(1, 2);

int ui__warning(const char *format, ...) __printf(1, 2);



void pr_stat(const char *fmt, ...);



int eprintf(int level, int var, const char *fmt, ...) __attribute__((format(printf, 3, 4)));

int eprintf_time(int level, int var, u64 t, const char *fmt, ...) __attribute__((format(printf, 4, 5)));

int eprintf(int level, int var, const char *fmt, ...) __printf(3, 4);

int eprintf_time(int level, int var, u64 t, const char *fmt, ...) __printf(4, 5);

int veprintf(int level, int var, const char *fmt, va_list args);



int perf_debug_option(const char *str);

tools/perf/util/intel-pt-decoder/intel-pt-log.h

+2 −2
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
#ifndef INCLUDE__INTEL_PT_LOG_H__

#define INCLUDE__INTEL_PT_LOG_H__



#include <linux/compiler.h>

#include <stdint.h>

#include <inttypes.h>
@@ -34,8 +35,7 @@ void __intel_pt_log_insn(struct intel_pt_insn *intel_pt_insn, uint64_t ip); 
void __intel_pt_log_insn_no_data(struct intel_pt_insn *intel_pt_insn,

				 uint64_t ip);



__attribute__((format(printf, 1, 2)))

void __intel_pt_log(const char *fmt, ...);

void __intel_pt_log(const char *fmt, ...) __printf(1, 2);



#define intel_pt_log(fmt, ...) \

	do { \

CRA Git | Maintained and supported by SUSTech CRA and CCSE