From 66f919609ac78eee13b71eb65ba84ed8af06fb33 Mon Sep 17 00:00:00 2001
From: Kir Kolyshkin <kolyshkin@gmail.com>
Date: Wed, 9 Oct 2024 11:00:48 -0700
Subject: [PATCH] libct: add/use configs.HasHook

This allows to omit a call to c.currentOCIState (which can be somewhat
costly when there are many annotations) when the hooks of a given kind
won't be run.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
---
 libcontainer/configs/config.go  | 13 +++++++++++++
 libcontainer/container_linux.go |  2 +-
 libcontainer/criu_linux.go      |  2 +-
 libcontainer/process_linux.go   |  2 +-
 4 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/libcontainer/configs/config.go b/libcontainer/configs/config.go
index 22fe0f9b4c1..0c7a0128c74 100644
--- a/libcontainer/configs/config.go
+++ b/libcontainer/configs/config.go
@@ -332,6 +332,19 @@ const (
 	Poststop HookName = "poststop"
 )
 
+// HasHook checks if config has any hooks with any given names configured.
+func (c *Config) HasHook(names ...HookName) bool {
+	if c.Hooks == nil {
+		return false
+	}
+	for _, h := range names {
+		if len(c.Hooks[h]) > 0 {
+			return true
+		}
+	}
+	return false
+}
+
 // KnownHookNames returns the known hook names.
 // Used by `runc features`.
 func KnownHookNames() []string {
diff --git a/libcontainer/container_linux.go b/libcontainer/container_linux.go
index c02116177ad..5e1887afce7 100644
--- a/libcontainer/container_linux.go
+++ b/libcontainer/container_linux.go
@@ -350,7 +350,7 @@ func (c *Container) start(process *Process) (retErr error) {
 
 	if process.Init {
 		c.fifo.Close()
-		if c.config.Hooks != nil {
+		if c.config.HasHook(configs.Poststart) {
 			s, err := c.currentOCIState()
 			if err != nil {
 				return err
diff --git a/libcontainer/criu_linux.go b/libcontainer/criu_linux.go
index fed34e79148..cfc5823d15a 100644
--- a/libcontainer/criu_linux.go
+++ b/libcontainer/criu_linux.go
@@ -1110,7 +1110,7 @@ func (c *Container) criuNotifications(resp *criurpc.CriuResp, process *Process,
 			return err
 		}
 	case "setup-namespaces":
-		if c.config.Hooks != nil {
+		if c.config.HasHook(configs.Prestart, configs.CreateRuntime) {
 			s, err := c.currentOCIState()
 			if err != nil {
 				return nil
diff --git a/libcontainer/process_linux.go b/libcontainer/process_linux.go
index fcbb54a3e41..9b34258dd5f 100644
--- a/libcontainer/process_linux.go
+++ b/libcontainer/process_linux.go
@@ -750,7 +750,7 @@ func (p *initProcess) start() (retErr error) {
 					return fmt.Errorf("error setting Intel RDT config for procHooks process: %w", err)
 				}
 			}
-			if len(p.config.Config.Hooks) != 0 {
+			if p.config.Config.HasHook(configs.Prestart, configs.CreateRuntime) {
 				s, err := p.container.currentOCIState()
 				if err != nil {
 					return err