From 406f0526b9e2961669cad16f0b36d38bf2af17f3 Mon Sep 17 00:00:00 2001 From: Paul Buetow Date: Fri, 9 Feb 2024 01:06:55 +0200 Subject: use log package everywhere --- internal/tracepoints/syscalls.go | 1 + main.go | 29 ++++++++++------------------- 2 files changed, 11 insertions(+), 19 deletions(-) diff --git a/internal/tracepoints/syscalls.go b/internal/tracepoints/syscalls.go index 51f4d94..4cfc9e0 100644 --- a/internal/tracepoints/syscalls.go +++ b/internal/tracepoints/syscalls.go @@ -27,6 +27,7 @@ func filterLines(lines []string) ([]string, error) { return syscalls, nil } +// Filter out all used syscall tracepoints from *.bpf.c func usedSyscalls() ([]string, error) { var syscalls []string diff --git a/main.go b/main.go index 0f8342a..8c74f4f 100644 --- a/main.go +++ b/main.go @@ -6,7 +6,7 @@ import ( "bytes" "encoding/binary" "fmt" - "os" + "log" "runtime" "ioriotng/internal/tracepoints" @@ -48,49 +48,41 @@ func resizeMap(module *bpf.Module, name string, size uint32) error { func main() { bpfModule, err := bpf.NewModuleFromFile("main.bpf.o") if err != nil { - fmt.Fprintln(os.Stderr, err) - os.Exit(-1) + log.Fatal(err) } defer bpfModule.Close() if err = resizeMap(bpfModule, "events", 8192); err != nil { - fmt.Fprintln(os.Stderr, err) - os.Exit(-1) + log.Fatal(err) } err = bpfModule.BPFLoadObject() if err != nil { - fmt.Fprintf(os.Stderr, "Failed to load BPF object: %v\n", err) - os.Exit(-1) + log.Fatal(err) } if err := tracepoints.AttachSyscalls(bpfModule); err != nil { - fmt.Fprintf(os.Stderr, err.Error()) - os.Exit(-1) + log.Fatal(err) } testerMap, err := bpfModule.GetMap("tester") if err != nil { - fmt.Fprintln(os.Stderr, err) - os.Exit(-1) + log.Fatal(err) } if testerMap.Name() != "tester" { - fmt.Fprintln(os.Stderr, "wrong map") - os.Exit(-1) + log.Fatal("wrong map") } if testerMap.Type() != bpf.MapTypeHash { - fmt.Fprintln(os.Stderr, "wrong map type") - os.Exit(-1) + log.Fatal("wrong map type") } eventsChannel := make(chan []byte) lostChannel := make(chan uint64) pb, err := bpfModule.InitPerfBuf("events", eventsChannel, lostChannel, 1) if err != nil { - fmt.Fprintln(os.Stderr, err) - os.Exit(-1) + log.Fatal(err) } pb.Poll(300) @@ -98,8 +90,7 @@ func main() { ev := <-eventsChannel var e openatEvent if err := binary.Read(bytes.NewReader(ev), binary.LittleEndian, &e); err != nil { - fmt.Fprintln(os.Stderr, err) - os.Exit(-1) + log.Fatal(err) } -- cgit v1.2.3