Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes #12289 - Improve ConcurrentPool concurrency. #12290

Merged
merged 3 commits into from
Sep 20, 2024
Merged

Fixes #12289 - Improve ConcurrentPool concurrency. #12290

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
136e62a
Fixes #12289 - Improve ConcurrentPool concurrency.
sbordet Sep 18, 2024
8bddf52
Fixed other occurrences of manual iteration over CopyOnWriteArrayList…
sbordet Sep 19, 2024
4d3e952
Updates from review.
sbordet Sep 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -653,11 +653,11 @@ protected void exitScope(Request request, Context lastContext, ClassLoader lastL
*/
protected void notifyExitScope(Request request)
{
for (int i = _contextListeners.size(); i-- > 0; )
for (ContextScopeListener listener : reverse(_contextListeners))
{
try
{
_contextListeners.get(i).exitScope(_context, request);
listener.exitScope(_context, request);
}
catch (Throwable e)
{
Expand All @@ -666,6 +666,13 @@ protected void notifyExitScope(Request request)
}
}

private static <T> List<T> reverse(List<T> list)
sbordet marked this conversation as resolved.
Show resolved Hide resolved
{
List<T> result = new ArrayList<>(list);
Collections.reverse(result);
return result;
}

/**
* @return false if this context is unavailable (sends 503)
*/
Expand Down
27 changes: 11 additions & 16 deletions jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/ConcurrentPool.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ public ConcurrentPool(StrategyType strategyType, int maxSize)
* @param cache whether a {@link ThreadLocal} cache should be used for the most recently released entry
* @deprecated cache is no longer supported. Use {@link StrategyType#THREAD_ID}
*/
@Deprecated
@Deprecated(since = "12.0.4", forRemoval = true)
public ConcurrentPool(StrategyType strategyType, int maxSize, boolean cache)
{
this(strategyType, maxSize, pooled -> 1);
Expand All @@ -103,7 +103,7 @@ public ConcurrentPool(StrategyType strategyType, int maxSize, boolean cache)
* @param maxMultiplex a function that given the pooled object returns the max multiplex count
* @deprecated cache is no longer supported. Use {@link StrategyType#THREAD_ID}
*/
@Deprecated
@Deprecated(since = "12.0.4", forRemoval = true)
public ConcurrentPool(StrategyType strategyType, int maxSize, boolean cache, ToIntFunction<P> maxMultiplex)
{
this(strategyType, maxSize, maxMultiplex);
Expand Down Expand Up @@ -148,7 +148,7 @@ private void leaked(Holder<P> holder)
{
leaked.increment();
if (LOG.isDebugEnabled())
LOG.debug("Leaked " + holder);
LOG.debug("Leaked {}", holder);
leaked();
}

Expand Down Expand Up @@ -195,15 +195,14 @@ public Entry<P> reserve()

void sweep()
{
for (int i = 0; i < entries.size(); i++)
// Remove entries atomically with respect to remove(Entry).
entries.removeIf(holder ->
{
Holder<P> holder = entries.get(i);
if (holder.getEntry() == null)
{
entries.remove(i--);
boolean remove = holder.getEntry() == null;
if (remove)
leaked(holder);
}
}
return remove;
});
}

@Override
Expand Down Expand Up @@ -285,8 +284,7 @@ private boolean remove(Entry<P> entry)
if (!removed)
return false;

// No need to lock, no race with reserve()
// and the race with terminate() is harmless.
// In a harmless race with reserve()/sweep()/terminate().
Holder<P> holder = ((ConcurrentEntry<P>)entry).getHolder();
boolean evicted = entries.remove(holder);
if (LOG.isDebugEnabled())
Expand All @@ -313,10 +311,7 @@ public Collection<Entry<P>> terminate()
// Field this.terminated must be modified with the lock held
// because the list of entries is modified, see reserve().
terminated = true;
copy = entries.stream()
.map(Holder::getEntry)
.filter(Objects::nonNull)
.toList();
copy = stream().toList();
entries.clear();
}

Expand Down
22 changes: 14 additions & 8 deletions ...etty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/ServletContextHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -518,8 +518,7 @@ public void contextDestroyed() throws Exception
//Call context listeners
Throwable multiException = null;
ServletContextEvent event = new ServletContextEvent(getServletContext());
Collections.reverse(_destroyServletContextListeners);
for (ServletContextListener listener : _destroyServletContextListeners)
for (ServletContextListener listener : reverse(_destroyServletContextListeners))
{
try
{
Expand Down Expand Up @@ -574,17 +573,17 @@ protected void requestDestroyed(Request baseRequest, HttpServletRequest request)
if (!_servletRequestListeners.isEmpty())
{
final ServletRequestEvent sre = new ServletRequestEvent(getServletContext(), request);
for (int i = _servletRequestListeners.size(); i-- > 0; )
for (ServletRequestListener listener : reverse(_servletRequestListeners))
{
_servletRequestListeners.get(i).requestDestroyed(sre);
listener.requestDestroyed(sre);
}
}

if (!_servletRequestAttributeListeners.isEmpty())
{
for (int i = _servletRequestAttributeListeners.size(); i-- > 0; )
for (ServletRequestAttributeListener listener : reverse(_servletRequestAttributeListeners))
{
scopedRequest.removeEventListener(_servletRequestAttributeListeners.get(i));
scopedRequest.removeEventListener(listener);
}
}
}
Expand Down Expand Up @@ -1223,11 +1222,11 @@ protected void notifyExitScope(Request request)
ServletContextRequest scopedRequest = Request.as(request, ServletContextRequest.class);
if (!_contextListeners.isEmpty())
{
for (int i = _contextListeners.size(); i-- > 0; )
for (ServletContextScopeListener listener : reverse(_contextListeners))
{
try
{
_contextListeners.get(i).exitScope(getContext(), scopedRequest);
listener.exitScope(getContext(), scopedRequest);
}
catch (Throwable e)
{
Expand All @@ -1239,6 +1238,13 @@ protected void notifyExitScope(Request request)
super.notifyExitScope(request);
}

private static <T> List<T> reverse(List<T> list)
{
List<T> result = new ArrayList<>(list);
Collections.reverse(result);
return result;
}

/**
* Get the defaultSecurityHandlerClass.
*
Expand Down
12 changes: 10 additions & 2 deletions ...-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/SessionHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@

package org.eclipse.jetty.ee10.servlet;

import java.util.ArrayList;
import java.util.Collections;
import java.util.EnumSet;
import java.util.Enumeration;
Expand Down Expand Up @@ -569,13 +570,20 @@ public void onSessionDestroyed(Session session)
getSessionContext().run(() ->
{
HttpSessionEvent event = new HttpSessionEvent(session.getApi());
for (int i = _sessionListeners.size() - 1; i >= 0; i--)
for (HttpSessionListener listener : reverse(_sessionListeners))
{
_sessionListeners.get(i).sessionDestroyed(event);
listener.sessionDestroyed(event);
}
});
}

private static <T> List<T> reverse(List<T> list)
{
List<T> result = new ArrayList<>(list);
Collections.reverse(result);
return result;
}

@Override
public void onSessionIdChanged(Session session, String oldId)
{
Expand Down
19 changes: 13 additions & 6 deletions jetty-ee9/jetty-ee9-nested/src/main/java/org/eclipse/jetty/ee9/nested/ContextHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1000,17 +1000,17 @@ protected void requestDestroyed(Request baseRequest, HttpServletRequest request)
if (!_servletRequestListeners.isEmpty())
{
final ServletRequestEvent sre = new ServletRequestEvent(_apiContext, request);
for (int i = _servletRequestListeners.size(); i-- > 0; )
for (ServletRequestListener listener : reverse(_servletRequestListeners))
{
_servletRequestListeners.get(i).requestDestroyed(sre);
listener.requestDestroyed(sre);
}
}

if (!_servletRequestAttributeListeners.isEmpty())
{
for (int i = _servletRequestAttributeListeners.size(); i-- > 0; )
for (ServletRequestAttributeListener listener : reverse(_servletRequestAttributeListeners))
{
baseRequest.removeEventListener(_servletRequestAttributeListeners.get(i));
baseRequest.removeEventListener(listener);
}
}
}
Expand Down Expand Up @@ -1070,11 +1070,11 @@ protected void exitScope(Request request)
{
if (!_contextListeners.isEmpty())
{
for (int i = _contextListeners.size(); i-- > 0; )
for (ContextScopeListener listener : reverse(_contextListeners))
{
try
{
_contextListeners.get(i).exitScope(_apiContext, request);
listener.exitScope(_apiContext, request);
}
catch (Throwable e)
{
Expand All @@ -1084,6 +1084,13 @@ protected void exitScope(Request request)
}
}

private static <T> List<T> reverse(List<T> list)
{
List<T> result = new ArrayList<>(list);
Collections.reverse(result);
return result;
}

/**
* Handle a runnable in the scope of this context and a particular request
*
Expand Down
12 changes: 10 additions & 2 deletions jetty-ee9/jetty-ee9-nested/src/main/java/org/eclipse/jetty/ee9/nested/SessionHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@

import java.io.IOException;
import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.Collections;
import java.util.EnumSet;
import java.util.Enumeration;
Expand Down Expand Up @@ -834,14 +835,21 @@ public void onSessionDestroyed(Session session)
Runnable r = () ->
{
HttpSessionEvent event = new HttpSessionEvent(session.getApi());
for (int i = _sessionListeners.size() - 1; i >= 0; i--)
for (HttpSessionListener listener : reverse(_sessionListeners))
{
_sessionListeners.get(i).sessionDestroyed(event);
listener.sessionDestroyed(event);
}
};
_contextHandler.getCoreContextHandler().getContext().run(r);
}

private static <T> List<T> reverse(List<T> list)
{
List<T> result = new ArrayList<>(list);
Collections.reverse(result);
return result;
}

@Override
public void onSessionIdChanged(Session session, String oldId)
{
Expand Down
Loading