]> git.baikalelectronics.ru Git - kernel.git/commit
perf bench: fix assert when NDEBUG is defined
authorIrina Tirdea <irina.tirdea@intel.com>
Sat, 8 Sep 2012 05:35:51 +0000 (08:35 +0300)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Sat, 8 Sep 2012 16:18:54 +0000 (13:18 -0300)
commitc16675c96e8c14fb116d3365b7e9d95f689d14fb
treeba72d4cfd34862992d9d2a1111956cc26eaae839
parentd02f04ea06cf26869a7257104a684a90e72686d4
perf bench: fix assert when NDEBUG is defined

When NDEBUG is defined, the assert macro will be expanded to nothing.
Some assert calls used in perf are also including some functionality
(e.g. system calls), not only validity checks. Therefore, if NDEBUG is
defined, this functionality will be removed along with the assert.  Perf
also defines BUG_ON based on assert, so it has the same problem.

Define BUG_ON so that the condition will be executed when NDEBUG is
defined.  Replace the assert statements that have these side effects
with BUG_ON.

For defining BUG_ON, use "if (cond) {}" insted of "if (cond) ;" because
in the latter case build fails with "error: suggest braces around empty
body in an ‘if’ statement [-Werror=empty-body]"

Suggested-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Signed-off-by: Irina Tirdea <irina.tirdea@intel.com>
Reviewed-by: Namhyung Kim <namhyung@kernel.org>
Reviewed-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/1347082551-2394-1-git-send-email-irina.tirdea@intel.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
tools/perf/bench/sched-pipe.c
tools/perf/util/include/linux/kernel.h