fix data input and output signal

transport/internet/kcp/connection.go

@@ -174,8 +174,8 @@ type Connection struct {
 	rd           time.Time
 	wd           time.Time // write deadline
 	since        int64
-	dataInputCond  *sync.Cond
+	dataInput    chan bool
-	dataOutputCond *sync.Cond
+	dataOutput   chan bool
 	Config       *Config
 
 	conv             uint16
@@ -207,8 +207,8 @@ func NewConnection(conv uint16, sysConn SystemConnection, recycler internal.Conn
 		conn:         sysConn,
 		connRecycler: recycler,
 		since:        nowMillisec(),
-		dataInputCond:  sync.NewCond(new(sync.Mutex)),
+		dataInput:    make(chan bool, 1),
-		dataOutputCond: sync.NewCond(new(sync.Mutex)),
+		dataOutput:   make(chan bool, 1),
 		Config:       config,
 		output:       NewSegmentWriter(sysConn, config.GetMtu().GetValue()-uint32(sysConn.Overhead())),
 		mss:          config.GetMtu().GetValue() - uint32(sysConn.Overhead()) - DataSegmentOverhead,
@@ -247,6 +247,20 @@ func (v *Connection) Elapsed() uint32 {
 	return uint32(nowMillisec() - v.since)
 }
 
+func (v *Connection) OnDataInput() {
+	select {
+	case v.dataInput <- true:
+	default:
+	}
+}
+
+func (v *Connection) OnDataOutput() {
+	select {
+	case v.dataOutput <- true:
+	default:
+	}
+}
+
 // Read implements the Conn Read method.
 func (v *Connection) Read(b []byte) (int, error) {
 	if v == nil {
@@ -266,24 +280,22 @@ func (v *Connection) Read(b []byte) (int, error) {
 			return 0, io.EOF
 		}
 
-		var timer *time.Timer
+		duration := time.Duration(time.Minute)
 		if !v.rd.IsZero() {
-			duration := v.rd.Sub(time.Now())
+			duration = v.rd.Sub(time.Now())
-			if duration <= 0 {
+			if duration < 0 {
 				return 0, ErrIOTimeout
 			}
-			timer = time.AfterFunc(duration, v.dataInputCond.Signal)
-		}
-		v.dataInputCond.L.Lock()
-		v.dataInputCond.Wait()
-		v.dataInputCond.L.Unlock()
-		if timer != nil {
-			timer.Stop()
 		}
+
+		select {
+		case <-v.dataInput:
+		case <-time.After(duration):
 			if !v.rd.IsZero() && v.rd.Before(time.Now()) {
 				return 0, ErrIOTimeout
 			}
 		}
+	}
 }
 
 // Write implements the Conn Write method.
@@ -304,26 +316,22 @@ func (v *Connection) Write(b []byte) (int, error) {
 			}
 		}
 
-		var timer *time.Timer
+		duration := time.Duration(time.Minute)
-		if !v.wd.IsZero() {
+		if !v.rd.IsZero() {
-			duration := v.wd.Sub(time.Now())
+			duration = v.wd.Sub(time.Now())
-			if duration <= 0 {
+			if duration < 0 {
 				return totalWritten, ErrIOTimeout
 			}
-			timer = time.AfterFunc(duration, v.dataOutputCond.Signal)
-		}
-		v.dataOutputCond.L.Lock()
-		v.dataOutputCond.Wait()
-		v.dataOutputCond.L.Unlock()
-
-		if timer != nil {
-			timer.Stop()
 		}
 
+		select {
+		case <-v.dataOutput:
+		case <-time.After(duration):
 			if !v.wd.IsZero() && v.wd.Before(time.Now()) {
 				return totalWritten, ErrIOTimeout
 			}
 		}
+	}
 }
 
 func (v *Connection) SetState(state State) {
@@ -360,8 +368,8 @@ func (v *Connection) Close() error {
 		return ErrClosedConnection
 	}
 
-	v.dataInputCond.Broadcast()
+	v.OnDataInput()
-	v.dataOutputCond.Broadcast()
+	v.OnDataOutput()
 
 	state := v.State()
 	if state.Is(StateReadyToClose, StateTerminating, StateTerminated) {
@@ -447,8 +455,9 @@ func (v *Connection) Terminate() {
 	log.Info("KCP|Connection: Terminating connection to ", v.RemoteAddr())
 
 	//v.SetState(StateTerminated)
-	v.dataInputCond.Broadcast()
+	v.OnDataInput()
-	v.dataOutputCond.Broadcast()
+	v.OnDataOutput()
+
 	if v.Config.ConnectionReuse.IsEnabled() && v.reusable {
 		v.connRecycler.Put(v.conn.Id(), v.conn)
 	} else {
@@ -481,19 +490,21 @@ func (v *Connection) Input(segments []Segment) {
 
 	for _, seg := range segments {
 		if seg.Conversation() != v.conv {
-			return
+			break
 		}
 
 		switch seg := seg.(type) {
 		case *DataSegment:
 			v.HandleOption(seg.Option)
 			v.receivingWorker.ProcessSegment(seg)
-			v.dataInputCond.Signal()
+			if seg.Number == v.receivingWorker.nextNumber {
+				v.OnDataInput()
+			}
 			v.dataUpdater.WakeUp()
 		case *AckSegment:
 			v.HandleOption(seg.Option)
 			v.sendingWorker.ProcessSegment(current, seg, v.roundTrip.Timeout())
-			v.dataOutputCond.Signal()
+			v.OnDataOutput()
 			v.dataUpdater.WakeUp()
 		case *CmdOnlySegment:
 			v.HandleOption(seg.Option)