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

Issue #5108 - improve scalability of WebSocket SessionTrackers #5109

Merged
merged 2 commits into from
Aug 4, 2020
Merged

Issue #5108 - improve scalability of WebSocket SessionTrackers #5109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d37501d
Issue #5108 - use HashSet for SessionTrackers to improve scalability
lachlan-roberts Aug 3, 2020
85c4fc5
Issue #5108 - use set based on ConcurrentHashMap and remove synchroni…
lachlan-roberts Aug 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 7 additions & 5 deletions ...ocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/JsrSessionTracker.java
View file
Open in desktop
Expand Up @@ -19,19 +19,21 @@
package org.eclipse.jetty.websocket.jsr356;

import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
import java.util.concurrent.CopyOnWriteArraySet;
import java.util.concurrent.ConcurrentHashMap;
import javax.websocket.Session;

import org.eclipse.jetty.util.component.AbstractLifeCycle;
import org.eclipse.jetty.util.component.LifeCycle;

public class JsrSessionTracker extends AbstractLifeCycle implements JsrSessionListener
{
private CopyOnWriteArraySet<JsrSession> sessions = new CopyOnWriteArraySet<>();
private final Set<JsrSession> sessions = Collections.newSetFromMap(new ConcurrentHashMap<>());

public Set<javax.websocket.Session> getSessions()
public Set<Session> getSessions()
{
return Collections.unmodifiableSet(sessions);
return Collections.unmodifiableSet(new HashSet<>(sessions));
}

@Override
Expand All @@ -49,7 +51,7 @@ public void onSessionClosed(JsrSession session)
@Override
protected void doStop() throws Exception
{
for (JsrSession session : sessions)
for (Session session : sessions)
lachlan-roberts marked this conversation as resolved.
Show resolved Hide resolved
{
LifeCycle.stop(session);
}
Expand Down
7 changes: 4 additions & 3 deletions ...ket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/SessionTracker.java
View file
Open in desktop
Expand Up @@ -20,20 +20,21 @@

import java.io.IOException;
import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
import java.util.concurrent.CopyOnWriteArraySet;
import java.util.concurrent.ConcurrentHashMap;

import org.eclipse.jetty.util.component.AbstractLifeCycle;
import org.eclipse.jetty.util.component.Dumpable;
import org.eclipse.jetty.util.component.LifeCycle;

public class SessionTracker extends AbstractLifeCycle implements WebSocketSessionListener, Dumpable
{
private CopyOnWriteArraySet<WebSocketSession> sessions = new CopyOnWriteArraySet<>();
private final Set<WebSocketSession> sessions = Collections.newSetFromMap(new ConcurrentHashMap<>());

public Set<WebSocketSession> getSessions()
{
return Collections.unmodifiableSet(sessions);
return Collections.unmodifiableSet(new HashSet<>(sessions));
}

@Override
Expand Down