JackDoan 5 месяцев назад
Родитель
Сommit
cf51b6dfd7

+ 1 - 3
overlay/batch/passthrough.go

@@ -48,9 +48,7 @@ func (p *Passthrough) Flush() error {
 			firstErr = err
 		}
 	}
-	for i := range p.slots {
-		p.slots[i] = nil
-	}
+	clear(p.slots)
 	p.slots = p.slots[:0]
 	p.backing = p.backing[:0]
 	return firstErr

+ 3 - 9
overlay/batch/tcp_coalesce.go

@@ -266,13 +266,9 @@ func (c *TCPCoalescer) Flush() error {
 		}
 		c.release(s)
 	}
-	for i := range c.slots {
-		c.slots[i] = nil
-	}
+	clear(c.slots)
 	c.slots = c.slots[:0]
-	for k := range c.openSlots {
-		delete(c.openSlots, k)
-	}
+	clear(c.openSlots)
 	c.lastSlot = nil
 
 	c.backing = c.backing[:0]
@@ -383,9 +379,7 @@ func (c *TCPCoalescer) take() *coalesceSlot {
 func (c *TCPCoalescer) release(s *coalesceSlot) {
 	s.passthrough = false
 	s.rawPkt = nil
-	for i := range s.payIovs {
-		s.payIovs[i] = nil
-	}
+	clear(s.payIovs)
 	s.payIovs = s.payIovs[:0]
 	s.numSeg = 0
 	s.totalPay = 0

+ 1 - 3
overlay/batch/tx_batch.go

@@ -55,9 +55,7 @@ func (b *SendBatch) Flush() error {
 	if len(b.bufs) > 0 {
 		err = b.out.WriteBatch(b.bufs, b.dsts, b.ecns)
 	}
-	for i := range b.bufs {
-		b.bufs[i] = nil
-	}
+	clear(b.bufs)
 	b.bufs = b.bufs[:0]
 	b.dsts = b.dsts[:0]
 	b.ecns = b.ecns[:0]

+ 3 - 9
overlay/batch/udp_coalesce.go

@@ -180,13 +180,9 @@ func (c *UDPCoalescer) Flush() error {
 		}
 		c.release(s)
 	}
-	for i := range c.slots {
-		c.slots[i] = nil
-	}
+	clear(c.slots)
 	c.slots = c.slots[:0]
-	for k := range c.openSlots {
-		delete(c.openSlots, k)
-	}
+	clear(c.openSlots)
 	c.backing = c.backing[:0]
 	return first
 }
@@ -270,9 +266,7 @@ func (c *UDPCoalescer) take() *udpSlot {
 func (c *UDPCoalescer) release(s *udpSlot) {
 	s.passthrough = false
 	s.rawPkt = nil
-	for i := range s.payIovs {
-		s.payIovs[i] = nil
-	}
+	clear(s.payIovs)
 	s.payIovs = s.payIovs[:0]
 	s.numSeg = 0
 	s.totalPay = 0