Re: [PATCH 1/2] perf-bench: Add epoll parallel epoll_wait benchmark

[Arnaldo Carvalho de Melo <acme@kernel.org>]

Em Fri, Nov 09, 2018 at 01:07:19PM -0800, Davidlohr Bueso escreveu:
> On Thu, 08 Nov 2018, Arnaldo Carvalho de Melo wrote:
> 
> > Em Tue, Nov 06, 2018 at 04:13:25PM -0300, Arnaldo Carvalho de Melo escreveu:
> >  CC       /tmp/build/perf/bench/futex-lock-pi.o
> >  CC       /tmp/build/perf/bench/epoll-wait.o
> > bench/epoll-wait.c: In function 'do_threads':
> > bench/epoll-wait.c:345:10: error: implicit declaration of function 'pthread_attr_setaffinity_np' [-Werror=implicit-function-declaration]
> >    ret = pthread_attr_setaffinity_np(&thread_attr, sizeof(cpu_set_t), &cpuset);
> 
> Ah, yes, how about the following?

Gets it a bit further, then we get this, which I think should be fixed
using some PRIu64, etc. I'll try to do that at some point, but in short
vacations now, then plumbers :-)

  CC       /tmp/build/perf/bench/epoll-wait.o
bench/epoll-wait.c: In function 'bench_epoll_wait':
bench/epoll-wait.c:462:12: error: format '%lu' expects argument of type 'long unsigned int', but argument 2 has type 'rlim_t {aka long long unsigned int}' [-Werror=format=]
  printinfo("Setting RLIMIT_NOFILE rlimit from %lu to: %lu\n", prevrl.rlim_max, rl.rlim_max);
            ^
bench/epoll-wait.c:85:31: note: in definition of macro 'printinfo'
  do { if (__verbose) { printf(fmt, ## arg); fflush(stdout); } } while (0)
                               ^
bench/epoll-wait.c:462:12: error: format '%lu' expects argument of type 'long unsigned int', but argument 3 has type 'rlim_t {aka long long unsigned int}' [-Werror=format=]
  printinfo("Setting RLIMIT_NOFILE rlimit from %lu to: %lu\n", prevrl.rlim_max, rl.rlim_max);
            ^
bench/epoll-wait.c:85:31: note: in definition of macro 'printinfo'
  do { if (__verbose) { printf(fmt, ## arg); fflush(stdout); } } while (0)
                               ^
  CC       /tmp/build/perf/bench/epoll-ctl.o
bench/epoll-ctl.c: In function 'bench_epoll_ctl':
bench/epoll-ctl.c:343:12: error: format '%lu' expects argument of type 'long unsigned int', but argument 2 has type 'rlim_t {aka long long unsigned int}' [-Werror=format=]
  printinfo("Setting RLIMIT_NOFILE rlimit from %lu to: %lu\n",
            ^
bench/epoll-ctl.c:31:29: note: in definition of macro 'printinfo'
  do { if (__verbose) printf(fmt, ## arg); } while (0)
                             ^
bench/epoll-ctl.c:343:12: error: format '%lu' expects argument of type 'long unsigned int', but argument 3 has type 'rlim_t {aka long long unsigned int}' [-Werror=format=]
  printinfo("Setting RLIMIT_NOFILE rlimit from %lu to: %lu\n",
            ^
bench/epoll-ctl.c:31:29: note: in definition of macro 'printinfo'
  do { if (__verbose) printf(fmt, ## arg); } while (0)
                             ^
cc1: all warnings being treated as errors
mv: can't rename '/tmp/build/perf/bench/.epoll-wait.o.tmp': No such file or directory
/git/linux/tools/build/Makefile.build:96: recipe for target '/tmp/build/perf/bench/epoll-wait.o' failed
make[4]: *** [/tmp/build/perf/bench/epoll-wait.o] Error 1
make[4]: *** Waiting for unfinished jobs....
  CC       /tmp/build/perf/perf.o
cc1: all warnings being treated as errors
mv: can't rename '/tmp/build/perf/bench/.epoll-ctl.o.tmp': No such file or directory
/git/linux/tools/build/Makefile.build:96: recipe for target '/tmp/build/perf/bench/epoll-ctl.o' failed
make[4]: *** [/tmp/build/perf/bench/epoll-ctl.o] Error 1
/git/linux/tools/build/Makefile.build:139: recipe for target 'bench' failed
make[3]: *** [bench] Error 2
make[3]: *** Waiting for unfinished jobs....
  CC       /tmp/build/perf/tests/attr.o
  CC       /tmp/build/perf/tests/vmlinux-kallsyms.o
  CC       /tmp/build/perf/tests/openat-syscall.o
  CC       /tmp/build/perf/util/map.o

 
> -----8<-----------------------------------------------------
> perf-bench: Move HAVE_PTHREAD_ATTR_SETAFFINITY_NP into bench.h
> 
> Both futex and epoll need this call, and can cause build failure
> on systems that don't have it pthread_attr_setaffinity_np().
> 
> Signed-off-by: Davidlohr Bueso <dbueso@suse.de>
> ---
> tools/perf/bench/bench.h | 11 +++++++++++
> tools/perf/bench/futex.h | 12 ------------
> 2 files changed, 11 insertions(+), 12 deletions(-)
> 
> diff --git a/tools/perf/bench/bench.h b/tools/perf/bench/bench.h
> index 0e415464931b..fddb3ced9db6 100644
> --- a/tools/perf/bench/bench.h
> +++ b/tools/perf/bench/bench.h
> @@ -51,4 +51,15 @@ int bench_epoll_ctl(int argc, const char **argv);
> extern int bench_format;
> extern unsigned int bench_repeat;
> 
> +#ifndef HAVE_PTHREAD_ATTR_SETAFFINITY_NP
> +#include <pthread.h>
> +#include <linux/compiler.h>
> +static inline int pthread_attr_setaffinity_np(pthread_attr_t *attr __maybe_unused,
> +					      size_t cpusetsize __maybe_unused,
> +					      cpu_set_t *cpuset __maybe_unused)
> +{
> +	return 0;
> +}
> +#endif
> +
> #endif
> diff --git a/tools/perf/bench/futex.h b/tools/perf/bench/futex.h
> index db4853f209c7..31b53cc7d5bc 100644
> --- a/tools/perf/bench/futex.h
> +++ b/tools/perf/bench/futex.h
> @@ -86,16 +86,4 @@ futex_cmp_requeue(u_int32_t *uaddr, u_int32_t val, u_int32_t *uaddr2, int nr_wak
> 	return futex(uaddr, FUTEX_CMP_REQUEUE, nr_wake, nr_requeue, uaddr2,
> 		 val, opflags);
> }
> -
> -#ifndef HAVE_PTHREAD_ATTR_SETAFFINITY_NP
> -#include <pthread.h>
> -#include <linux/compiler.h>
> -static inline int pthread_attr_setaffinity_np(pthread_attr_t *attr __maybe_unused,
> -					      size_t cpusetsize __maybe_unused,
> -					      cpu_set_t *cpuset __maybe_unused)
> -{
> -	return 0;
> -}
> -#endif
> -
> #endif /* _FUTEX_H */
> -- 
> 2.16.4