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

Commit 256763b0 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

perf trace beauty mmap: Add more conditional defines 

Don't handle some flags only if they have its defines in headers at
time of building, define what is missing.

Cc: Adrian Hunter <adrian.hunter@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-czbmxb01xzcl3h2qxuzoqkj5@git.kernel.org


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

tools/perf/trace/beauty/mmap.c

+55 −22
Original line number Diff line number Diff line 
#include <sys/mman.h>



#ifndef PROT_SEM

#define PROT_SEM 0x8

#endif



static size_t syscall_arg__scnprintf_mmap_prot(char *bf, size_t size,

					       struct syscall_arg *arg)

{
@@ -16,9 +20,7 @@ static size_t syscall_arg__scnprintf_mmap_prot(char *bf, size_t size, 
	P_MMAP_PROT(EXEC);

	P_MMAP_PROT(READ);

	P_MMAP_PROT(WRITE);

#ifdef PROT_SEM

	P_MMAP_PROT(SEM);

#endif

	P_MMAP_PROT(GROWSDOWN);

	P_MMAP_PROT(GROWSUP);

#undef P_MMAP_PROT
@@ -31,10 +33,31 @@ static size_t syscall_arg__scnprintf_mmap_prot(char *bf, size_t size, 


#define SCA_MMAP_PROT syscall_arg__scnprintf_mmap_prot



#ifndef MAP_FIXED

#define MAP_FIXED		     0x10

#endif



#ifndef MAP_ANONYMOUS

#define MAP_ANONYMOUS		     0x20

#endif



#ifndef MAP_32BIT

#define MAP_32BIT		     0x40

#endif



#ifndef MAP_STACK

#define MAP_STACK		  0x20000

#endif



#ifndef MAP_HUGETLB

#define MAP_HUGETLB		  0x40000

#endif



#ifndef MAP_UNINITIALIZED

#define MAP_UNINITIALIZED	0x4000000

#endif





static size_t syscall_arg__scnprintf_mmap_flags(char *bf, size_t size,

						struct syscall_arg *arg)

{
@@ -48,26 +71,20 @@ static size_t syscall_arg__scnprintf_mmap_flags(char *bf, size_t size, 


	P_MMAP_FLAG(SHARED);

	P_MMAP_FLAG(PRIVATE);

#ifdef MAP_32BIT

	P_MMAP_FLAG(32BIT);

#endif

	P_MMAP_FLAG(ANONYMOUS);

	P_MMAP_FLAG(DENYWRITE);

	P_MMAP_FLAG(EXECUTABLE);

	P_MMAP_FLAG(FILE);

	P_MMAP_FLAG(FIXED);

	P_MMAP_FLAG(GROWSDOWN);

#ifdef MAP_HUGETLB

	P_MMAP_FLAG(HUGETLB);

#endif

	P_MMAP_FLAG(LOCKED);

	P_MMAP_FLAG(NONBLOCK);

	P_MMAP_FLAG(NORESERVE);

	P_MMAP_FLAG(POPULATE);

	P_MMAP_FLAG(STACK);

#ifdef MAP_UNINITIALIZED

	P_MMAP_FLAG(UNINITIALIZED);

#endif

#undef P_MMAP_FLAG



	if (flags)
@@ -78,6 +95,13 @@ static size_t syscall_arg__scnprintf_mmap_flags(char *bf, size_t size, 


#define SCA_MMAP_FLAGS syscall_arg__scnprintf_mmap_flags



#ifndef MREMAP_MAYMOVE

#define MREMAP_MAYMOVE 1

#endif

#ifndef MREMAP_FIXED

#define MREMAP_FIXED 2

#endif



static size_t syscall_arg__scnprintf_mremap_flags(char *bf, size_t size,

						  struct syscall_arg *arg)

{
@@ -90,9 +114,7 @@ static size_t syscall_arg__scnprintf_mremap_flags(char *bf, size_t size, 
	}



	P_MREMAP_FLAG(MAYMOVE);

#ifdef MREMAP_FIXED

	P_MREMAP_FLAG(FIXED);

#endif

#undef P_MREMAP_FLAG



	if (flags)
@@ -107,6 +129,10 @@ static size_t syscall_arg__scnprintf_mremap_flags(char *bf, size_t size, 
#define MADV_HWPOISON		100

#endif



#ifndef MADV_SOFT_OFFLINE

#define MADV_SOFT_OFFLINE	101

#endif



#ifndef MADV_MERGEABLE

#define MADV_MERGEABLE		 12

#endif
@@ -115,6 +141,23 @@ static size_t syscall_arg__scnprintf_mremap_flags(char *bf, size_t size, 
#define MADV_UNMERGEABLE	 13

#endif



#ifndef MADV_HUGEPAGE

#define MADV_HUGEPAGE		 14

#endif



#ifndef MADV_NOHUGEPAGE

#define MADV_NOHUGEPAGE		 15

#endif



#ifndef MADV_DONTDUMP

#define MADV_DONTDUMP		 16

#endif



#ifndef MADV_DODUMP

#define MADV_DODUMP		 17

#endif





static size_t syscall_arg__scnprintf_madvise_behavior(char *bf, size_t size,

						      struct syscall_arg *arg)

{
@@ -131,24 +174,14 @@ static size_t syscall_arg__scnprintf_madvise_behavior(char *bf, size_t size, 
	P_MADV_BHV(DONTFORK);

	P_MADV_BHV(DOFORK);

	P_MADV_BHV(HWPOISON);

#ifdef MADV_SOFT_OFFLINE

	P_MADV_BHV(SOFT_OFFLINE);

#endif

	P_MADV_BHV(MERGEABLE);

	P_MADV_BHV(UNMERGEABLE);

#ifdef MADV_HUGEPAGE

	P_MADV_BHV(HUGEPAGE);

#endif

#ifdef MADV_NOHUGEPAGE

	P_MADV_BHV(NOHUGEPAGE);

#endif

#ifdef MADV_DONTDUMP

	P_MADV_BHV(DONTDUMP);

#endif

#ifdef MADV_DODUMP

	P_MADV_BHV(DODUMP);

#endif

#undef P_MADV_PHV

#undef P_MADV_BHV

	default: break;

	}