Menu
▾
▴
[Azureus-commitlog] azureus2/com/aelitis/azureus/core/networkmanager NetworkManager.java,1.21,1.22 VirtualChannelSelector.java,1.46,1.47 TCPTransport.java,1.31,1.32 ByteBucket.java,1.15,NONE RateControlledWriteEntity.java,1.3,NONE BurstingSinglePeerUploader.java,1.14,NONE ReadController.java,1.7,NONE PacketFillingMultiPeerUploader.java,1.21,NONE ProxyLoginHandler.java,1.6,NONE RateHandler.java,1.1,NONE ConnectDisconnectManager.java,1.34,NONE SelectorGuard.java,1.25,NONE IncomingSocketChannelManager.java,1.8,NONE WriteController.java,1.19,NONE
Update of /cvsroot/azureus/azureus2/com/aelitis/azureus/core/networkmanager In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22682/com/aelitis/azureus/core/networkmanager Modified Files: NetworkManager.java VirtualChannelSelector.java TCPTransport.java Removed Files: ByteBucket.java RateControlledWriteEntity.java BurstingSinglePeerUploader.java ReadController.java PacketFillingMultiPeerUploader.java ProxyLoginHandler.java RateHandler.java ConnectDisconnectManager.java SelectorGuard.java IncomingSocketChannelManager.java WriteController.java Log Message: More network code refactoring. Index: NetworkManager.java =================================================================== RCS file: /cvsroot/azureus/azureus2/com/aelitis/azureus/core/networkmanager/NetworkManager.java,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- NetworkManager.java 19 Apr 2005 11:41:20 -0000 1.21 +++ NetworkManager.java 20 Apr 2005 08:02:57 -0000 1.22 @@ -154,21 +154,22 @@ public void closeSocketChannel( SocketChannel channel ) { connect_disconnect_manager.closeConnection( channel ); } - + /** - * Get the socket write controller. - * @return controller + * Get the virtual selector used for socket channel read readiness. + * @return read readiness selector */ - public WriteController getWriteController() { return write_controller; } + public VirtualChannelSelector getReadSelector() { return read_controller.getReadSelector(); } /** - * Get the socket read controller. - * @return controller + * Get the virtual selector used for socket channel write readiness. + * @return write readiness selector */ - public ReadController getReadController() { return read_controller; } + public VirtualChannelSelector getWriteSelector() { return write_controller.getWriteSelector(); } + /** @@ -195,6 +196,11 @@ public static int getTcpMssSize() { return tcp_mss_size; } + /** + * Get port that the TCP server socket is listening for incoming connections on. + * @return port number + */ + public int getTCPListeningPortNumber() { return incoming_socketchannel_manager.getTCPListeningPortNumber(); } --- ProxyLoginHandler.java DELETED --- --- IncomingSocketChannelManager.java DELETED --- --- PacketFillingMultiPeerUploader.java DELETED --- --- ConnectDisconnectManager.java DELETED --- --- RateControlledWriteEntity.java DELETED --- --- ReadController.java DELETED --- --- SelectorGuard.java DELETED --- Index: TCPTransport.java =================================================================== RCS file: /cvsroot/azureus/azureus2/com/aelitis/azureus/core/networkmanager/TCPTransport.java,v retrieving revision 1.31 retrieving revision 1.32 diff -u -d -r1.31 -r1.32 --- TCPTransport.java 14 Apr 2005 21:11:12 -0000 1.31 +++ TCPTransport.java 20 Apr 2005 08:02:59 -0000 1.32 @@ -31,6 +31,9 @@ import org.gudy.azureus2.core3.logging.LGLogger; import org.gudy.azureus2.core3.util.Debug; +import com.aelitis.azureus.core.networkmanager.impl.ConnectDisconnectManager; +import com.aelitis.azureus.core.networkmanager.impl.ProxyLoginHandler; + /** @@ -122,7 +125,7 @@ * i.e. will a write request result in >0 bytes written. * @return true if the transport is write ready, false if not yet ready */ - protected boolean isReadyForWrite() { return is_ready_for_write; } + public boolean isReadyForWrite() { return is_ready_for_write; } /** @@ -213,7 +216,7 @@ private void requestWriteSelect() { is_ready_for_write = false; - NetworkManager.getSingleton().getWriteController().getWriteSelector().resumeSelects( socket_channel ); + NetworkManager.getSingleton().getWriteSelector().resumeSelects( socket_channel ); } @@ -226,7 +229,7 @@ read_listener = listener; if( socket_channel != null ) { - NetworkManager.getSingleton().getReadController().getReadSelector().resumeSelects( socket_channel ); + NetworkManager.getSingleton().getReadSelector().resumeSelects( socket_channel ); } if( data_already_read != null && data_already_read.hasRemaining() ) { @@ -240,7 +243,7 @@ */ public void stopReadSelects() { if( socket_channel != null ){ - NetworkManager.getSingleton().getReadController().getReadSelector().pauseSelects( socket_channel ); + NetworkManager.getSingleton().getReadSelector().pauseSelects( socket_channel ); } } @@ -253,7 +256,7 @@ } //read selection - NetworkManager.getSingleton().getReadController().getReadSelector().register( socket_channel, new VirtualChannelSelector.VirtualSelectorListener() { + NetworkManager.getSingleton().getReadSelector().register( socket_channel, new VirtualChannelSelector.VirtualSelectorListener() { public boolean selectSuccess( VirtualChannelSelector selector, SocketChannel sc,Object attachment ) { read_listener.readyToRead(); return true; @@ -265,11 +268,11 @@ } }, null ); - NetworkManager.getSingleton().getReadController().getReadSelector().pauseSelects( socket_channel ); + NetworkManager.getSingleton().getReadSelector().pauseSelects( socket_channel ); //write selection - NetworkManager.getSingleton().getWriteController().getWriteSelector().register( socket_channel, new VirtualChannelSelector.VirtualSelectorListener() { + NetworkManager.getSingleton().getWriteSelector().register( socket_channel, new VirtualChannelSelector.VirtualSelectorListener() { public boolean selectSuccess( VirtualChannelSelector selector, SocketChannel sc,Object attachment ) { is_ready_for_write = true; return true; @@ -537,8 +540,8 @@ is_ready_for_write = false; if( socket_channel != null ){ - NetworkManager.getSingleton().getReadController().getReadSelector().cancel( socket_channel ); - NetworkManager.getSingleton().getWriteController().getWriteSelector().cancel( socket_channel ); + NetworkManager.getSingleton().getReadSelector().cancel( socket_channel ); + NetworkManager.getSingleton().getWriteSelector().cancel( socket_channel ); NetworkManager.getSingleton().getConnectDisconnectManager().closeConnection( socket_channel ); socket_channel = null; } --- ByteBucket.java DELETED --- --- WriteController.java DELETED --- Index: VirtualChannelSelector.java =================================================================== RCS file: /cvsroot/azureus/azureus2/com/aelitis/azureus/core/networkmanager/VirtualChannelSelector.java,v retrieving revision 1.46 retrieving revision 1.47 diff -u -d -r1.46 -r1.47 --- VirtualChannelSelector.java 14 Apr 2005 20:15:49 -0000 1.46 +++ VirtualChannelSelector.java 20 Apr 2005 08:02:58 -0000 1.47 @@ -28,6 +28,8 @@ import org.gudy.azureus2.core3.logging.LGLogger; import org.gudy.azureus2.core3.util.*; +import com.aelitis.azureus.core.networkmanager.impl.SelectorGuard; + /** * Provides a simplified and safe (selectable-channel) socket single-op selector. --- RateHandler.java DELETED --- --- BurstingSinglePeerUploader.java DELETED --- |
