Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

perf intel-pt: Use __fallthrough 



To address new warnings emmited by gcc 7, e.g.::

    CC       /tmp/build/perf/util/intel-pt-decoder/intel-pt-pkt-decoder.o
    CC       /tmp/build/perf/tests/parse-events.o
  util/intel-pt-decoder/intel-pt-pkt-decoder.c: In function 'intel_pt_pkt_desc':
  util/intel-pt-decoder/intel-pt-pkt-decoder.c:499:6: error: this statement may fall through [-Werror=implicit-fallthrough=]
     if (!(packet->count))
        ^
  util/intel-pt-decoder/intel-pt-pkt-decoder.c:501:2: note: here
    case INTEL_PT_CYC:
    ^~~~
    CC       /tmp/build/perf/util/intel-pt-decoder/intel-pt-decoder.o
  cc1: all warnings being treated as errors

Acked-by: default avatarAndi Kleen <ak@linux.intel.com>
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: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/n/tip-mf0hw789pu9x855us5l32c83@git.kernel.org


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

tools/perf/util/intel-pt-decoder/intel-pt-decoder.c

+5 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include <errno.h>

#include <stdint.h>

#include <inttypes.h>

#include <linux/compiler.h>



#include "../cache.h"

#include "../util.h"
@@ -1746,6 +1747,7 @@ static int intel_pt_walk_psb(struct intel_pt_decoder *decoder) 
		switch (decoder->packet.type) {

		case INTEL_PT_TIP_PGD:

			decoder->continuous_period = false;

			__fallthrough;

		case INTEL_PT_TIP_PGE:

		case INTEL_PT_TIP:

			intel_pt_log("ERROR: Unexpected packet\n");
@@ -1799,6 +1801,8 @@ static int intel_pt_walk_psb(struct intel_pt_decoder *decoder) 
			decoder->pge = false;

			decoder->continuous_period = false;

			intel_pt_clear_tx_flags(decoder);

			__fallthrough;



		case INTEL_PT_TNT:

			decoder->have_tma = false;

			intel_pt_log("ERROR: Unexpected packet\n");
@@ -1839,6 +1843,7 @@ static int intel_pt_walk_to_ip(struct intel_pt_decoder *decoder) 
		switch (decoder->packet.type) {

		case INTEL_PT_TIP_PGD:

			decoder->continuous_period = false;

			__fallthrough;

		case INTEL_PT_TIP_PGE:

		case INTEL_PT_TIP:

			decoder->pge = decoder->packet.type != INTEL_PT_TIP_PGD;

tools/perf/util/intel-pt-decoder/intel-pt-pkt-decoder.c

+2 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include <string.h>

#include <endian.h>

#include <byteswap.h>

#include <linux/compiler.h>



#include "intel-pt-pkt-decoder.h"
@@ -498,6 +499,7 @@ int intel_pt_pkt_desc(const struct intel_pt_pkt *packet, char *buf, 
	case INTEL_PT_FUP:

		if (!(packet->count))

			return snprintf(buf, buf_len, "%s no ip", name);

		__fallthrough;

	case INTEL_PT_CYC:

	case INTEL_PT_VMCS:

	case INTEL_PT_MTC: