From e1213c1c0e52348fffb47015237b88237a377081 Mon Sep 17 00:00:00 2001
From: Paul Buetow <paul@buetow.org>
Date: Wed, 21 Feb 2024 00:44:37 +0200
Subject: move generated tracepoints to separate directory

---
 internal/generated/Makefile                   |  2 +-
 internal/generated/tracepoints.go             | 14 --------------
 internal/generated/tracepoints.raku           |  4 ++--
 internal/generated/tracepoints/tracepoints.go | 14 ++++++++++++++
 internal/ioriotng.go                          |  4 ++--
 internal/types/types.go                       |  3 +--
 6 files changed, 20 insertions(+), 21 deletions(-)
 delete mode 100644 internal/generated/tracepoints.go
 create mode 100644 internal/generated/tracepoints/tracepoints.go

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.go b/internal/generated/tracepoints.go
deleted file mode 100644
index f4f891a..0000000
--- a/internal/generated/tracepoints.go
+++ /dev/null
@@ -1,14 +0,0 @@
-// This file was generated - don't change manually!
-package generated
-
-var TracepointList = []string{
-	"enter_close",
-	"exit_close",
-	"enter_openat",
-	"exit_openat",
-	"enter_open",
-	"exit_open",
-	"enter_write",
-	"exit_write",
-}
-
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/tracepoints.go b/internal/generated/tracepoints/tracepoints.go
new file mode 100644
index 0000000..e324e26
--- /dev/null
+++ b/internal/generated/tracepoints/tracepoints.go
@@ -0,0 +1,14 @@
+// This file was generated - don't change manually!
+package tracepoints
+
+var List = []string{
+	"enter_close",
+	"exit_close",
+	"enter_openat",
+	"exit_openat",
+	"enter_open",
+	"exit_open",
+	"enter_write",
+	"exit_write",
+}
+
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 {
-- 
cgit v1.2.3