Commit 9a93bf3f authored by Hou Tao's avatar Hou Tao Committed by Alexei Starovoitov
Browse files

selftests/bpf: Fix checkpatch error on empty function parameter 



Fix checkpatch error: "ERROR: Bad function definition - void foo()
should probably be void foo(void)". Most replacements are done by
the following command:

  sed -i 's#\([a-z]\)()$#\1(void)#g' testing/selftests/bpf/benchs/*.c

Signed-off-by: default avatarHou Tao <houtao1@huawei.com>
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
Link: https://lore.kernel.org/bpf/20211210141652.877186-3-houtao1@huawei.com
parent c5fb1993

tools/testing/selftests/bpf/bench.c

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ static int bump_memlock_rlimit(void) 
	return setrlimit(RLIMIT_MEMLOCK, &rlim_new);

}



void setup_libbpf()

void setup_libbpf(void)

{

	int err;

tools/testing/selftests/bpf/bench.h

+5 −4
Original line number Diff line number Diff line
@@ -38,8 +38,8 @@ struct bench_res { 


struct bench {

	const char *name;

	void (*validate)();

	void (*setup)();

	void (*validate)(void);

	void (*setup)(void);

	void *(*producer_thread)(void *ctx);

	void *(*consumer_thread)(void *ctx);

	void (*measure)(struct bench_res* res);
@@ -54,7 +54,7 @@ struct counter { 
extern struct env env;

extern const struct bench *bench;



void setup_libbpf();

void setup_libbpf(void);

void hits_drops_report_progress(int iter, struct bench_res *res, long delta_ns);

void hits_drops_report_final(struct bench_res res[], int res_cnt);

void false_hits_report_progress(int iter, struct bench_res *res, long delta_ns);
@@ -62,7 +62,8 @@ void false_hits_report_final(struct bench_res res[], int res_cnt); 
void ops_report_progress(int iter, struct bench_res *res, long delta_ns);

void ops_report_final(struct bench_res res[], int res_cnt);



static inline __u64 get_time_ns() {

static inline __u64 get_time_ns(void)

{

	struct timespec t;



	clock_gettime(CLOCK_MONOTONIC, &t);

tools/testing/selftests/bpf/benchs/bench_count.c

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ static struct count_local_ctx { 
	struct counter *hits;

} count_local_ctx;



static void count_local_setup()

static void count_local_setup(void)

{

	struct count_local_ctx *ctx = &count_local_ctx;

tools/testing/selftests/bpf/benchs/bench_rename.c

+8 −8
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ static struct ctx { 
	int fd;

} ctx;



static void validate()

static void validate(void)

{

	if (env.producer_cnt != 1) {

		fprintf(stderr, "benchmark doesn't support multi-producer!\n");
@@ -43,7 +43,7 @@ static void measure(struct bench_res *res) 
	res->hits = atomic_swap(&ctx.hits.value, 0);

}



static void setup_ctx()

static void setup_ctx(void)

{

	setup_libbpf();
@@ -71,36 +71,36 @@ static void attach_bpf(struct bpf_program *prog) 
	}

}



static void setup_base()

static void setup_base(void)

{

	setup_ctx();

}



static void setup_kprobe()

static void setup_kprobe(void)

{

	setup_ctx();

	attach_bpf(ctx.skel->progs.prog1);

}



static void setup_kretprobe()

static void setup_kretprobe(void)

{

	setup_ctx();

	attach_bpf(ctx.skel->progs.prog2);

}



static void setup_rawtp()

static void setup_rawtp(void)

{

	setup_ctx();

	attach_bpf(ctx.skel->progs.prog3);

}



static void setup_fentry()

static void setup_fentry(void)

{

	setup_ctx();

	attach_bpf(ctx.skel->progs.prog4);

}



static void setup_fexit()

static void setup_fexit(void)

{

	setup_ctx();

	attach_bpf(ctx.skel->progs.prog5);

tools/testing/selftests/bpf/benchs/bench_ringbufs.c

+7 −7
Original line number Diff line number Diff line
@@ -88,12 +88,12 @@ const struct argp bench_ringbufs_argp = { 


static struct counter buf_hits;



static inline void bufs_trigger_batch()

static inline void bufs_trigger_batch(void)

{

	(void)syscall(__NR_getpgid);

}



static void bufs_validate()

static void bufs_validate(void)

{

	if (env.consumer_cnt != 1) {

		fprintf(stderr, "rb-libbpf benchmark doesn't support multi-consumer!\n");
@@ -132,7 +132,7 @@ static void ringbuf_libbpf_measure(struct bench_res *res) 
	res->drops = atomic_swap(&ctx->skel->bss->dropped, 0);

}



static struct ringbuf_bench *ringbuf_setup_skeleton()

static struct ringbuf_bench *ringbuf_setup_skeleton(void)

{

	struct ringbuf_bench *skel;
@@ -167,7 +167,7 @@ static int buf_process_sample(void *ctx, void *data, size_t len) 
	return 0;

}



static void ringbuf_libbpf_setup()

static void ringbuf_libbpf_setup(void)

{

	struct ringbuf_libbpf_ctx *ctx = &ringbuf_libbpf_ctx;

	struct bpf_link *link;
@@ -223,7 +223,7 @@ static void ringbuf_custom_measure(struct bench_res *res) 
	res->drops = atomic_swap(&ctx->skel->bss->dropped, 0);

}



static void ringbuf_custom_setup()

static void ringbuf_custom_setup(void)

{

	struct ringbuf_custom_ctx *ctx = &ringbuf_custom_ctx;

	const size_t page_size = getpagesize();
@@ -352,7 +352,7 @@ static void perfbuf_measure(struct bench_res *res) 
	res->drops = atomic_swap(&ctx->skel->bss->dropped, 0);

}



static struct perfbuf_bench *perfbuf_setup_skeleton()

static struct perfbuf_bench *perfbuf_setup_skeleton(void)

{

	struct perfbuf_bench *skel;
@@ -390,7 +390,7 @@ perfbuf_process_sample_raw(void *input_ctx, int cpu, 
	return LIBBPF_PERF_EVENT_CONT;

}



static void perfbuf_libbpf_setup()

static void perfbuf_libbpf_setup(void)

{

	struct perfbuf_libbpf_ctx *ctx = &perfbuf_libbpf_ctx;

	struct perf_event_attr attr;