sigonasr2/jmonkeyengine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Modified the default server implementation to enforce my

Browse Source 
own threading rules... it's sort of heavy-handed but
given the separation of the reliable and unreliable
implementations (and the inability to really know how
they are threading from here) this is the safest way and
doesn't seem to really affect throughput.


git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@7047 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
This commit is contained in:
PSp..om 2011-03-19 21:37:02 +00:00
parent b1e52b865a
commit 4091a01c91
1 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
engine/src/networking/com/jme3/network/base/DefaultServer.java
View File

@ -80,14 +80,15 @@ public class DefaultServer implements Server
public DefaultServer( String gameName, int version, Kernel reliable, Kernel fast )
{
if( reliable == null )
throw new IllegalArgumentException( "Default server reqiures a reliable kernel instance." );
this.gameName = gameName;
this.version = version;
this.reliable = reliable;
this.fast = fast;
if( reliable != null ) {
reliableAdapter = new KernelAdapter( this, reliable, dispatcher );
}
reliableAdapter = new KernelAdapter( this, reliable, dispatcher );
if( fast != null ) {
fastAdapter = new KernelAdapter( this, fast, dispatcher );
}
@ -109,17 +110,13 @@ public class DefaultServer implements Server
throw new IllegalStateException( "Server is already started." );
// Initialize the kernels
if( reliable != null ) {
reliable.initialize();
}
reliable.initialize();
if( fast != null ) {
fast.initialize();
}
// Start em up
if( reliableAdapter != null ) {
reliableAdapter.start();
}
reliableAdapter.start();
if( fastAdapter != null ) {
fastAdapter.start();
}
@ -142,11 +139,9 @@ public class DefaultServer implements Server
if( fastAdapter != null ) {
fastAdapter.close();
}
if( reliableAdapter != null ) {
reliableAdapter.close();
reliableAdapter.close();
isRunning = false;
}
} catch( InterruptedException e ) {
throw new RuntimeException( "Interrupted while closing", e );
}
@ -165,8 +160,6 @@ public class DefaultServer implements Server
// Ignore the filter for the moment
if( message.isReliable() || fast == null ) {
if( reliable == null )
throw new RuntimeException( "No reliable kernel configured" );
reliable.broadcast( adapter, buffer, true );
} else {
fast.broadcast( adapter, buffer, false );
@ -215,7 +208,17 @@ public class DefaultServer implements Server
protected void dispatch( HostedConnection source, Message m )
{
messageListeners.messageReceived( source, m );
if( source == null ) {
messageListeners.messageReceived( source, m );
} else {
// A semi-heavy handed way to make sure the listener
// doesn't get called at the same time from two different
// threads for the same hosted connection.
synchronized( source ) {
messageListeners.messageReceived( source, m );
}
}
}
protected void fireConnectionAdded( HostedConnection conn )