This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new 16c1d38a7e Further cleanup of Stream references to aid GC
16c1d38a7e is described below
commit 16c1d38a7e15d03dd74c4f745e870ddf4328386b
Author: Mark Thomas <[email protected]>
AuthorDate: Fri Jan 10 13:39:53 2025 +0000
Further cleanup of Stream references to aid GC
---
java/org/apache/coyote/NonPipeliningProcessor.java | 26 ++++++++++++++++++++++
java/org/apache/coyote/Request.java | 9 ++++++++
java/org/apache/coyote/Response.java | 9 ++++++++
java/org/apache/coyote/http2/StreamProcessor.java | 3 ++-
4 files changed, 46 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/coyote/NonPipeliningProcessor.java
b/java/org/apache/coyote/NonPipeliningProcessor.java
new file mode 100644
index 0000000000..75a6da0830
--- /dev/null
+++ b/java/org/apache/coyote/NonPipeliningProcessor.java
@@ -0,0 +1,26 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.coyote;
+
+/**
+ * Marker interface used to indicate that the {@link Processor} does not
implement pipe-lining of requests (e.g.
+ * HTTP/1.1 supports pipe-lining whereas HTTP/2 does not) which may enable
some components to clear references sooner
+ * to aid GC.
+ */
+public interface NonPipeliningProcessor extends Processor {
+
+}
diff --git a/java/org/apache/coyote/Request.java
b/java/org/apache/coyote/Request.java
index e2251f3926..ea1a3ecb77 100644
--- a/java/org/apache/coyote/Request.java
+++ b/java/org/apache/coyote/Request.java
@@ -829,6 +829,15 @@ public final class Request {
startTimeNanos = -1;
threadId = 0;
+
+ if (hook instanceof NonPipeliningProcessor) {
+ /*
+ * No requirement to maintain state between requests so clear the
hook (a.k.a. Processor) and the input
+ * buffer to aid GC.
+ */
+ setHook(null);
+ setInputBuffer(null);
+ }
}
// -------------------- Info --------------------
diff --git a/java/org/apache/coyote/Response.java
b/java/org/apache/coyote/Response.java
index 2f06fe440c..de0e5628c9 100644
--- a/java/org/apache/coyote/Response.java
+++ b/java/org/apache/coyote/Response.java
@@ -659,6 +659,15 @@ public final class Response {
// update counters
contentWritten = 0;
+
+ if (hook instanceof NonPipeliningProcessor) {
+ /*
+ * No requirement to maintain state between requests so clear the
hook (a.k.a. Processor) and the output
+ * buffer to aid GC.
+ */
+ setHook(null);
+ setOutputBuffer(null);
+ }
}
/**
diff --git a/java/org/apache/coyote/http2/StreamProcessor.java
b/java/org/apache/coyote/http2/StreamProcessor.java
index caa3debea3..55b913e63a 100644
--- a/java/org/apache/coyote/http2/StreamProcessor.java
+++ b/java/org/apache/coyote/http2/StreamProcessor.java
@@ -35,6 +35,7 @@ import org.apache.coyote.ActionCode;
import org.apache.coyote.Adapter;
import org.apache.coyote.ContinueResponseTiming;
import org.apache.coyote.ErrorState;
+import org.apache.coyote.NonPipeliningProcessor;
import org.apache.coyote.Request;
import org.apache.coyote.RequestGroupInfo;
import org.apache.coyote.Response;
@@ -52,7 +53,7 @@ import org.apache.tomcat.util.net.SocketEvent;
import org.apache.tomcat.util.net.SocketWrapperBase;
import org.apache.tomcat.util.res.StringManager;
-class StreamProcessor extends AbstractProcessor {
+class StreamProcessor extends AbstractProcessor implements
NonPipeliningProcessor {
private static final Log log = LogFactory.getLog(StreamProcessor.class);
private static final StringManager sm =
StringManager.getManager(StreamProcessor.class);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
