Re: [VOTE] Apache Tomcat v5.5.16 Stability
[X] Stable (no major issues) [ ] Beta (at least one major issue: please provide details) [ ] Alpha (multiple significant issues: please provide details)
Re: [VOTE] Apache Tomcat v5.5.16 Stability
[X] Stable (no major issues)
PATCH: Out-of-box build apache-tomcat-5.5.1[56]-src fix
Dear Developers,
When following the build instructions at
http://tomcat.apache.org/tomcat-5.5-doc/building.html I needed to make a
couple of fixes to get it to build.
Please accept this patch to correct the build errors that occur when
following the instructions.
--- build.xml~ 2006-03-13 12:22:25.0 +
+++ build.xml 2006-03-13 12:22:25.0 +
@@ -26,7 +26,7 @@
property name=tomcat.projectvalue=build /
property name=catalina.project value=container /
property name=jtc.project value=connectors /
- property name=jasper.projectvalue=jasper /
+ property name=jasper.projectvalue=jasper/jasper2 /
property name=current.loc value=tomcat/current/tc5.5.x /
--- build/build.xml~2006-03-13 12:35:38.0 +
+++ build/build.xml 2006-03-13 12:35:38.0 +
@@ -29,7 +29,7 @@
property name=tomcat.projectvalue=build /
property name=catalina.project value=container /
property name=jtc.project value=connectors /
- property name=jasper.projectvalue=jasper /
+ property name=jasper.projectvalue=jasper/jasper2 /
property name=ant.jar value=${ant.home}/lib/ant.jar/
property name=ant-launcher.jar
value=${ant.home}/lib/ant-launcher.jar/
...
Thanks
--
Darryl L. Miles
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: Tomcat 5.0 test environment
Hi, Simple: run ant tester ;) Yoav On 3/13/06, Andre Kammerl [EMAIL PROTECTED] wrote: Hi, Is there somewhere an instruction available how to use the test cases that are included in the Tomcat source? Regards André -- Yoav Shapira Senior Architect Nimalex LLC 1 Mifflin Place, Suite 310 Cambridge, MA, USA [EMAIL PROTECTED] / www.yoavshapira.com - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r385607 - /tomcat/container/tc5.5.x/modules/groupcom/build.xml
Author: fhanik
Date: Mon Mar 13 10:01:17 2006
New Revision: 385607
URL: http://svn.apache.org/viewcvs?rev=385607view=rev
Log:
Fixed build script
Modified:
tomcat/container/tc5.5.x/modules/groupcom/build.xml
Modified: tomcat/container/tc5.5.x/modules/groupcom/build.xml
URL:
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/build.xml?rev=385607r1=385606r2=385607view=diff
==
--- tomcat/container/tc5.5.x/modules/groupcom/build.xml (original)
+++ tomcat/container/tc5.5.x/modules/groupcom/build.xml Mon Mar 13 10:01:17 2006
@@ -88,8 +88,6 @@
tofile=${catalina.build}/classes/org/apache/catalina/tribes/LocalStrings.properties/
copy
file=${basedir}/src/share/org/apache/catalina/tribes/tcp/LocalStrings.properties
tofile=${catalina.build}/classes/org/apache/catalina/tribes/tcp/LocalStrings.properties/
-copy
file=${basedir}/src/share/org/apache/catalina/tribes/tcp/DataSenders.properties
-
tofile=${catalina.build}/classes/org/apache/catalina/tribes/tcp/DataSenders.properties/
copy
file=${basedir}/src/share/org/apache/catalina/tribes/tcp/mbeans-descriptors.xml
tofile=${catalina.build}/classes/org/apache/catalina/tribes/tcp/mbeans-descriptors.xml/
copy
file=${basedir}/src/share/org/apache/catalina/tribes/mcast/LocalStrings.properties
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r385624 - in /tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp: ./ nio/
Author: fhanik
Date: Mon Mar 13 11:19:56 2006
New Revision: 385624
URL: http://svn.apache.org/viewcvs?rev=385624view=rev
Log:
Moved to the correct location
Added:
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/nio/NioReceiver.java
- copied, changed from r385621,
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/ReplicationListener.java
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/nio/ThreadPool.java
- copied, changed from r385622,
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/ThreadPool.java
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/nio/WorkerThread.java
- copied, changed from r385622,
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/WorkerThread.java
Removed:
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/ReplicationListener.java
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/ThreadPool.java
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/WorkerThread.java
Modified:
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/mbeans-descriptors.xml
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/nio/ParallelNioSender.java
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/nio/TcpReplicationThread.java
Modified:
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/mbeans-descriptors.xml
URL:
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/mbeans-descriptors.xml?rev=385624r1=385623r2=385624view=diff
==
---
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/mbeans-descriptors.xml
(original)
+++
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/mbeans-descriptors.xml
Mon Mar 13 11:19:56 2006
@@ -87,7 +87,7 @@
/mbean
mbean name=ClusterReceiverBase
- description=Tcp Cluster ReplicationListener implementation
+ description=Tcp Cluster NioReceiver implementation
domain=Catalina
group=Cluster
type=org.apache.catalina.cluster.tcp.ClusterReceiverBase
Copied:
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/nio/NioReceiver.java
(from r385621,
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/ReplicationListener.java)
URL:
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/nio/NioReceiver.java?p2=tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/nio/NioReceiver.javap1=tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/ReplicationListener.javar1=385621r2=385624rev=385624view=diff
==
---
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/ReplicationListener.java
(original)
+++
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/nio/NioReceiver.java
Mon Mar 13 11:19:56 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.catalina.tribes.tcp;
+package org.apache.catalina.tribes.tcp.nio;
import java.io.IOException;
import java.net.InetSocketAddress;
@@ -31,15 +31,14 @@
import org.apache.catalina.tribes.MessageListener;
import org.apache.catalina.tribes.io.ListenCallback;
import org.apache.catalina.tribes.io.ObjectReader;
-import org.apache.catalina.tribes.tcp.nio.TcpReplicationThread;
+import org.apache.catalina.tribes.tcp.Constants;
import org.apache.catalina.util.StringManager;
/**
* @author Filip Hanik
- * @author Peter Rossbach
* @version $Revision: 379904 $ $Date: 2006-02-22 15:16:25 -0600 (Wed, 22 Feb
2006) $
*/
-public class ReplicationListener implements Runnable, ChannelReceiver,
ListenCallback {
+public class NioReceiver implements Runnable, ChannelReceiver, ListenCallback {
/**
* @todo make this configurable
*/
@@ -49,7 +48,7 @@
*/
protected int txBufSize = 25188;
-protected static org.apache.commons.logging.Log log =
org.apache.commons.logging.LogFactory.getLog(ReplicationListener.class);
+protected static org.apache.commons.logging.Log log =
org.apache.commons.logging.LogFactory.getLog(NioReceiver.class);
/**
* The string manager for this package.
@@ -59,7 +58,7 @@
/**
* The descriptive information about this implementation.
*/
-private static final
svn commit: r385609 - /tomcat/build/tc5.5.x/build.xml
Author: markt
Date: Mon Mar 13 10:24:54 2006
New Revision: 385609
URL: http://svn.apache.org/viewcvs?rev=385609view=rev
Log:
Remove references to jasper2 from the src distro. I missed these when removing
the jasper2 references in previous commits.
Modified:
tomcat/build/tc5.5.x/build.xml
Modified: tomcat/build/tc5.5.x/build.xml
URL:
http://svn.apache.org/viewcvs/tomcat/build/tc5.5.x/build.xml?rev=385609r1=385608r2=385609view=diff
==
--- tomcat/build/tc5.5.x/build.xml (original)
+++ tomcat/build/tc5.5.x/build.xml Mon Mar 13 10:24:54 2006
@@ -1377,7 +1377,6 @@
mkdir dir=${tomcat.dist}/src/${catalina.project}/
mkdir dir=${tomcat.dist}/src/${jtc.project}/
mkdir dir=${tomcat.dist}/src/${jasper.project}/
-mkdir dir=${tomcat.dist}/src/${jasper.project}/jasper2/
!-- Main build file --
copy todir=${tomcat.dist}/src
@@ -1419,7 +1418,7 @@
/copy
!-- tomcat jasper source --
-copy todir=${tomcat.dist}/src/${jasper.project}/jasper2
+copy todir=${tomcat.dist}/src/${jasper.project}
fileset dir=${jasper.home}
exclude name=**/build/**/
exclude name=**/dist/**/
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 37819] - Build from source archive fails because of incorrect jasper.home property in build/build.xml
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=37819. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=37819 [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Additional Comments From [EMAIL PROTECTED] 2006-03-13 18:27 --- Fixed. I removed the jasper2 directory from the source distro so it and svn should have the same structure now. -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r385620 - in /tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp: bio/MultiSocketSender.java mbeans-descriptors.xml
Author: fhanik
Date: Mon Mar 13 11:04:41 2006
New Revision: 385620
URL: http://svn.apache.org/viewcvs?rev=385620view=rev
Log:
Changed the name
Modified:
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/bio/MultiSocketSender.java
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/mbeans-descriptors.xml
Modified:
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/bio/MultiSocketSender.java
URL:
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/bio/MultiSocketSender.java?rev=385620r1=385619r2=385620view=diff
==
---
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/bio/MultiSocketSender.java
(original)
+++
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/bio/MultiSocketSender.java
Mon Mar 13 11:04:41 2006
@@ -180,7 +180,7 @@
}
public String toString() {
-StringBuffer buf = new StringBuffer(PooledSocketSender[);
+StringBuffer buf = new StringBuffer(MultiSocketSender[);
buf.append(getHost()).append(:).append(getPort()).append(]);
return buf.toString();
}
Modified:
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/mbeans-descriptors.xml
URL:
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/mbeans-descriptors.xml?rev=385620r1=385619r2=385620view=diff
==
---
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/mbeans-descriptors.xml
(original)
+++
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/mbeans-descriptors.xml
Mon Mar 13 11:04:41 2006
@@ -744,8 +744,8 @@
/mbean
- mbean name=PooledSocketSender
- description=Pooled Cluster Sender
+ mbean name=MultiSocketSender
+ description=Multi Socket Sender, more than one socket per member
domain=Catalina
group=IDataSender
type=org.apache.catalina.cluster.tcp.PooledSocketSender
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r385649 - in /tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp: ./ bio/ nio/
Author: fhanik
Date: Mon Mar 13 12:14:57 2006
New Revision: 385649
URL: http://svn.apache.org/viewcvs?rev=385649view=rev
Log:
Removed fast async socket sender, the async logic should not be on the socket
level. the same functionality can very easy be achieved through a interceptor
that uses the fast queue or a tipi on top of the channel.
The channel itself should only do one thing well, send messages, very fast and
guaranteed. if the socket is async, then the error message can never trickle up
to the sender, and the sender will never know that the message failed
Removed:
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/bio/FastAsyncSocketSender.java
Modified:
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/LocalStrings.properties
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/bio/SinglePointDataSender.java
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/mbeans-descriptors.xml
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/nio/TcpReplicationThread.java
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/nio/WorkerThread.java
Modified:
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/LocalStrings.properties
URL:
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/LocalStrings.properties?rev=385649r1=385648r2=385649view=diff
==
---
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/LocalStrings.properties
(original)
+++
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/LocalStrings.properties
Mon Mar 13 12:14:57 2006
@@ -3,9 +3,6 @@
AsyncSocketSender.send.error=Unable to asynchronously send session with
id=[{0}] - message will be ignored.
AsyncSocketSender.queue.empty=Queue in sender [{0}:{1,number,integer}]
returned null element!
cluster.mbean.register.already=MBean {0} already registered!
-FastAsyncSocketSender.setThreadPriority=[{0}:{1,number,integer}] set priority
to {2}
-FastAsyncSocketSender.min.exception=[{0}:{1,number,integer}] new priority {2}
MIN_PRIORITY
-FastAsyncSocketSender.max.exception=[{0}:{1,number,integer}] new priority {2}
MAX_PRIORITY
IDataSender.ack.eof=EOF reached at local port [{0}:{1,number,integer}]
IDataSender.ack.receive=Got ACK at local port [{0}:{1,number,integer}]
IDataSender.ack.missing=Unable to read acknowledgement from
[{0}:{1,number,integer}] in {2,number,integer} ms. Disconnecting socket, and
trying again.
Modified:
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/bio/SinglePointDataSender.java
URL:
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/bio/SinglePointDataSender.java?rev=385649r1=385648r2=385649view=diff
==
---
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/bio/SinglePointDataSender.java
(original)
+++
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/bio/SinglePointDataSender.java
Mon Mar 13 12:14:57 2006
@@ -77,7 +77,6 @@
* current sender socket
*/
private Socket socket = null;
-private OutputStream socketout = null;
/**
* is Socket really connected
@@ -474,7 +473,6 @@
socket.setSendBufferSize(getTxBufSize());
socket.setReceiveBufferSize(getRxBufSize());
socket.setSoTimeout((int)timeout);
-this.socketout = socket.getOutputStream();
}
/**
@@ -575,8 +573,8 @@
isMessageTransferStarted = true ;
}
try {
-socketout.write(XByteBuffer.createDataPackage((ClusterData)data));
-socketout.flush();
+
socket.getOutputStream().write(XByteBuffer.createDataPackage((ClusterData)data));
+socket.getOutputStream().flush();
if (getWaitForAck()) waitForAck();
} finally {
synchronized(this) {
Modified:
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/mbeans-descriptors.xml
URL:
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/mbeans-descriptors.xml?rev=385649r1=385648r2=385649view=diff
==
---
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/mbeans-descriptors.xml
(original)
+++
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/mbeans-descriptors.xml
Mon Mar 13 12:14:57 2006
@@ -533,217 +533,6 @@
svn commit: r385644 - in /tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/bio: FastAsyncSocketSender.java util/FastQueue.java util/SmartQueue.java
Author: fhanik
Date: Mon Mar 13 12:05:48 2006
New Revision: 385644
URL: http://svn.apache.org/viewcvs?rev=385644view=rev
Log:
Removed the smart queue, not used anywhere.
removed stats from the FastQueue, stats can be collected elsewhere.
The FastAsyncSocketSender will go away, as the fast queue can be used in an
interceptor that makes the replication asynchronous
Removed:
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/bio/util/SmartQueue.java
Modified:
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/bio/FastAsyncSocketSender.java
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/bio/util/FastQueue.java
Modified:
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/bio/FastAsyncSocketSender.java
URL:
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/bio/FastAsyncSocketSender.java?rev=385644r1=385643r2=385644view=diff
==
---
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/bio/FastAsyncSocketSender.java
(original)
+++
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/bio/FastAsyncSocketSender.java
Mon Mar 13 12:05:48 2006
@@ -51,8 +51,7 @@
private static int threadCounter = 1;
-private static org.apache.commons.logging.Log log =
org.apache.commons.logging.LogFactory
-.getLog(FastAsyncSocketSender.class);
+private static org.apache.commons.logging.Log log =
org.apache.commons.logging.LogFactory.getLog(FastAsyncSocketSender.class);
/**
* The descriptive information about this implementation.
@@ -157,31 +156,7 @@
public void setQueueCheckLock(boolean checkLock) {
queue.setCheckLock(checkLock);
}
-/**
- * @return Returns the doStats.
- */
-public boolean isQueueDoStats() {
-return queue.isDoStats();
-}
-/**
- * @param doStats The doStats to set.
- */
-public void setQueueDoStats(boolean doStats) {
-queue.setDoStats(doStats);
-}
-/**
- * @return Returns the timeWait.
- */
-public boolean isQueueTimeWait() {
-return queue.isTimeWait();
-}
-/**
- * @param timeWait The timeWait to set.
- */
-public void setQueueTimeWait(boolean timeWait) {
-queue.setTimeWait(timeWait);
-}
-
+
/**
* @return Returns the inQueueCounter.
*/
@@ -194,20 +169,6 @@
*/
public void setMaxQueueLength(int length) {
queue.setMaxQueueLength(length);
-}
-
-/**
- * @return Returns the add wait times.
- */
-public long getQueueAddWaitTime() {
-return queue.getAddWait();
-}
-
-/**
- * @return Returns the add wait times.
- */
-public long getQueueRemoveWaitTime() {
-return queue.getRemoveWait();
}
/**
Modified:
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/bio/util/FastQueue.java
URL:
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/bio/util/FastQueue.java?rev=385644r1=385643r2=385644view=diff
==
---
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/bio/util/FastQueue.java
(original)
+++
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/bio/util/FastQueue.java
Mon Mar 13 12:05:48 2006
@@ -29,8 +29,7 @@
*/
public class FastQueue implements IQueue {
-private static org.apache.commons.logging.Log log =
org.apache.commons.logging.LogFactory
-.getLog(FastQueue.class);
+private static org.apache.commons.logging.Log log =
org.apache.commons.logging.LogFactory.getLog(FastQueue.class);
/**
* This is the actual queue
@@ -62,11 +61,6 @@
*/
private boolean timeWait = false;
-/**
- * calc stats data
- */
-private boolean doStats = false;
-
private boolean inAdd = false;
private boolean inRemove = false;
@@ -95,50 +89,11 @@
private boolean enabled = true;
/**
- * calc all add objects
- */
-private long addCounter = 0;
-
-/**
- * calc all add objetcs in error state ( see limit queue length)
- */
-private long addErrorCounter = 0;
-
-/**
- * calc all remove objects
- */
-private long removeCounter = 0;
-
-/**
- * calc all remove objects failures (hupps probleme detection)
- */
-private long removeErrorCounter = 0;
-
-/**
- * Calc wait time thread
- */
-private long addWait = 0;
-
-/**
- * Calc remove time threads
- */
-private long removeWait = 0;
-
-/**
* max queue size
*/
svn commit: r385661 - in /tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp: ./ bio/ nio/
Author: fhanik
Date: Mon Mar 13 13:33:03 2006
New Revision: 385661
URL: http://svn.apache.org/viewcvs?rev=385661view=rev
Log:
Working on simplicity, removing all complex code, synchronization should be
simple, but ideally, there should be none, two threads should never try to
access the same socket
Added:
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/bio/BioSender.java
- copied, changed from r385654,
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/bio/SinglePointDataSender.java
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/bio/MultipointBioSender.java
Removed:
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/bio/SinglePointDataSender.java
Modified:
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/DataSender.java
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/PooledSender.java
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/ReplicationTransmitter.java
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/bio/MultiSocketSender.java
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/nio/ParallelNioSender.java
Modified:
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/DataSender.java
URL:
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/DataSender.java?rev=385661r1=385660r2=385661view=diff
==
---
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/DataSender.java
(original)
+++
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/DataSender.java
Mon Mar 13 13:33:03 2006
@@ -35,7 +35,7 @@
public boolean isConnected();
public void setRxBufSize(int size);
public void setTxBufSize(int size);
-public boolean checkKeepAlive();
+public boolean keepalive();
public void setTimeout(long timeout);
public void setWaitForAck(boolean isWaitForAck);
}
Modified:
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/PooledSender.java
URL:
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/PooledSender.java?rev=385661r1=385660r2=385661view=diff
==
---
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/PooledSender.java
(original)
+++
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/PooledSender.java
Mon Mar 13 13:33:03 2006
@@ -52,7 +52,7 @@
}
public void returnSender(DataSender sender) {
-sender.checkKeepAlive();
+sender.keepalive();
queue.returnSender(sender);
}
@@ -125,7 +125,7 @@
return poolSize;
}
-public boolean checkKeepAlive() {
+public boolean keepalive() {
//do nothing, the pool checks on every return
return false;
}
Modified:
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/ReplicationTransmitter.java
URL:
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/ReplicationTransmitter.java?rev=385661r1=385660r2=385661view=diff
==
---
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/ReplicationTransmitter.java
(original)
+++
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/ReplicationTransmitter.java
Mon Mar 13 13:33:03 2006
@@ -128,18 +128,8 @@
*/
public void heartbeat() {
-checkKeepAlive();
+
}
-
-/**
- * Check all DataSender Socket to close socket at keepAlive mode
- * @see DataSender#checkKeepAlive()
- */
-public void checkKeepAlive() {
-getTransport().checkKeepAlive();
-}
-
-
/**
* add new cluster member and create sender ( s. replicationMode) transfer
Copied:
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/bio/BioSender.java
(from r385654,
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/bio/SinglePointDataSender.java)
URL:
svn commit: r385662 - /tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/bio/BioSender.java
Author: fhanik
Date: Mon Mar 13 13:40:56 2006
New Revision: 385662
URL: http://svn.apache.org/viewcvs?rev=385662view=rev
Log:
Fixed socket connection logic, too many methods doing the same thing, also, no
timeout was set for connection timeout
Modified:
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/bio/BioSender.java
Modified:
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/bio/BioSender.java
URL:
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/bio/BioSender.java?rev=385662r1=385661r2=385662view=diff
==
---
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/bio/BioSender.java
(original)
+++
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/bio/BioSender.java
Mon Mar 13 13:40:56 2006
@@ -28,6 +28,7 @@
import org.apache.catalina.tribes.tcp.DataSender;
import org.apache.catalina.tribes.tcp.SenderState;
import org.apache.catalina.util.StringManager;
+import java.net.InetSocketAddress;
/**
* Send cluster messages with only one socket. Ack and keep Alive Handling is
@@ -73,7 +74,7 @@
/**
* is Socket really connected
*/
-private boolean isSocketConnected = false;
+private boolean connected = false;
/**
* sender is in suspect state (last transfer failed)
@@ -187,7 +188,7 @@
}
public boolean isConnected() {
-return isSocketConnected;
+return connected;
}
public boolean isSuspect() {
@@ -312,12 +313,12 @@
* @see IDataSender#disconnect()
*/
public synchronized void disconnect() {
-boolean connect = isConnected() ;
-closeSocket();
-if(connect) {
-if (log.isDebugEnabled())
-log.debug(sm.getString(IDataSender.disconnect,
address.getHostAddress(),new Integer(port),new Long(0)));
-}
+boolean connect = isConnected();
+closeSocket();
+if (connect) {
+if (log.isDebugEnabled())
+log.debug(sm.getString(IDataSender.disconnect,
address.getHostAddress(), new Integer(port), new Long(0)));
+}
}
@@ -370,16 +371,19 @@
* is socket open return directly
*/
protected synchronized void openSocket() throws IOException {
- if(isConnected())
- return ;
+ if(isConnected()) return ;
try {
-createSocket();
-if (getWaitForAck()) socket.setSoTimeout((int) timeout);
-isSocketConnected = true;
-this.keepAliveCount = 0;
-this.keepAliveConnectTime = System.currentTimeMillis();
-if (log.isDebugEnabled())
-log.debug(sm.getString(IDataSender.openSocket,
address.getHostAddress(), new Integer(port),new Long(0)));
+ socket = new Socket();
+ InetSocketAddress sockaddr = new InetSocketAddress(getAddress(),
getPort());
+ socket.connect(sockaddr,(int)timeout);
+ socket.setSendBufferSize(getTxBufSize());
+ socket.setReceiveBufferSize(getRxBufSize());
+ socket.setSoTimeout( (int) timeout);
+ connected = true;
+ this.keepAliveCount = 0;
+ this.keepAliveConnectTime = System.currentTimeMillis();
+ if (log.isDebugEnabled())
+ log.debug(sm.getString(IDataSender.openSocket,
address.getHostAddress(), new Integer(port), new Long(0)));
} catch (IOException ex1) {
getSenderState().setSuspect();
if (log.isDebugEnabled())
@@ -390,17 +394,6 @@
}
/**
- * @throws IOException
- * @throws SocketException
- */
-protected synchronized void createSocket() throws IOException,
SocketException {
-socket = new Socket(getAddress(), getPort());
-socket.setSendBufferSize(getTxBufSize());
-socket.setReceiveBufferSize(getRxBufSize());
-socket.setSoTimeout((int)timeout);
-}
-
-/**
* close socket
*
* @see DataSender#disconnect()
@@ -417,7 +410,7 @@
}
}
this.keepAliveCount = 0;
-isSocketConnected = false;
+connected = false;
if (log.isDebugEnabled())
log.debug(sm.getString(IDataSender.closeSocket,address.getHostAddress(), new
Integer(port),new Long(0)));
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r385664 - in /tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/bio: BioSender.java MultiSocketSender.java
Author: fhanik
Date: Mon Mar 13 13:45:27 2006
New Revision: 385664
URL: http://svn.apache.org/viewcvs?rev=385664view=rev
Log:
Removed all synchronization, it happens in the class above
Removed:
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/bio/MultiSocketSender.java
Modified:
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/bio/BioSender.java
Modified:
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/bio/BioSender.java
URL:
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/bio/BioSender.java?rev=385664r1=385663r2=385664view=diff
==
---
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/bio/BioSender.java
(original)
+++
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/bio/BioSender.java
Mon Mar 13 13:45:27 2006
@@ -298,7 +298,7 @@
* Connect other cluster member receiver
* @see org.apache.catalina.tribes.tcp.IDataSender#connect()
*/
-public synchronized void connect() throws ChannelException {
+public void connect() throws ChannelException {
try {
openSocket();
}catch ( Exception x ) {
@@ -312,7 +312,7 @@
*
* @see IDataSender#disconnect()
*/
-public synchronized void disconnect() {
+public void disconnect() {
boolean connect = isConnected();
closeSocket();
if (connect) {
@@ -330,7 +330,7 @@
* @return true, is socket close
* @see DataSender#closeSocket()
*/
-public synchronized boolean keepalive() {
+public boolean keepalive() {
boolean isCloseSocket = true ;
if(isConnected()) {
if ((keepAliveTimeout -1 (System.currentTimeMillis() -
keepAliveConnectTime) keepAliveTimeout)
@@ -349,7 +349,7 @@
* @see org.apache.catalina.tribes.tcp.IDataSender#sendMessage(,
* ChannelMessage)
*/
-public synchronized void sendMessage(byte[] data) throws IOException {
+public void sendMessage(byte[] data) throws IOException {
pushMessage(data);
}
@@ -370,7 +370,7 @@
* open real socket and set time out when waitForAck is enabled
* is socket open return directly
*/
-protected synchronized void openSocket() throws IOException {
+protected void openSocket() throws IOException {
if(isConnected()) return ;
try {
socket = new Socket();
@@ -399,7 +399,7 @@
* @see DataSender#disconnect()
* @see DataSender#closeSocket()
*/
-protected synchronized void closeSocket() {
+protected void closeSocket() {
if(isConnected()) {
if (socket != null) {
try {
@@ -434,7 +434,7 @@
* @since 5.5.10
*/
-protected synchronized void pushMessage(byte[] data, boolean reconnect)
throws IOException {
+protected void pushMessage(byte[] data, boolean reconnect) throws
IOException {
keepalive();
if ( reconnect ) closeSocket();
if (!isConnected()) openSocket();
@@ -442,7 +442,7 @@
writeData(data);
}
-protected synchronized void pushMessage( byte[] data) throws IOException {
+protected void pushMessage( byte[] data) throws IOException {
boolean messageTransfered = false ;
IOException exception = null;
try {
@@ -480,7 +480,7 @@
* @throws IOException
* @since 5.5.10
*/
-protected synchronized void writeData(byte[] data) throws IOException {
+protected void writeData(byte[] data) throws IOException {
socket.getOutputStream().write(data);
socket.getOutputStream().flush();
if (getWaitForAck()) waitForAck();
@@ -493,7 +493,7 @@
* @throws java.io.IOException
* @throws java.net.SocketTimeoutException
*/
-protected synchronized void waitForAck() throws java.io.IOException {
+protected void waitForAck() throws java.io.IOException {
try {
boolean ackReceived = false;
ackbuf.clear();
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r385682 - in /tomcat/container/tc5.5.x/modules/groupcom: etc/cluster-server.xml src/share/org/apache/catalina/tribes/tcp/bio/PooledMultiSender.java
Author: fhanik
Date: Mon Mar 13 14:27:30 2006
New Revision: 385682
URL: http://svn.apache.org/viewcvs?rev=385682view=rev
Log:
Added in a multi threaded blocking io sender
Added:
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/bio/PooledMultiSender.java
Modified:
tomcat/container/tc5.5.x/modules/groupcom/etc/cluster-server.xml
Modified: tomcat/container/tc5.5.x/modules/groupcom/etc/cluster-server.xml
URL:
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/etc/cluster-server.xml?rev=385682r1=385681r2=385682view=diff
==
--- tomcat/container/tc5.5.x/modules/groupcom/etc/cluster-server.xml (original)
+++ tomcat/container/tc5.5.x/modules/groupcom/etc/cluster-server.xml Mon Mar 13
14:27:30 2006
@@ -316,7 +316,7 @@
autoConnect=true
poolSize=25/
!--
-transport
className=org.apache.catalina.tribes.tcp.bio.MultipointBioSender
+transport
className=org.apache.catalina.tribes.tcp.bio.PooledMultiSender
maxRetryAttempts=2
timeout=15000
waitForAck=true
Added:
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/bio/PooledMultiSender.java
URL:
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/bio/PooledMultiSender.java?rev=385682view=auto
==
---
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/bio/PooledMultiSender.java
(added)
+++
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/bio/PooledMultiSender.java
Mon Mar 13 14:27:30 2006
@@ -0,0 +1,71 @@
+package org.apache.catalina.tribes.tcp.bio;
+
+import org.apache.catalina.tribes.tcp.DataSender;
+import org.apache.catalina.tribes.tcp.PooledSender;
+
+/**
+ * pTitle: /p
+ *
+ * pDescription: /p
+ *
+ * pCopyright: Copyright (c) 2005/p
+ *
+ * pCompany: /p
+ *
+ * @author not attributable
+ * @version 1.0
+ */
+public class PooledMultiSender extends PooledSender {
+
+protected long timeout = 15000;
+protected boolean waitForAck = false;
+protected int retryAttempts=0;
+protected int keepAliveCount = Integer.MAX_VALUE;
+protected boolean directBuf = false;
+protected int rxBufSize = 43800;
+protected int txBufSize = 25188;
+protected boolean suspect = false;
+private boolean autoConnect;
+
+
+public PooledMultiSender() {
+}
+
+/**
+ * getNewDataSender
+ *
+ * @return DataSender
+ * @todo Implement this org.apache.catalina.tribes.tcp.PooledSender
+ * method
+ */
+public DataSender getNewDataSender() {
+MultipointBioSender sender = new MultipointBioSender();
+sender.setAutoConnect(autoConnect);
+sender.setTimeout(timeout);
+sender.setWaitForAck(waitForAck);
+sender.setMaxRetryAttempts(retryAttempts);
+sender.setRxBufSize(rxBufSize);
+sender.setTxBufSize(txBufSize);
+return sender;
+}
+
+public void setAutoConnect(boolean autoConnect) {
+this.autoConnect = autoConnect;
+}
+
+public void setDirectBuf(boolean directBuf) {
+this.directBuf = directBuf;
+}
+
+public void setKeepAliveCount(int keepAliveCount) {
+this.keepAliveCount = keepAliveCount;
+}
+
+public void setRetryAttempts(int retryAttempts) {
+this.retryAttempts = retryAttempts;
+}
+
+public void setSuspect(boolean suspect) {
+this.suspect = suspect;
+}
+}
\ No newline at end of file
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r385728 - in /tomcat/container/tc5.5.x/modules/groupcom: src/share/org/apache/catalina/tribes/ src/share/org/apache/catalina/tribes/group/ src/share/org/apache/catalina/tribes/mcast/ src/s
Author: fhanik Date: Mon Mar 13 20:11:59 2006 New Revision: 385728 URL: http://svn.apache.org/viewcvs?rev=385728view=rev Log: Performance optimizations Modified: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/Channel.java tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/ChannelInterceptor.java tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/MembershipService.java tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/group/ChannelCoordinator.java tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/group/ChannelInterceptorBase.java tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/group/GroupChannel.java tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/mcast/McastService.java tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/AbstractPooledSender.java tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/PooledSender.java tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/ReplicationTransmitter.java tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/bio/BioSender.java tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/bio/PooledMultiSender.java tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/nio/NioSender.java tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/nio/ParallelNioSender.java tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/nio/PooledParallelSender.java tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java tomcat/container/tc5.5.x/modules/groupcom/test/org/apache/catalina/tribes/demos/MapDemo.java Modified: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/Channel.java URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/Channel.java?rev=385728r1=385727r2=385728view=diff == --- tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/Channel.java (original) +++ tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/Channel.java Mon Mar 13 20:11:59 2006 @@ -104,7 +104,7 @@ * * @return Member */ -public Member getLocalMember() ; +public Member getLocalMember(boolean incAlive) ; /** * Modified: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/ChannelInterceptor.java URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/ChannelInterceptor.java?rev=385728r1=385727r2=385728view=diff == --- tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/ChannelInterceptor.java (original) +++ tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/ChannelInterceptor.java Mon Mar 13 20:11:59 2006 @@ -60,7 +60,7 @@ * * @return Member */ -public Member getLocalMember() ; +public Member getLocalMember(boolean incAliveTime) ; /** * Modified: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/MembershipService.java URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/MembershipService.java?rev=385728r1=385727r2=385728view=diff == --- tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/MembershipService.java (original) +++ tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/MembershipService.java Mon Mar 13 20:11:59 2006 @@ -80,7 +80,7 @@ /** * Returns the member object that defines this member */ -public Member getLocalMember(); +public Member getLocalMember(boolean incAliveTime); /** * Return all members by name Modified: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/group/ChannelCoordinator.java URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/group/ChannelCoordinator.java?rev=385728r1=385727r2=385728view=diff == --- tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/group/ChannelCoordinator.java (original) +++
svn commit: r385729 - /tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/io/XByteBuffer.java
Author: fhanik Date: Mon Mar 13 20:17:54 2006 New Revision: 385729 URL: http://svn.apache.org/viewcvs?rev=385729view=rev Log: More optimizations Modified: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/io/XByteBuffer.java Modified: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/io/XByteBuffer.java URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/io/XByteBuffer.java?rev=385729r1=385728r2=385729view=diff == --- tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/io/XByteBuffer.java (original) +++ tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/io/XByteBuffer.java Mon Mar 13 20:17:54 2006 @@ -346,7 +346,8 @@ throw new ArrayIndexOutOfBoundsException(Unable to create data package, buffer is too small.); } System.arraycopy(START_DATA, 0, buffer, bufoff, START_DATA.length); -System.arraycopy(toBytes(data.length), 0, buffer, bufoff+START_DATA.length, 4); +//System.arraycopy(toBytes(data.length), 0, buffer, bufoff+START_DATA.length, 4); +toBytes(data.length,buffer, bufoff+START_DATA.length); System.arraycopy(data, doff, buffer, bufoff+START_DATA.length + 4, dlength); System.arraycopy(END_DATA, 0, buffer, bufoff+START_DATA.length + 4 + data.length, END_DATA.length); return buffer; - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r385731 - /tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/mcast/McastMember.java
Author: fhanik
Date: Mon Mar 13 20:35:40 2006
New Revision: 385731
URL: http://svn.apache.org/viewcvs?rev=385731view=rev
Log:
removed commented out code
Modified:
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/mcast/McastMember.java
Modified:
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/mcast/McastMember.java
URL:
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/mcast/McastMember.java?rev=385731r1=385730r2=385731view=diff
==
---
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/mcast/McastMember.java
(original)
+++
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/mcast/McastMember.java
Mon Mar 13 20:35:40 2006
@@ -140,6 +140,11 @@
public byte[] getData() {
return getData(true);
}
+/**
+ * Highly optimized version of serializing a member into a byte array
+ * @param getalive boolean
+ * @return byte[]
+ */
public byte[] getData(boolean getalive) {
//look in cache first
if ( dataPkg!=null ) {
@@ -165,18 +170,12 @@
long alive=System.currentTimeMillis()-getServiceStartTime();
-//reduce byte copying
-//System.arraycopy(XByteBuffer.toBytes((long)alive),0,data,0,8);
XByteBuffer.toBytes((long)alive,data,0);
-//reduce byte copying
-//System.arraycopy(XByteBuffer.toBytes(port),0,data,8,4);
XByteBuffer.toBytes(port,data,8);
System.arraycopy(addr,0,data,12,addr.length);
-//reduce byte copying
-//System.arraycopy(XByteBuffer.toBytes(domaind.length),0,data,16,4);
XByteBuffer.toBytes(domaind.length,data,16);
System.arraycopy(domaind,0,data,20,domaind.length);
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r385742 - in /tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes: group/ group/interceptors/ io/ mcast/ tcp/nio/
Author: fhanik
Date: Mon Mar 13 21:44:46 2006
New Revision: 385742
URL: http://svn.apache.org/viewcvs?rev=385742view=rev
Log:
Optimizing the interceptors
Modified:
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/group/ChannelCoordinator.java
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/group/GroupChannel.java
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/group/interceptors/OrderInterceptor.java
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/io/ClusterData.java
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/mcast/McastMember.java
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/mcast/McastServiceImpl.java
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/nio/NioReceiver.java
Modified:
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/group/ChannelCoordinator.java
URL:
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/group/ChannelCoordinator.java?rev=385742r1=385741r2=385742view=diff
==
---
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/group/ChannelCoordinator.java
(original)
+++
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/group/ChannelCoordinator.java
Mon Mar 13 21:44:46 2006
@@ -37,6 +37,7 @@
private ChannelReceiver clusterReceiver;
private ChannelSender clusterSender;
private MembershipService membershipService;
+private boolean started = false;
public ChannelCoordinator() {
@@ -75,15 +76,18 @@
* SND_RX_SEQ - starts the replication receiverBR
* @throws ChannelException if a startup error occurs or the service is
already started.
*/
-public void start(int svc) throws ChannelException {
+public synchronized void start() throws ChannelException {
try {
+if (started) return;
+//must start the receiver first so that we can coordinate the port
it
+//listens to with the local membership settings
+clusterReceiver.start();
+clusterSender.start();
//synchronize, big time FIXME
membershipService.setLocalMemberProperties(getClusterReceiver().getHost(),
getClusterReceiver().getPort());
-//end FIXME
-if ( (svc Channel.SND_RX_SEQ) == Channel.SND_RX_SEQ)
clusterReceiver.start();
-if ( (svc Channel.SND_TX_SEQ) == Channel.SND_TX_SEQ)
clusterSender.start();
-if ( (svc Channel.MBR_RX_SEQ) == Channel.MBR_RX_SEQ)
membershipService.start(MembershipService.MBR_RX);
-if ( (svc Channel.MBR_TX_SEQ) == Channel.MBR_TX_SEQ)
membershipService.start(MembershipService.MBR_TX);
+membershipService.start(MembershipService.MBR_RX);
+membershipService.start(MembershipService.MBR_TX);
+this.started = true;
}catch ( ChannelException cx ) {
throw cx;
}catch ( Exception x ) {
@@ -102,14 +106,16 @@
* SND_RX_SEQ - starts the replication receiverBR
* @throws ChannelException if a startup error occurs or the service is
already started.
*/
-public void stop(int svc) throws ChannelException {
+public void stop() throws ChannelException {
try {
-if ( (svc Channel.MBR_RX_SEQ) == Channel.MBR_RX_SEQ)
membershipService.stop();
-if ( (svc Channel.SND_RX_SEQ) == Channel.SND_RX_SEQ)
clusterReceiver.stop();
-if ( (svc Channel.SND_TX_SEQ) == Channel.SND_TX_SEQ)
clusterSender.stop();
-if ( (svc Channel.MBR_TX_SEQ) == Channel.MBR_RX_SEQ)
membershipService.stop();
+membershipService.stop();
+clusterReceiver.stop();
+clusterSender.stop();
+membershipService.stop();
}catch ( Exception x ) {
throw new ChannelException(x);
+} finally {
+started = false;
}
}
Modified:
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/group/GroupChannel.java
URL:
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/group/GroupChannel.java?rev=385742r1=385741r2=385742view=diff
==
---
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/group/GroupChannel.java
(original)
+++
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/group/GroupChannel.java
Mon Mar 13 21:44:46 2006
@@ -173,7 +173,7 @@
* @throws ChannelException if a startup error occurs or the service is
already started.
*/
svn commit: r385744 - /tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/group/interceptors/FragmentationInterceptor.java
Author: fhanik
Date: Mon Mar 13 21:57:25 2006
New Revision: 385744
URL: http://svn.apache.org/viewcvs?rev=385744view=rev
Log:
minor adjustment
Modified:
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/group/interceptors/FragmentationInterceptor.java
Modified:
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/group/interceptors/FragmentationInterceptor.java
URL:
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/group/interceptors/FragmentationInterceptor.java?rev=385744r1=385743r2=385744view=diff
==
---
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/group/interceptors/FragmentationInterceptor.java
(original)
+++
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/group/interceptors/FragmentationInterceptor.java
Mon Mar 13 21:57:25 2006
@@ -54,10 +54,7 @@
boolean frag = (sizemaxSize);
if ( frag ) {
frag(destination, msg, payload);
-}
-else {
-//byte[] flag = XByteBuffer.toBytes(frag);
-//msg.getMessage().append(flag,0,flag.length);
+} else {
msg.getMessage().append(frag);
super.sendMessage(destination, msg, payload);
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
