Merge pull request #1326 from myronkscott/fix_perf

Myron Scott · web-flow · commit 7a07053c1a13 · 2023-06-21T15:37:09.000-07:00
revert change resulting in performance degradation
diff --git a/common/src/main/java/com/tc/net/core/TCConnectionImpl.java b/common/src/main/java/com/tc/net/core/TCConnectionImpl.java
@@ -394,7 +394,6 @@ private boolean buildWriteContextsFromMessages(boolean failfast) {
         ArrayList<TCActionNetworkMessage> currentBatch = new ArrayList<>();    
         int batchSize = 0;
         int batchMsgCount = 0;
-        boolean batchMode = false;
         TCNetworkMessage element = this.writeMessages.poll();
 
         while (element != null) {
@@ -435,13 +434,7 @@ private boolean buildWriteContextsFromMessages(boolean failfast) {
             }
           }
 
-          try {
-            element = (batchMode) ? this.writeMessages.poll(20, TimeUnit.MICROSECONDS) : this.writeMessages.poll();
-            batchMode = true;
-          } catch (InterruptedException ie) {
-            Thread.currentThread().interrupt();
-            element = null;
-          }
+          element = this.writeMessages.poll();
         }
 
         if (MSG_GROUPING_ENABLED && batchMsgCount > 0) {

Original file line number	Diff line number	Diff line change
`@@ -394,7 +394,6 @@ private boolean buildWriteContextsFromMessages(boolean failfast) {`
`394`	`394`	`ArrayList<TCActionNetworkMessage> currentBatch = new ArrayList<>();`
`395`	`395`	`int batchSize = 0;`
`396`	`396`	`int batchMsgCount = 0;`
`397`		`- boolean batchMode = false;`
`398`	`397`	`TCNetworkMessage element = this.writeMessages.poll();`
`399`	`398`
`400`	`399`	`while (element != null) {`
`@@ -435,13 +434,7 @@ private boolean buildWriteContextsFromMessages(boolean failfast) {`
`435`	`434`	`}`
`436`	`435`	`}`
`437`	`436`
`438`		`- try {`
`439`		`- element = (batchMode) ? this.writeMessages.poll(20, TimeUnit.MICROSECONDS) : this.writeMessages.poll();`
`440`		`- batchMode = true;`
`441`		`- } catch (InterruptedException ie) {`
`442`		`- Thread.currentThread().interrupt();`
`443`		`- element = null;`
`444`		`- }`
	`437`	`+ element = this.writeMessages.poll();`
`445`	`438`	`}`
`446`	`439`
`447`	`440`	`if (MSG_GROUPING_ENABLED && batchMsgCount > 0) {`