(to squash) runtime/v2/runc: don't duplicate containerProcesses

laurazard · laurazard · commit c43966ced899 · 2023-06-08T20:40:12.000+01:00
Signed-off-by: Laura Brehm &lt;laurabrehm@hey.com&gt;
diff --git a/runtime/v2/runc/task/service.go b/runtime/v2/runc/task/service.go
@@ -78,7 +78,7 @@ func NewTaskService(ctx context.Context, publisher shim.Publisher, sd shutdown.S
 		ep:         ep,
 		shutdown:   sd,
 		containers: make(map[string]*runc.Container),
-		running:    make(map[int][]containerProcess),
+		running:    make(map[int]map[containerProcess]struct{}),
 		earlyExits: make(map[*map[int][]runcC.Exit]struct{}),
 	}
 	go s.processExits()
@@ -113,7 +113,7 @@ type service struct {
 	containers map[string]*runc.Container
 
 	lifecycleMu sync.Mutex
-	running     map[int][]containerProcess // pid -> running process, guarded by lifecycleMu
+	running     map[int]map[containerProcess]struct{} // pid -> running process, guarded by lifecycleMu
 	// Subscriptions to exits for PIDs not in s.running. Adding/deleting
 	// subscriptions and dereferencing the subscription pointers must only be
 	// done while holding lifecycleMu.
@@ -162,10 +162,13 @@ func (s *service) preStart() (handleStarted func(*runc.Container, process.Proces
 				s.handleProcessExit(ee, c, p)
 			}
 		} else {
-			s.running[pid] = append(s.running[pid], containerProcess{
+			if _, ok := s.running[pid]; !ok {
+				s.running[pid] = make(map[containerProcess]struct{})
+			}
+			s.running[pid][containerProcess{
 				Container: c,
 				Process:   p,
-			})
+			}] = struct{}{}
 			s.lifecycleMu.Unlock()
 		}
 	}
@@ -589,7 +592,7 @@ func (s *service) processExits() {
 		if cps, ok := s.running[e.Pid]; ok {
 			delete(s.running, e.Pid)
 			s.lifecycleMu.Unlock()
-			for _, cp := range cps {
+			for cp := range cps {
 				s.handleProcessExit(e, cp.Container, cp.Process)
 			}
 		} else {
