Merge branch 'linuxkerneltravel:develop' into develop

albertxu216 · Mar 8, 2024 · 58dc06e · 58dc06e
2 parents 0262dff + b03c9ae
commit 58dc06e
Show file tree

Hide file tree

Showing 29 changed files with 1,455 additions and 2,685 deletions.
diff --git a/.github/workflows/ebpf_stack_analyser.yml b/.github/workflows/ebpf_stack_analyser.yml
@@ -25,7 +25,6 @@ jobs:
         run: |
           git submodule update --init --recursive
           sudo apt install clang libelf1 libelf-dev zlib1g-dev
-          sudo cp eBPF_Supermarket/Stack_Analyser/FlameGraph/* /usr/bin/
         
       - name: Run app with native lib
         run: |
@@ -56,6 +55,7 @@ jobs:
           python -m pip install --upgrade pip
           sudo python -m pip install pyod
           sudo python -m pip install psutil
+          sudo apt update
           sudo apt-get install -y linux-headers-$(uname -r)
           sudo apt-get install -y python-is-python3
           sudo apt-get install -y bison build-essential cmake flex git libedit-dev libllvm11 llvm-11-dev libclang-11-dev zlib1g-dev libelf-dev libfl-dev python3-distutils

diff --git a/.gitmodules b/.gitmodules
@@ -49,9 +49,6 @@
 [submodule "eBPF_Supermarket/Stack_Analyser/libbpf/libbpf-bootstrap"]
 	path = eBPF_Supermarket/Stack_Analyser/libbpf/libbpf-bootstrap
 	url = https://github.com/libbpf/libbpf-bootstrap.git
-[submodule "eBPF_Supermarket/Stack_Analyser/speedscope"]
-	path = eBPF_Supermarket/Stack_Analyser/speedscope
-	url = https://github.com/jlfwong/speedscope
 [submodule "eBPF_Supermarket/Memory_Subsystem/blazesym"]
 	path = eBPF_Supermarket/Memory_Subsystem/blazesym
 	url = https://github.com/libbpf/blazesym.git

diff --git a/eBPF_Supermarket/Network_Subsystem/ebpf_dns_cache/Cargo.lock b/eBPF_Supermarket/Network_Subsystem/ebpf_dns_cache/Cargo.lock