improve performance by removing unnecessary flushes

robaho · robaho · commit 86440d068bab · 2025-01-03T09:58:00.000-06:00
diff --git a/src/main/java/robaho/net/httpserver/ChunkedOutputStream.java b/src/main/java/robaho/net/httpserver/ChunkedOutputStream.java
@@ -132,7 +132,9 @@ public void close() throws IOException {
         if (closed) {
             return;
         }
-        flush();
+        if (count > 0) {
+            writeChunk();
+        }
         try {
             /* write an empty chunk */
             writeChunk();
diff --git a/src/main/java/robaho/net/httpserver/ExchangeImpl.java b/src/main/java/robaho/net/httpserver/ExchangeImpl.java
@@ -239,6 +239,8 @@ public void sendResponseHeaders(int rCode, long contentLen)
             getConnection().getSocket().setOption(StandardSocketOptions.SO_SNDBUF, bufferSize);
         }
 
+        boolean flush = false;
+
         /* check for response type that is not allowed to send a body */
         if (rCode == 101) {
             logger.log(Level.DEBUG, () -> "switching protocols");
@@ -249,6 +251,7 @@ public void sendResponseHeaders(int rCode, long contentLen)
                 logger.log(Level.WARNING, msg);
             }
             contentLen = 0;
+            flush = true;
 
         } else if ((rCode >= 100 && rCode < 200) /* informational */
                 || (rCode == 204) /* no content */
@@ -280,6 +283,7 @@ public void sendResponseHeaders(int rCode, long contentLen)
                 if (websocket || isConnectRequest()) {
                     o.setWrappedStream(ros);
                     close = true;
+                    flush = true;
                 }
                 else if (http10) {
                     o.setWrappedStream(new UndefLengthOutputStream(this, ros));
@@ -323,7 +327,7 @@ else if (http10) {
         if(logger.isLoggable(Level.TRACE)) {
             logger.log(Level.TRACE, "Sent headers: noContentToSend=" + noContentToSend);
         }
-        if(contentLen==0) {
+        if(flush) {
             ros.flush();
         }   
         if (noContentToSend) {

Original file line number	Diff line number	Diff line change
`@@ -239,6 +239,8 @@ public void sendResponseHeaders(int rCode, long contentLen)`
`239`	`239`	`getConnection().getSocket().setOption(StandardSocketOptions.SO_SNDBUF, bufferSize);`
`240`	`240`	`}`
`241`	`241`
	`242`	`+ boolean flush = false;`
	`243`	`+`
`242`	`244`	`/* check for response type that is not allowed to send a body */`
`243`	`245`	`if (rCode == 101) {`
`244`	`246`	`logger.log(Level.DEBUG, () -> "switching protocols");`
`@@ -249,6 +251,7 @@ public void sendResponseHeaders(int rCode, long contentLen)`
`249`	`251`	`logger.log(Level.WARNING, msg);`
`250`	`252`	`}`
`251`	`253`	`contentLen = 0;`
	`254`	`+ flush = true;`
`252`	`255`
`253`	`256`	`} else if ((rCode >= 100 && rCode < 200) /* informational */`
`254`	`257`	`\|\| (rCode == 204) /* no content */`
`@@ -280,6 +283,7 @@ public void sendResponseHeaders(int rCode, long contentLen)`
`280`	`283`	`if (websocket \|\| isConnectRequest()) {`
`281`	`284`	`o.setWrappedStream(ros);`
`282`	`285`	`close = true;`
	`286`	`+ flush = true;`
`283`	`287`	`}`
`284`	`288`	`else if (http10) {`
`285`	`289`	`o.setWrappedStream(new UndefLengthOutputStream(this, ros));`
`@@ -323,7 +327,7 @@ else if (http10) {`
`323`	`327`	`if(logger.isLoggable(Level.TRACE)) {`
`324`	`328`	`logger.log(Level.TRACE, "Sent headers: noContentToSend=" + noContentToSend);`
`325`	`329`	`}`
`326`		`- if(contentLen==0) {`
	`330`	`+ if(flush) {`
`327`	`331`	`ros.flush();`
`328`	`332`	`}`
`329`	`333`	`if (noContentToSend) {`