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

Commit 4b838b0d authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo
Browse files

perf tools: Add compression id into 'struct kmod_path' 



Store a decompression ID in 'struct kmod_path', so it can be later
stored in 'struct dso'.

Switch 'struct kmod_path's 'comp' from 'bool' to 'int' to return the
compressions array index. Add 0 index item into compressions array, so
that the comp usage stays as it was: 0 - no compression, != 0
compression index.

Update the kmod_path tests.

Committer notes:

Use a designated initializer + terminating comma, e.g. { .fmt = NULL, }, to fix
the build in several distros:

  centos:6:       util/dso.c:201: error: missing initializer
  centos:6:       util/dso.c:201: error: (near initialization for 'compressions[0].decompress')
  debian:9:       util/dso.c:201:24: error: missing field 'decompress' initializer [-Werror,-Wmissing-field-initializers]
  fedora:25:      util/dso.c:201:24: error: missing field 'decompress' initializer [-Werror,-Wmissing-field-initializers]
  fedora:26:      util/dso.c:201:24: error: missing field 'decompress' initializer [-Werror,-Wmissing-field-initializers]
  fedora:27:      util/dso.c:201:24: error: missing field 'decompress' initializer [-Werror,-Wmissing-field-initializers]
  oraclelinux:6:  util/dso.c:201: error: missing initializer
  oraclelinux:6:  util/dso.c:201: error: (near initialization for 'compressions[0].decompress')
  ubuntu:12.04.5: util/dso.c:201:2: error: missing initializer [-Werror=missing-field-initializers]
  ubuntu:12.04.5: util/dso.c:201:2: error: (near initialization for 'compressions[0].decompress') [-Werror=missing-field-initializers]
  ubuntu:16.04:   util/dso.c:201:24: error: missing field 'decompress' initializer [-Werror,-Wmissing-field-initializers]
  ubuntu:16.10:   util/dso.c:201:24: error: missing field 'decompress' initializer [-Werror,-Wmissing-field-initializers]
  ubuntu:16.10:   util/dso.c:201:24: error: missing field 'decompress' initializer [-Werror,-Wmissing-field-initializers]
  ubuntu:17.10:   util/dso.c:201:24: error: missing field 'decompress' initializer [-Werror,-Wmissing-field-initializers]

Signed-off-by: default avatarJiri Olsa <jolsa@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Michael Petlan <mpetlan@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20180817094813.15086-7-jolsa@kernel.org


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

tools/perf/tests/kmod-path.c

+21 −21
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
#include "debug.h"



static int test(const char *path, bool alloc_name, bool alloc_ext,

		bool kmod, bool comp, const char *name, const char *ext)

		bool kmod, int comp, const char *name, const char *ext)

