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

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

perf trace beauty flock: Move to separate object file 

To resolve some header conflicts that were preventing the build to
succeed in the Alpine Linux distribution.

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: https://lkml.kernel.org/n/tip-bvud0dvzvip3kibeplupdbmc@git.kernel.org


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

tools/perf/builtin-trace.c

+0 −1
Original line number Diff line number Diff line
@@ -548,7 +548,6 @@ static size_t syscall_arg__scnprintf_getrandom_flags(char *bf, size_t size, 


#include "trace/beauty/arch_errno_names.c"

#include "trace/beauty/eventfd.c"

#include "trace/beauty/flock.c"

#include "trace/beauty/futex_op.c"

#include "trace/beauty/futex_val3.c"

#include "trace/beauty/mmap.c"

tools/perf/trace/beauty/Build

+1 −0
Original line number Diff line number Diff line 
libperf-y += clone.o

libperf-y += fcntl.o

libperf-y += flock.o

ifeq ($(SRCARCH),$(filter $(SRCARCH),x86))

libperf-y += ioctl.o

endif

tools/perf/trace/beauty/beauty.h

+3 −0
Original line number Diff line number Diff line
@@ -79,6 +79,9 @@ size_t syscall_arg__scnprintf_fcntl_cmd(char *bf, size_t size, struct syscall_ar 
size_t syscall_arg__scnprintf_fcntl_arg(char *bf, size_t size, struct syscall_arg *arg);

#define SCA_FCNTL_ARG syscall_arg__scnprintf_fcntl_arg



size_t syscall_arg__scnprintf_flock(char *bf, size_t size, struct syscall_arg *arg);

#define SCA_FLOCK syscall_arg__scnprintf_flock



size_t syscall_arg__scnprintf_ioctl_cmd(char *bf, size_t size, struct syscall_arg *arg);

#define SCA_IOCTL_CMD syscall_arg__scnprintf_ioctl_cmd

tools/perf/trace/beauty/flock.c

+5 −5
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

#include <fcntl.h>



#include "trace/beauty/beauty.h"

#include <linux/kernel.h>

#include <uapi/linux/fcntl.h>



#ifndef LOCK_MAND

#define LOCK_MAND	 32
@@ -17,8 +20,7 @@ 
#define LOCK_RW		192

#endif



static size_t syscall_arg__scnprintf_flock(char *bf, size_t size,

					   struct syscall_arg *arg)

size_t syscall_arg__scnprintf_flock(char *bf, size_t size, struct syscall_arg *arg)

{

	int printed = 0, op = arg->val;
@@ -45,5 +47,3 @@ static size_t syscall_arg__scnprintf_flock(char *bf, size_t size, 


	return printed;

}
 


#define SCA_FLOCK syscall_arg__scnprintf_flock