refactor: unify blocking accept

siyul-park · Dec 25, 2024 · 2cf0587 · 2cf0587
1 parent f788b49
commit 2cf0587
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/pkg/port/inport.go b/pkg/port/inport.go
@@ -120,7 +120,7 @@ func (p *InPort) Open(proc *process.Process) *packet.Reader {
 	}))
 
 	openHooks.Open(proc)
-	listeners.Accept(proc)
+	go listeners.Accept(proc)
 
 	return reader
 }

diff --git a/pkg/port/listener.go b/pkg/port/listener.go
@@ -1,6 +1,9 @@
 package port
 
-import "github.com/siyul-park/uniflow/pkg/process"
+import (
+	"github.com/siyul-park/uniflow/pkg/process"
+	"sync"
+)
 
 // Listener is an interface for handling process events.
 type Listener interface {
@@ -24,10 +27,16 @@ func ListenFunc(accept func(proc *process.Process)) Listener {
 }
 
 func (l Listeners) Accept(proc *process.Process) {
+	wg := sync.WaitGroup{}
 	for _, listener := range l {
 		listener := listener
-		go listener.Accept(proc)
+		wg.Add(1)
+		go func() {
+			defer wg.Done()
+			listener.Accept(proc)
+		}()
 	}
+	wg.Wait()
 }
 
 func (l *listener) Accept(proc *process.Process) {

diff --git a/pkg/port/outport.go b/pkg/port/outport.go
@@ -147,7 +147,7 @@ func (p *OutPort) Open(proc *process.Process) *packet.Writer {
 	p.mu.Unlock()
 
 	openHooks.Open(proc)
-	listeners.Accept(proc)
+	go listeners.Accept(proc)
 
 	proc.AddExitHook(process.ExitFunc(func(_ error) {
 		p.mu.Lock()