{

	struct kmod_path m;
@@ -54,47 +54,47 @@ static int test_is_kernel_module(const char *path, int cpumode, bool expect) 
int test__kmod_path__parse(struct test *t __maybe_unused, int subtest __maybe_unused)

{

	/* path                alloc_name  alloc_ext   kmod  comp   name     ext */

	T("/xxxx/xxxx/x-x.ko", true      , true      , true, false, "[x_x]", NULL);

	T("/xxxx/xxxx/x-x.ko", false     , true      , true, false, NULL   , NULL);

	T("/xxxx/xxxx/x-x.ko", true      , false     , true, false, "[x_x]", NULL);

	T("/xxxx/xxxx/x-x.ko", false     , false     , true, false, NULL   , NULL);

	T("/xxxx/xxxx/x-x.ko", true      , true      , true, 0    , "[x_x]", NULL);

	T("/xxxx/xxxx/x-x.ko", false     , true      , true, 0    , NULL   , NULL);

	T("/xxxx/xxxx/x-x.ko", true      , false     , true, 0    , "[x_x]", NULL);

	T("/xxxx/xxxx/x-x.ko", false     , false     , true, 0    , NULL   , NULL);

	M("/xxxx/xxxx/x-x.ko", PERF_RECORD_MISC_CPUMODE_UNKNOWN, true);

	M("/xxxx/xxxx/x-x.ko", PERF_RECORD_MISC_KERNEL, true);

	M("/xxxx/xxxx/x-x.ko", PERF_RECORD_MISC_USER, false);



#ifdef HAVE_ZLIB_SUPPORT

	/* path                alloc_name  alloc_ext   kmod  comp  name   ext */

	T("/xxxx/xxxx/x.ko.gz", true     , true      , true, true, "[x]", "gz");

	T("/xxxx/xxxx/x.ko.gz", false    , true      , true, true, NULL , "gz");

	T("/xxxx/xxxx/x.ko.gz", true     , false     , true, true, "[x]", NULL);

	T("/xxxx/xxxx/x.ko.gz", false    , false     , true, true, NULL , NULL);

	T("/xxxx/xxxx/x.ko.gz", true     , true      , true, 1   , "[x]", "gz");

	T("/xxxx/xxxx/x.ko.gz", false    , true      , true, 1   , NULL , "gz");

	T("/xxxx/xxxx/x.ko.gz", true     , false     , true, 1   , "[x]", NULL);

	T("/xxxx/xxxx/x.ko.gz", false    , false     , true, 1   , NULL , NULL);

	M("/xxxx/xxxx/x.ko.gz", PERF_RECORD_MISC_CPUMODE_UNKNOWN, true);

	M("/xxxx/xxxx/x.ko.gz", PERF_RECORD_MISC_KERNEL, true);

	M("/xxxx/xxxx/x.ko.gz", PERF_RECORD_MISC_USER, false);



	/* path              alloc_name  alloc_ext  kmod   comp  name    ext */

	T("/xxxx/xxxx/x.gz", true      , true     , false, true, "x.gz" ,"gz");

	T("/xxxx/xxxx/x.gz", false     , true     , false, true, NULL   ,"gz");

	T("/xxxx/xxxx/x.gz", true      , false    , false, true, "x.gz" , NULL);

	T("/xxxx/xxxx/x.gz", false     , false    , false, true, NULL   , NULL);

	T("/xxxx/xxxx/x.gz", true      , true     , false, 1   , "x.gz" ,"gz");

	T("/xxxx/xxxx/x.gz", false     , true     , false, 1   , NULL   ,"gz");

	T("/xxxx/xxxx/x.gz", true      , false    , false, 1   , "x.gz" , NULL);

	T("/xxxx/xxxx/x.gz", false     , false    , false, 1   , NULL   , NULL);

	M("/xxxx/xxxx/x.gz", PERF_RECORD_MISC_CPUMODE_UNKNOWN, false);

	M("/xxxx/xxxx/x.gz", PERF_RECORD_MISC_KERNEL, false);

	M("/xxxx/xxxx/x.gz", PERF_RECORD_MISC_USER, false);



	/* path   alloc_name  alloc_ext  kmod   comp  name     ext */

	T("x.gz", true      , true     , false, true, "x.gz", "gz");

	T("x.gz", false     , true     , false, true, NULL  , "gz");

	T("x.gz", true      , false    , false, true, "x.gz", NULL);

	T("x.gz", false     , false    , false, true, NULL  , NULL);

	T("x.gz", true      , true     , false, 1   , "x.gz", "gz");

	T("x.gz", false     , true     , false, 1   , NULL  , "gz");

	T("x.gz", true      , false    , false, 1   , "x.gz", NULL);

	T("x.gz", false     , false    , false, 1   , NULL  , NULL);

	M("x.gz", PERF_RECORD_MISC_CPUMODE_UNKNOWN, false);

	M("x.gz", PERF_RECORD_MISC_KERNEL, false);

	M("x.gz", PERF_RECORD_MISC_USER, false);



	/* path      alloc_name  alloc_ext  kmod  comp  name  ext */

	T("x.ko.gz", true      , true     , true, true, "[x]", "gz");

	T("x.ko.gz", false     , true     , true, true, NULL , "gz");

	T("x.ko.gz", true      , false    , true, true, "[x]", NULL);

	T("x.ko.gz", false     , false    , true, true, NULL , NULL);

	T("x.ko.gz", true      , true     , true, 1   , "[x]", "gz");

	T("x.ko.gz", false     , true     , true, 1   , NULL , "gz");

	T("x.ko.gz", true      , false    , true, 1   , "[x]", NULL);

	T("x.ko.gz", false     , false    , true, 1   , NULL , NULL);

	M("x.ko.gz", PERF_RECORD_MISC_CPUMODE_UNKNOWN, true);

	M("x.ko.gz", PERF_RECORD_MISC_KERNEL, true);

	M("x.ko.gz", PERF_RECORD_MISC_USER, false);

tools/perf/util/dso.c

+11 −7
Original line number Diff line number Diff line
@@ -189,10 +189,15 @@ int dso__read_binary_type_filename(const struct dso *dso, 
	return ret;

}



enum {

	COMP_ID__NONE = 0,

};



static const struct {

	const char *fmt;

	int (*decompress)(const char *input, int output);

} compressions[] = {

	[COMP_ID__NONE] = { .fmt = NULL, },

#ifdef HAVE_ZLIB_SUPPORT

	{ "gz", gzip_decompress_to_file },

#endif
@@ -202,15 +207,15 @@ static const struct { 
	{ NULL, NULL },

};



static bool is_supported_compression(const char *ext)

static int is_supported_compression(const char *ext)

{

	unsigned i;



	for (i = 0; compressions[i].fmt; i++) {

	for (i = 1; compressions[i].fmt; i++) {

		if (!strcmp(ext, compressions[i].fmt))

			return true;

			return i;

	}

	return false;

	return COMP_ID__NONE;

}



bool is_kernel_module(const char *pathname, int cpumode)
@@ -372,10 +377,9 @@ int __kmod_path__parse(struct kmod_path *m, const char *path, 
		return 0;

	}



	if (is_supported_compression(ext + 1)) {

		m->comp = true;

	m->comp = is_supported_compression(ext + 1);

	if (m->comp > COMP_ID__NONE)

		ext -= 3;

	}



	/* Check .ko extension only if there's enough name left. */

	if (ext > name)

tools/perf/util/dso.h

+1 −1
Original line number Diff line number Diff line
@@ -262,7 +262,7 @@ int dso__decompress_kmodule_path(struct dso *dso, const char *name, 
struct kmod_path {

	char *name;

	char *ext;

	bool  comp;

	int   comp;

	bool  kmod;

};