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

perf beauty: Make all sockaddr files use a common naming scheme 



The script that generates the tables was named 'socket.sh', which is
confusing, rename it to sockaddr.sh and make sure the related
Makefile.perf targets also use the 'sockaddr' namespace.

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

tools/perf/Makefile.perf

+6 −6
Original line number Diff line number Diff line
@@ -522,11 +522,11 @@ socket_ipproto_tbl := $(srctree)/tools/perf/trace/beauty/socket_ipproto.sh 
$(socket_ipproto_array): $(linux_uapi_dir)/in.h $(socket_ipproto_tbl)

	$(Q)$(SHELL) '$(socket_ipproto_tbl)' $(linux_uapi_dir) > $@



socket_arrays := $(beauty_outdir)/socket_arrays.c

socket_tbl := $(srctree)/tools/perf/trace/beauty/socket.sh

sockaddr_arrays := $(beauty_outdir)/sockaddr.c

sockaddr_tbl := $(srctree)/tools/perf/trace/beauty/sockaddr.sh



$(socket_arrays): $(beauty_linux_dir)/socket.h $(socket_tbl)

	$(Q)$(SHELL) '$(socket_tbl)' $(beauty_linux_dir) > $@

$(sockaddr_arrays): $(beauty_linux_dir)/socket.h $(sockaddr_tbl)

	$(Q)$(SHELL) '$(sockaddr_tbl)' $(beauty_linux_dir) > $@



vhost_virtio_ioctl_array := $(beauty_ioctl_outdir)/vhost_virtio_ioctl_array.c

vhost_virtio_hdr_dir := $(srctree)/tools/include/uapi/linux
@@ -737,7 +737,7 @@ prepare: $(OUTPUT)PERF-VERSION-FILE $(OUTPUT)common-cmds.h archheaders $(drm_ioc 
	$(kcmp_type_array) \

	$(kvm_ioctl_array) \

	$(socket_ipproto_array) \

	$(socket_arrays) \

	$(sockaddr_arrays) \

	$(vhost_virtio_ioctl_array) \

	$(madvise_behavior_array) \

	$(mmap_flags_array) \
@@ -1114,7 +1114,7 @@ clean:: $(LIBTRACEEVENT)-clean $(LIBAPI)-clean $(LIBBPF)-clean $(LIBSUBCMD)-clea 
		$(OUTPUT)$(kvm_ioctl_array) \

		$(OUTPUT)$(kcmp_type_array) \

		$(OUTPUT)$(socket_ipproto_array) \

		$(OUTPUT)$(socket_arrays) \

		$(OUTPUT)$(sockaddr_arrays) \

		$(OUTPUT)$(vhost_virtio_ioctl_array) \

		$(OUTPUT)$(perf_ioctl_array) \

		$(OUTPUT)$(prctl_option_array) \

tools/perf/trace/beauty/sockaddr.c

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
#include <sys/un.h>

#include <arpa/inet.h>



#include "trace/beauty/generated/socket_arrays.c"

#include "trace/beauty/generated/sockaddr.c"

DEFINE_STRARRAY(socket_families, "PF_");



static size_t af_inet__scnprintf(struct sockaddr *sa, char *bf, size_t size)