summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Buetow <paul@buetow.org>2024-02-21 00:44:37 +0200
committerPaul Buetow <paul@buetow.org>2024-02-21 00:44:37 +0200
commite1213c1c0e52348fffb47015237b88237a377081 (patch)
tree1da2e3b18b246cdcf111e6482b710837c1428d6e
parent78df0341b28d07234388763f050d1b18b7c3d231 (diff)
move generated tracepoints to separate directory
-rw-r--r--internal/generated/Makefile2
-rw-r--r--internal/generated/tracepoints.raku4
-rw-r--r--internal/generated/tracepoints/tracepoints.go (renamed from internal/generated/tracepoints.go)4
-rw-r--r--internal/ioriotng.go4
-rw-r--r--internal/types/types.go3
5 files changed, 8 insertions, 9 deletions
diff --git a/internal/generated/Makefile b/internal/generated/Makefile
index 923e56a..59e42bd 100644
--- a/internal/generated/Makefile
+++ b/internal/generated/Makefile
@@ -8,4 +8,4 @@ types:
.PHONY: tracepoints
tracepoints:
- cat ../c/tracepoints/*.c | raku tracepoints.raku > tracepoints.go
+ cat ../c/tracepoints/*.c | raku tracepoints.raku > tracepoints/tracepoints.go
diff --git a/internal/generated/tracepoints.raku b/internal/generated/tracepoints.raku
index e517a9f..7435888 100644
--- a/internal/generated/tracepoints.raku
+++ b/internal/generated/tracepoints.raku
@@ -8,9 +8,9 @@ my @tracepoints = gather for $*IN.slurp.split("\n") {
say qq:to/END/;
// This file was generated - don't change manually!
-package generated
+package tracepoints
-var TracepointList = []string\{
+var List = []string\{
\t{@tracepoints.map({ "\"$_\"," }).join("\n\t") }
\}
END
diff --git a/internal/generated/tracepoints.go b/internal/generated/tracepoints/tracepoints.go
index f4f891a..e324e26 100644
--- a/internal/generated/tracepoints.go
+++ b/internal/generated/tracepoints/tracepoints.go
@@ -1,7 +1,7 @@
// This file was generated - don't change manually!
-package generated
+package tracepoints
-var TracepointList = []string{
+var List = []string{
"enter_close",
"exit_close",
"enter_openat",
diff --git a/internal/ioriotng.go b/internal/ioriotng.go
index 69d9614..564ddc1 100644
--- a/internal/ioriotng.go
+++ b/internal/ioriotng.go
@@ -7,13 +7,13 @@ import (
"ioriotng/internal/debugfs"
"ioriotng/internal/flags"
- "ioriotng/internal/generated"
+ "ioriotng/internal/generated/tracepoints"
bpf "github.com/aquasecurity/libbpfgo"
)
func attachTracepoints(bpfModule *bpf.Module) error {
- for _, name := range generated.TracepointList {
+ for _, name := range tracepoints.List {
prog, err := bpfModule.GetProgram(fmt.Sprintf("handle_%s", name))
if err != nil {
return fmt.Errorf("Failed to get BPF program handle_%s: %v", name, err)
diff --git a/internal/types/types.go b/internal/types/types.go
index 37d46a9..5cd1d55 100644
--- a/internal/types/types.go
+++ b/internal/types/types.go
@@ -79,10 +79,9 @@ type OpenatEnterEvent struct {
}
func (ev OpenatEnterEvent) String() string {
- filename := string(ev.Filename[:])
comm := string(ev.Comm[:])
- return fmt.Sprintf("%s Filename:%s Comm:%s", ev.NullEvent.String(), filename, comm)
+ return fmt.Sprintf("%s Filename:%s Comm:%s", ev.NullEvent.String(), string(ev.Filename[:]), comm)
}
type FlagValues struct {