Merge pull request #550 from zhangzihengya/develop

更新子仓库，解决uprobe中的模糊匹配问题

.gitmodules

@@ -19,3 +19,12 @@
 [submodule "eBPF_Supermarket/CPU_Subsystem/libbpf_sar/libbpf-bootstrap"]
 	path = eBPF_Supermarket/CPU_Subsystem/libbpf_sar/libbpf-bootstrap
 	url = https://github.com/libbpf/libbpf-bootstrap.git
+[submodule "eBPF_Supermarket/eBPF_proc_image/blazesym"]
+	path = eBPF_Supermarket/eBPF_proc_image/blazesym
+	url = https://github.com/libbpf/blazesym.git
+[submodule "eBPF_Supermarket/eBPF_proc_image/bpftool"]
+	path = eBPF_Supermarket/eBPF_proc_image/bpftool
+	url = https://github.com/libbpf/bpftool.git
+[submodule "eBPF_Supermarket/eBPF_proc_image/libbpf"]
+	path = eBPF_Supermarket/eBPF_proc_image/libbpf
+	url = https://github.com/libbpf/libbpf.git

eBPF_Supermarket/eBPF_proc_image/Makefile

@@ -19,12 +19,12 @@
 # SPDX-License-Identifier: (LGPL-2.1 OR BSD-2-Clause)
 OUTPUT := .output
 CLANG ?= clang
-LIBBPF_SRC := $(abspath libbpf-bootstrap/libbpf/src)
-BPFTOOL_SRC := $(abspath libbpf-bootstrap/bpftool/src)
+LIBBPF_SRC := $(abspath libbpf/src)
+BPFTOOL_SRC := $(abspath bpftool/src)
 LIBBPF_OBJ := $(abspath $(OUTPUT)/libbpf.a)
 BPFTOOL_OUTPUT ?= $(abspath $(OUTPUT)/bpftool)
 BPFTOOL ?= $(BPFTOOL_OUTPUT)/bootstrap/bpftool
-LIBBLAZESYM_SRC := $(abspath libbpf-bootstrap/blazesym/)
+LIBBLAZESYM_SRC := $(abspath blazesym/)
 LIBBLAZESYM_INC := $(abspath $(LIBBLAZESYM_SRC)/include)
 LIBBLAZESYM_OBJ := $(abspath $(OUTPUT)/libblazesym.a)
 ARCH ?= $(shell uname -m | sed 's/x86_64/x86/' \
@@ -34,7 +34,7 @@ ARCH ?= $(shell uname -m | sed 's/x86_64/x86/' \
 			 | sed 's/mips.*/mips/' \
 			 | sed 's/riscv64/riscv/' \
 			 | sed 's/loongarch64/loongarch/')
-VMLINUX := libbpf-bootstrap/vmlinux/$(ARCH)/vmlinux.h
+VMLINUX := vmlinux/$(ARCH)/vmlinux.h
 # Use our own libbpf API headers and Linux UAPI headers distributed with
 # libbpf to avoid dependency on system-wide headers, which could be missing or
 # outdated

eBPF_Supermarket/eBPF_proc_image/README.md

@@ -1,6 +1,6 @@
 # 基于eBPF的Linux系统性能监测工具-进程画像
 
-## 一、项目介绍
+## 一、介绍
 
 本项目是一个Linux进程生命周期画像工具，通过该工具可以清晰展示出一个进程从创建到终止的完整生命周期，并可以额外展示出进程/线程持有锁的区间画像、进程/线程上下文切换原因的标注、线程之间依赖关系（线程）、进程关联调用栈信息标注等。在这些功能的前提下，加入了更多的可视化元素和交互方式，使得整个画像更加直观、易于理解。
 

eBPF_Supermarket/eBPF_proc_image/tools/Makefile

@@ -19,12 +19,12 @@
 # SPDX-License-Identifier: (LGPL-2.1 OR BSD-2-Clause)
 OUTPUT := .output
 CLANG ?= clang
-LIBBPF_SRC := $(abspath ../libbpf-bootstrap/libbpf/src)
-BPFTOOL_SRC := $(abspath ../libbpf-bootstrap/bpftool/src)
+LIBBPF_SRC := $(abspath ../libbpf/src)
+BPFTOOL_SRC := $(abspath ../bpftool/src)
 LIBBPF_OBJ := $(abspath $(OUTPUT)/libbpf.a)
 BPFTOOL_OUTPUT ?= $(abspath $(OUTPUT)/bpftool)
 BPFTOOL ?= $(BPFTOOL_OUTPUT)/bootstrap/bpftool
-LIBBLAZESYM_SRC := $(abspath ../libbpf-bootstrap/blazesym/)
+LIBBLAZESYM_SRC := $(abspath ../blazesym/)
 LIBBLAZESYM_INC := $(abspath $(LIBBLAZESYM_SRC)/include)
 LIBBLAZESYM_OBJ := $(abspath $(OUTPUT)/libblazesym.a)
 ARCH ?= $(shell uname -m | sed 's/x86_64/x86/' \
@@ -34,7 +34,7 @@ ARCH ?= $(shell uname -m | sed 's/x86_64/x86/' \
 			 | sed 's/mips.*/mips/' \
 			 | sed 's/riscv64/riscv/' \
 			 | sed 's/loongarch64/loongarch/')
-VMLINUX := ../libbpf-bootstrap/vmlinux/$(ARCH)/vmlinux.h
+VMLINUX := ../vmlinux/$(ARCH)/vmlinux.h
 # Use our own libbpf API headers and Linux UAPI headers distributed with
 # libbpf to avoid dependency on system-wide headers, which could be missing or
 # outdated

eBPF_Supermarket/eBPF_proc_image/tools/keytime_image.c

@@ -189,7 +189,7 @@ static void handle_event(void *ctx, int cpu, void *data, __u32 data_sz)
 		printf("%-15llu %-15s %-16s %-6d %-6d %-15.3lf %-3d ", e->exit, c, e->comm, e->pid, e->ppid, time, e->retval);
 	}else if(e->start==0 && e->exit!=0){
 		printf("%-15llu %-15s %-16s %-6d %-6d %-15s %-3d \\\n", e->exit, c, e->comm, e->pid, e->ppid, miss, e->retval);
-		return 0;
+		return;
 	}else{
 		printf("%-15llu %-15s %-16s %-6d %-6d %-15s %-3s ", e->start, c, e->comm, e->pid, e->ppid, pad, pad);
 	}

eBPF_Supermarket/eBPF_proc_image/vmlinux/arm/vmlinux.h

@@ -0,0 +1 @@
+vmlinux_62.h