diff options
| author | Paul Buetow <paul@buetow.org> | 2025-03-24 22:50:21 +0200 |
|---|---|---|
| committer | Paul Buetow <paul@buetow.org> | 2025-03-24 22:50:21 +0200 |
| commit | 4c27068f76cebf5f190dad059027c9678aa94bd5 (patch) | |
| tree | 27640ef4649b46b4f8fdb8ea21826de771e92160 /internal | |
| parent | 1e09e1fa9ab053d793010f6e8cedbbca75076edf (diff) | |
more on this
Diffstat (limited to 'internal')
| -rw-r--r-- | internal/eventloop.go | 11 | ||||
| -rw-r--r-- | internal/file/file.go | 36 |
2 files changed, 25 insertions, 22 deletions
diff --git a/internal/eventloop.go b/internal/eventloop.go index 5947cb1..b35e519 100644 --- a/internal/eventloop.go +++ b/internal/eventloop.go @@ -302,10 +302,11 @@ func (e *eventLoop) comm(tid uint32) string { if comm, ok := e.comms[tid]; ok { return comm } - if linkName, err := os.Readlink(fmt.Sprintf("/proc/%d/exe", tid)); err == nil { - linkName = filepath.Base(linkName) - e.comms[tid] = linkName - return linkName + linkName, err := os.Readlink(fmt.Sprintf("/proc/%d/exe", tid)) + if err != nil { + return "U:comm" } - return "" + linkName = filepath.Base(linkName) + e.comms[tid] = linkName + return linkName } diff --git a/internal/file/file.go b/internal/file/file.go index 98f5af4..dfff134 100644 --- a/internal/file/file.go +++ b/internal/file/file.go @@ -84,30 +84,15 @@ func (f FdFile) Name() string { return f.name } -func (f FdFile) FlagsString() string { - var sb strings.Builder - - if f.unknownFlags { - sb.WriteString("U:") // Unknown - } - if f.flagsFromProcFS { - sb.WriteString("P:") // ProcFS - } - - flagsToStr(&sb, f.Flags) - return sb.String() -} - func (f FdFile) String() string { var sb strings.Builder if len(f.name) == 0 { - sb.WriteString("E:") // Emtpy string + sb.WriteString("E:name") // Emtpy name string } else { sb.WriteString(f.name) - sb.WriteString(" ") } - sb.WriteString("(") + sb.WriteString(" (") sb.WriteString(strconv.FormatInt(int64(f.fd), 10)) sb.WriteString(",") sb.WriteString(f.FlagsString()) @@ -116,6 +101,23 @@ func (f FdFile) String() string { return sb.String() } +func (f FdFile) FlagsString() string { + var sb strings.Builder + + if f.unknownFlags { + sb.WriteString("U") // Unknown + } + if f.flagsFromProcFS { + sb.WriteString("P") // ProcFS + } + if f.unknownFlags || f.flagsFromProcFS { + sb.WriteString(":flags") // ProcFS + } + + flagsToStr(&sb, f.Flags) + return sb.String() +} + type oldnameNewnameFile struct { Oldname, Newname string } |
