From bd28618846796c865080231edb6bddb74caddff0 Mon Sep 17 00:00:00 2001 From: Paul Buetow Date: Fri, 1 Mar 2024 01:13:03 +0200 Subject: also print Comm --- internal/event.go | 4 ---- internal/eventloop.go | 8 ++++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/internal/event.go b/internal/event.go index 6a867b7..9b3a234 100644 --- a/internal/event.go +++ b/internal/event.go @@ -18,7 +18,6 @@ type event interface { type enterExitEvent struct { enterEv, exitEv event - comm string file file } @@ -32,9 +31,6 @@ func (e enterExitEvent) String() string { duration := e.exitEv.GetTime() - e.enterEv.GetTime() sb.WriteString(fmt.Sprintf("%08d µs", duration)) - sb.WriteString(" ") - sb.WriteString(e.comm) - sb.WriteString(" ") sb.WriteString(strconv.FormatInt(int64(e.enterEv.GetPid()), 10)) sb.WriteString(".") diff --git a/internal/eventloop.go b/internal/eventloop.go index 37771ee..edfa980 100644 --- a/internal/eventloop.go +++ b/internal/eventloop.go @@ -41,13 +41,14 @@ func events(rawCh <-chan []byte) <-chan enterExitEvent { if ev.is(SYS_ENTER_OPENAT, SYS_EXIT_OPENAT) || ev.is(SYS_ENTER_OPEN, SYS_EXIT_OPEN) { openEnterEv := ev.enterEv.(*OpenEnterEvent) fd := ev.exitEv.(*FdEvent).Fd - file := file{fd, string(openEnterEv.Filename[:])} + // TODO: Comm can change based on thread. So refactor this to a comms map. + file := file{string(openEnterEv.Comm[:]), fd, string(openEnterEv.Filename[:])} if fd >= 0 { files[fd] = file } - ev.comm = string(openEnterEv.Comm[:]) ev.file = file + evCh <- ev return } @@ -55,13 +56,12 @@ func events(rawCh <-chan []byte) <-chan enterExitEvent { if file_, ok := files[fdEvent.Fd]; ok { ev.file = file_ } else { - ev.file = file{fdEvent.Fd, "?"} + ev.file = file{"?", fdEvent.Fd, "?"} } if ev.is(SYS_ENTER_CLOSE, SYS_EXIT_CLOSE) { delete(files, fdEvent.Fd) } } - evCh <- ev } -- cgit v1.2.3