From 292176c57fff197b108a28ef40a0f07914e58664 Mon Sep 17 00:00:00 2001 From: Darien Raymond Date: Sat, 19 Nov 2016 00:34:30 +0100 Subject: [PATCH] simplify udp payload queue --- transport/internet/udp/hub.go | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/transport/internet/udp/hub.go b/transport/internet/udp/hub.go index 6eea8668a..4291851ca 100644 --- a/transport/internet/udp/hub.go +++ b/transport/internet/udp/hub.go @@ -23,13 +23,11 @@ type UDPPayloadHandler func(*alloc.Buffer, *proxy.SessionInfo) type UDPPayloadQueue struct { queue []chan UDPPayload callback UDPPayloadHandler - cancel *signal.CancelSignal } func NewUDPPayloadQueue(option ListenOption) *UDPPayloadQueue { queue := &UDPPayloadQueue{ callback: option.Callback, - cancel: signal.NewCloseSignal(), queue: make([]chan UDPPayload, option.Concurrency), } for i := range queue.queue { @@ -56,24 +54,15 @@ func (this *UDPPayloadQueue) Enqueue(payload UDPPayload) { } func (this *UDPPayloadQueue) Dequeue(queue <-chan UDPPayload) { - this.cancel.WaitThread() - defer this.cancel.FinishThread() - - for !this.cancel.Cancelled() { - payload, open := <-queue - if !open { - return - } + for payload := range queue { this.callback(payload.payload, payload.session) } } func (this *UDPPayloadQueue) Close() { - this.cancel.Cancel() for _, queue := range this.queue { close(queue) } - this.cancel.WaitForDone() } type ListenOption struct {