Author: fhanik Date: Thu May 17 08:43:49 2007 New Revision: 538977 URL: http://svn.apache.org/viewvc?view=rev&rev=538977 Log: minor optimizations
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/io/ChannelData.java tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/test/TribesTestSuite.java tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/test/transport/SocketSend.java Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/io/ChannelData.java URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/io/ChannelData.java?view=diff&rev=538977&r1=538976&r2=538977 ============================================================================== --- tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/io/ChannelData.java (original) +++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/io/ChannelData.java Thu May 17 08:43:49 2007 @@ -229,11 +229,13 @@ offset += 4; //uniqueId length System.arraycopy(xbuf.getBytesDirect(),offset,data.uniqueId,0,data.uniqueId.length); offset += data.uniqueId.length; //uniqueId data - byte[] addr = new byte[XByteBuffer.toInt(xbuf.getBytesDirect(),offset)]; + //byte[] addr = new byte[XByteBuffer.toInt(xbuf.getBytesDirect(),offset)]; + int addrlen = XByteBuffer.toInt(xbuf.getBytesDirect(),offset); offset += 4; //addr length - System.arraycopy(xbuf.getBytesDirect(),offset,addr,0,addr.length); - data.setAddress(MemberImpl.getMember(addr)); - offset += addr.length; //addr data + //System.arraycopy(xbuf.getBytesDirect(),offset,addr,0,addr.length); + data.setAddress(MemberImpl.getMember(xbuf.getBytesDirect(),offset,addrlen)); + //offset += addr.length; //addr data + offset += addrlen; int xsize = XByteBuffer.toInt(xbuf.getBytesDirect(),offset); offset += 4; //xsize length System.arraycopy(xbuf.getBytesDirect(),offset,xbuf.getBytesDirect(),0,xsize); Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java?view=diff&rev=538977&r1=538976&r2=538977 ============================================================================== --- tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java (original) +++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java Thu May 17 08:43:49 2007 @@ -398,6 +398,10 @@ return getMember(data,new MemberImpl()); } + public static MemberImpl getMember(byte[] data, int offset, int length) { + return getMember(data,offset,length,new MemberImpl()); + } + /** * Return the name of this object * @return a unique name to the cluster Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java?view=diff&rev=538977&r1=538976&r2=538977 ============================================================================== --- tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java (original) +++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java Thu May 17 08:43:49 2007 @@ -175,13 +175,14 @@ try { key.channel().close(); } catch (IOException e) { if (log.isDebugEnabled()) log.debug("", e); } } - + protected long lastCheck = System.currentTimeMillis(); protected void socketTimeouts() { + long now = System.currentTimeMillis(); + if ( (now-lastCheck) < getSelectorTimeout() ) return; //timeout Selector tmpsel = selector; Set keys = (isListening()&&tmpsel!=null)?tmpsel.keys():null; if ( keys == null ) return; - long now = System.currentTimeMillis(); for (Iterator iter = keys.iterator(); iter.hasNext(); ) { SelectionKey key = (SelectionKey) iter.next(); try { @@ -215,6 +216,7 @@ cancelledKey(key); } } + lastCheck = System.currentTimeMillis(); } Modified: tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/test/TribesTestSuite.java URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/test/TribesTestSuite.java?view=diff&rev=538977&r1=538976&r2=538977 ============================================================================== --- tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/test/TribesTestSuite.java (original) +++ tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/test/TribesTestSuite.java Thu May 17 08:43:49 2007 @@ -35,6 +35,7 @@ suite.addTestSuite(org.apache.catalina.tribes.test.membership.TestMemberArrival.class); suite.addTestSuite(org.apache.catalina.tribes.test.membership.TestTcpFailureDetector.class); suite.addTestSuite(org.apache.catalina.tribes.test.channel.TestDataIntegrity.class); + suite.addTestSuite(org.apache.catalina.tribes.test.interceptors.TestOrderInterceptor.class); return suite; } } Modified: tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/test/transport/SocketSend.java URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/test/transport/SocketSend.java?view=diff&rev=538977&r1=538976&r2=538977 ============================================================================== --- tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/test/transport/SocketSend.java (original) +++ tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/test/transport/SocketSend.java Thu May 17 08:43:49 2007 @@ -50,7 +50,7 @@ boolean first = true; int count = 0; DecimalFormat df = new DecimalFormat("##.00"); - while ( count<100000 ) { + while ( count<1000000 ) { if ( first ) { first = false; start = System.currentTimeMillis();} out.write(buf,0,buf.length); mb += ( (double) buf.length) / 1024 / 1024; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]