Skip to content

Possibility to override worker thread allocation logic in WebSocketServer #279 #280

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

Closed
ghost wants to merge 2 commits into from
Closed

Possibility to override worker thread allocation logic in WebSocketServer #279 #280

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
726c530
Possibility to override worker thread allocation logic in WebSocketSe…
Sep 11, 2014
97f6bfd
Possibility to listen to client connection errors only
Sep 11, 2014
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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ build
*.svn
*~
target
.idea
*.ipr
*.iml
*.iws
Expand Down
11 changes: 4 additions & 7 deletions src/main/java/org/java_websocket/server/WebSocketServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ public abstract class WebSocketServer extends WebSocketAdapter implements Runnab

private volatile AtomicBoolean isclosed = new AtomicBoolean( false );

private List<WebSocketWorker> decoders;
protected List<WebSocketWorker> decoders;

private List<WebSocketImpl> iqueue;
private BlockingQueue<ByteBuffer> buffers;
Expand Down Expand Up @@ -184,7 +184,7 @@ public WebSocketServer( InetSocketAddress address , int decodercount , List<Draf
public void start() {
if( selectorthread != null )
throw new IllegalStateException( getClass().getName() + " can only be started once." );
new Thread( this ).start();;
new Thread( this ).start();
}

/**
Expand Down Expand Up @@ -219,9 +219,6 @@ public void stop( int timeout ) throws InterruptedException {

synchronized ( this ) {
if( selectorthread != null ) {
if( Thread.currentThread() != selectorthread ) {

}
if( selectorthread != Thread.currentThread() ) {
if( socketsToClose.size() > 0 )
selectorthread.join( timeout );// isclosed will tell the selectorthread to go down after the last connection was closed
Expand Down Expand Up @@ -422,7 +419,7 @@ public ByteBuffer createBuffer() {
return ByteBuffer.allocate( WebSocketImpl.RCVBUF );
}

private void queue( WebSocketImpl ws ) throws InterruptedException {
protected void queue( WebSocketImpl ws ) throws InterruptedException {
if( ws.workerThread == null ) {
ws.workerThread = decoders.get( queueinvokes % decoders.size() );
queueinvokes++;
Expand Down Expand Up @@ -568,7 +565,7 @@ protected boolean addConnection( WebSocket ws ) {
* may be null if the error does not belong to a single connection
*/
@Override
public final void onWebsocketError( WebSocket conn, Exception ex ) {
public void onWebsocketError( WebSocket conn, Exception ex ) {
onError( conn, ex );
}

Expand Down