Merge branch 'develop' into fusedemo_explain

.github/pull_request_template.md

@@ -21,7 +21,7 @@ Please delete options that are not relevant.
 Please describe the tests that you ran to verify your changes. Provide instructions so we can reproduce. Please also list any relevant details for your test configuration
 
 
-## Checklist/检查猎豹
+## Checklist/检查列表
 
 - [ ] My code follows the style guidelines of this project /代码规范检查
 - [ ] I have performed a self-review of my own code / 自己已经检查代码

.github/workflows/kvm_watcher.yml

@@ -29,6 +29,11 @@ jobs:
           sudo modprobe kvm
       - name: Run kvm_exits
         run: |
-          cd eBPF_Supermarket/kvm_watcher/kvm_exits
+          cd eBPF_Supermarket/kvm_watcher/vm_exits
           make
-          sudo ./kvm_exits -t 5
+          sudo ./kvm_exits -t 5
+      - name: Run kvm_vcpu
+        run: |
+          cd eBPF_Supermarket/kvm_watcher/vcpu
+          make
+          sudo ./kvm_vcpu -w -t 5

.github/workflows/libbpf.yml

@@ -5,13 +5,13 @@ on:
     branches:
       - "*"
     paths: 
-      - 'eBPF_Supermarket/CPU_Subsystem/cs_delay/libbpf_cs_delay/**'
+      - 'eBPF_Supermarket/CPU_Subsystem/cpu_watcher/cs_delay/libbpf_cs_delay/**'
       - '.github/workflows/libbpf.yml'
   pull_request:
     branches:
       - "*"
     paths:
-      - 'eBPF_Supermarket/CPU_Subsystem/cs_delay/libbpf_cs_delay/**'
+      - 'eBPF_Supermarket/CPU_Subsystem/cpu_watcher/cs_delay/libbpf_cs_delay/**'
       - '.github/workflows/libbpf.yml'
 
 jobs:
@@ -22,17 +22,12 @@ jobs:
 
       - name: Install dependencies
         run: |
-          sudo apt install clang libelf1 libelf-dev zlib1g-dev
-          sudo apt install libbpf-dev
-          sudo apt install linux-tools-5.15.0-53-generic	
-          sudo apt install linux-cloud-tools-5.15.0-53-generic
+          sudo apt update
+          sudo apt install libbpf-dev clang llvm libelf-dev libpcap-dev gcc-multilib build-essential
+          git submodule update --init --recursive
 
       - name: Run cs_delay
         run: |
-          cd eBPF_Supermarket/CPU_Subsystem/cs_delay/libbpf_cs_delay
-          # sudo bpftool btf dump file /sys/kernel/btf/vmlinux format c > vmlinux.h
-          clang -g -O2 -target bpf -D__TARGET_ARCH_x86 -I/usr/include/x86_64-linux-gnu -I. -c cs_delay.bpf.c -o cs_delay.bpf.o
-          sudo bpftool gen skeleton cs_delay.bpf.o > cs_delay.skel.h
-          clang -g -O2 -Wall -I . -c cs_delay.c -o cs_delay.o
-          clang -Wall -O2 -g cs_delay.o -static -lbpf -lelf -lz -o cs_delay
-          sudo ./cs_delay
+          cd eBPF_Supermarket/CPU_Subsystem/cpu_watcher/cs_delay/libbpf_cs_delay
+          make cs_delay
+          sudo ./cs_delay

.github/workflows/system_cpu.yml

@@ -117,6 +117,6 @@ jobs:
 
       - name: Run libbpf_sar
         run: |
-          cd eBPF_Supermarket/CPU_Subsystem/libbpf_sar
+          cd eBPF_Supermarket/CPU_Subsystem/cpu_watcher/libbpf_sar
           make libbpf_sar
           sudo ./libbpf_sar -t 1

.gitmodules

@@ -48,4 +48,7 @@
 	url = https://github.com/libbpf/libbpf.git
 [submodule "eBPF_Supermarket/Stack_Analyser/libbpf/libbpf-bootstrap"]
 	path = eBPF_Supermarket/Stack_Analyser/libbpf/libbpf-bootstrap
-	url = https://github.com/libbpf/libbpf-bootstrap.git
+	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