Merge pull request #28 from TopN/master

optimize clear ignore status
v2pro · Dec 20, 2018 · 2d18a73 · 2d18a73
2 parents a868dd9 + bf78fa8
commit 2d18a73
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/replaying/replaying_match.go b/replaying/replaying_match.go
@@ -83,8 +83,8 @@ func (replayingSession *ReplayingSession) chunkMatch(
 	}
 	countlog.Trace("event!replaying.talks_scored",
 		"ctx", ctx,
-		"lastMaxScoreIndex", replayingSession.lastMaxScoreIndex,
-		"lastMatchedIndex", lastMatchedIndex,
+		"replayingSession.lastMaxScoreIndex", replayingSession.lastMaxScoreIndex,
+		"connLastMatchedIndex", lastMatchedIndex,
 		"maxScoreIndex", maxScoreIndex,
 		"maxScore", maxScore,
 		"totalScore", len(chunks),

diff --git a/replaying/replaying_similarity_match.go b/replaying/replaying_similarity_match.go
@@ -57,8 +57,8 @@ func (replayingSession *ReplayingSession) similarityMatch(
 
 	countlog.Trace("event!replaying.similarity_talks_scored",
 		"ctx", ctx,
-		"lastMaxScoreIndex", replayingSession.lastMaxScoreIndex,
-		"lastMatchedIndex", connLastMatchedIndex,
+		"replaySession.lastMaxScoreIndex", replayingSession.lastMaxScoreIndex,
+		"connLastMatchedIndex", connLastMatchedIndex,
 		"maxScoreIndex", maxScoreIndex,
 		"maxScore", maxScore,
 		"scores", func() interface{} {
@@ -100,9 +100,9 @@ func strSlice2Map(str []string) map[string]float64 {
 
 func getFixStartIndex(connLastMatchedIndex int, lastMaxScoreIndex int) int {
 	if connLastMatchedIndex != -1 {
-		return connLastMatchedIndex
+		return connLastMatchedIndex + 1
 	} else if lastMaxScoreIndex != -1 {
-		return lastMaxScoreIndex
+		return lastMaxScoreIndex + 1
 	}
 	return -1
 }
diff --git a/sut/thread.go b/sut/thread.go
@@ -202,10 +202,6 @@ func (thread *Thread) OnAccept(serverSocketFD SocketFD, clientSocketFD SocketFD,
 		addr:     addr,
 	}
 	setGlobalSock(clientSocketFD, thread.socks[clientSocketFD])
-
-	// multiple consecutive requests, each request need clear thread.ignoreSocks
-	// because clientFD maybe reuse, check fd is in ignoreSockFD and addr is same
-	// if not same and delete
 	thread.delReusedIgnoreFD(clientSocketFD, addr)
 	countlog.Debug("event!sut.accept",
 		"threadID", thread.threadID,
@@ -221,6 +217,7 @@ func (thread *Thread) OnAcceptUnix(serverSocketFD SocketFD, clientSocketFD Socke
 		unixAddr: addr,
 	}
 	setGlobalSock(clientSocketFD, thread.socks[clientSocketFD])
+	thread.delReusedIgnoreFD(clientSocketFD, net.TCPAddr{})
 	countlog.Debug("event!sut.accept_unix",
 		"threadID", thread.threadID,
 		"serverSocketFD", serverSocketFD,
@@ -267,6 +264,7 @@ func (thread *Thread) OnConnect(socketFD SocketFD, remoteAddr net.TCPAddr) {
 		}
 		thread.socks[socketFD].localAddr = localAddr
 		replaying.StoreTmp(*localAddr, thread.replayingSession)
+		thread.delReusedIgnoreFD(socketFD, *localAddr)
 	}
 	countlog.Trace("event!sut.connect",
 		"threadID", thread.threadID,
@@ -291,6 +289,7 @@ func (thread *Thread) OnConnectUnix(socketFD SocketFD, remoteAddr net.UnixAddr)
 		}
 		thread.socks[socketFD].localAddr = localAddr
 		replaying.StoreTmp(*localAddr, thread.replayingSession)
+		thread.delReusedIgnoreFD(socketFD, *localAddr)
 	}
 	countlog.Trace("event!sut.connect",
 		"threadID", thread.threadID,
@@ -440,6 +439,9 @@ func (thread *Thread) IgnoreSocketFD(socketFD SocketFD, remoteAddr net.TCPAddr)
 }
 
 // in case of fd reused
+// multiple consecutive requests, each request need clear thread.ignoreSocks
+// because clientFD maybe reuse, check fd is in ignoreSockFD and addr is same
+// if not same and delete
 func (thread *Thread) delReusedIgnoreFD(socketFD SocketFD, newAddr net.TCPAddr) {
 	if val, ok := thread.ignoreSocks[socketFD]; ok {
 		if val.String() != newAddr.String() {