Merge remote-tracking branch 'origin/bcc-0.26.0'

Author: mozillazg

.github/dependabot.yml

@@ -47,6 +47,10 @@ updates:
     directory: "tools/biostacks"
     schedule:
       interval: "weekly"
+  - package-ecosystem: "gomod"
+    directory: "tools/biotop"
+    schedule:
+      interval: "weekly"
   - package-ecosystem: "gomod"
     directory: "tools/bitesize"
     schedule:
@@ -55,6 +59,10 @@ updates:
     directory: "tools/cachestat"
     schedule:
       interval: "weekly"
+  - package-ecosystem: "gomod"
+    directory: "tools/capable"
+    schedule:
+      interval: "weekly"
   - package-ecosystem: "gomod"
     directory: "tools/cpudist"
     schedule:
@@ -103,6 +111,10 @@ updates:
     directory: "tools/hardirqs"
     schedule:
       interval: "weekly"
+  - package-ecosystem: "gomod"
+    directory: "tools/javagc"
+    schedule:
+      interval: "weekly"
   - package-ecosystem: "gomod"
     directory: "tools/klockstat"
     schedule:
@@ -195,10 +207,18 @@ updates:
     directory: "tools/tcprtt"
     schedule:
       interval: "weekly"
+  - package-ecosystem: "gomod"
+    directory: "tools/tcpstates"
+    schedule:
+      interval: "weekly"
   - package-ecosystem: "gomod"
     directory: "tools/tcpsynbl"
     schedule:
       interval: "weekly"
+  - package-ecosystem: "gomod"
+    directory: "tools/tcptop"
+    schedule:
+      interval: "weekly"
   - package-ecosystem: "gomod"
     directory: "tools/tcptracer"
     schedule:
@@ -207,3 +227,7 @@ updates:
     directory: "tools/vfsstat"
     schedule:
       interval: "weekly"
+  - package-ecosystem: "gomod"
+    directory: "tools/wakeuptime"
+    schedule:
+      interval: "weekly"

.github/workflows/build.yml

@@ -2,8 +2,6 @@ name: Build tools
 
 on:
   push:
-    branches:
-      - master
   pull_request:
   workflow_dispatch:
 

README.md

@@ -5,16 +5,18 @@
 [libbpfgo](https://github.com/aquasecurity/libbpfgo) port of [bcc/libbpf-tools](https://github.com/iovisor/bcc/tree/master/libbpf-tools).
 
 
-## tools (30/46)
+## tools (30/52)
 
 * [x] [bashreadline](./tools/bashreadline)
 * [x] [bindsnoop](./tools/bindsnoop)
 * [x] [biolatency](./tools/biolatency)
 * [x] [biopattern](./tools/biopattern)
 * [x] [biosnoop](./tools/biosnoop)
 * [x] [biostacks](./tools/biostacks)
+* [ ] biotop
 * [x] [bitesize](./tools/bitesize)
 * [ ] cachestat
+* [ ] capable
 * [x] [cpudist](./tools/cpudist)
 * [ ] cpufreq
 * [x] [drsnoop](./tools/drsnoop)
@@ -27,6 +29,7 @@
 * [ ] funclatency
 * [ ] gethostlatency
 * [ ] hardirqs
+* [ ] javagc
 * [ ] klockstat
 * [ ] ksnoop
 * [ ] llcstat
@@ -50,6 +53,9 @@
 * [x] [tcpconnlat](./tools/tcpconnlat)
 * [x] [tcplife](./tools/tcplife)
 * [x] [tcprtt](./tools/tcprtt)
+* [ ] tcpstates
 * [x] [tcpsynbl](./tools/tcpsynbl)
+* [ ] tcptop
 * [x] [tcptracer](./tools/tcptracer)
 * [ ] vfsstat
+* [ ] wakeuptime

bcc

@@ -32,19 +32,18 @@ $(TOOL_NAME).bpf.o: $(LIBBPF_SRC) $(BPFTOOL_SRC) $(TOOL_BPF_OBJ)
 
 .PHONY: $(LIBBPF_SRC)
 $(LIBBPF_SRC):
-	@if [ ! -d $(LIBBPF_SRC) ]; then
-		cd $(BCC_SRC)
-		$(GIT) submodule update --init --recursive
-	fi
+	cd $(BCC_SRC)
+	$(GIT) submodule update --init --recursive
 
 .PHONY: $(BPFTOOL_SRC)
 $(BPFTOOL_SRC):
-	@if [ ! -d $(BPFTOOL_SRC) ]; then
-		cd $(BCC_SRC)
-		$(GIT) submodule update --init --recursive
-	fi
+	cd $(BCC_SRC)
+	$(GIT) submodule update --init --recursive
 
 .PHONY: $(TOOL_BPF_OBJ)
 $(TOOL_BPF_OBJ):
 	cd $(LIBBPF_TOOLS_SRC)
+	@if ! test -d /usr/include/asm; then
+		sudo ln -s /usr/include/asm-generic /usr/include/asm
+	fi
 	$(MAKE)

common/Makefile

@@ -228,8 +228,7 @@ func main() {
 	attachPrograms(bpfModule)
 
 	eventsChannel := make(chan []byte)
-	lostChannel := make(chan uint64)
-	pb, err := bpfModule.InitPerfBuf("events", eventsChannel, lostChannel, PERF_BUFFER_PAGES)
+	pb, err := bpfModule.InitRingBuf("events", eventsChannel)
 	if err != nil {
 		log.Fatalln(err)
 	}
@@ -254,8 +253,6 @@ loop:
 		select {
 		case data := <-eventsChannel:
 			printEvent(data)
-		case e := <-lostChannel:
-			log.Printf("lost %d events", e)
 		case <-ctx.Done():
 			break loop
 		}

tools/mountsnoop/main.go

@@ -79,8 +79,7 @@ func main() {
 	}
 
 	eventsChannel := make(chan []byte)
-	lostChannel := make(chan uint64)
-	pb, err := bpfModule.InitPerfBuf("events", eventsChannel, lostChannel, 1)
+	pb, err := bpfModule.InitRingBuf("events", eventsChannel)
 	if err != nil {
 		log.Fatalln(err)
 	}
@@ -103,8 +102,6 @@ loop:
 				log.Fatalf("read data failed: %s\n%v", err, data)
 			}
 			formatEvent(event)
-		case e := <-lostChannel:
-			log.Printf("lost %d events", e)
 		case <-ctx.Done():
 			break loop
 		}