Author: rupertlssmith
Date: Tue Oct 2 09:45:22 2007
New Revision: 581297
URL: http://svn.apache.org/viewvc?rev=581297&view=rev
Log:
Merged revisions 581293 via svnmerge from
https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1
........
r581293 | rupertlssmith | 2007-10-02 17:29:15 +0100 (Tue, 02 Oct 2007) | 1
line
QPID-615, Added patched version of MINAs VM Pipe cleanup thread. Will replace
once bug fix is in newer version of MINA.
........
Added:
incubator/qpid/branches/M2/java/client/src/test/java/org/apache/mina/
- copied from r581293,
incubator/qpid/branches/M2.1/java/client/src/test/java/org/apache/mina/
incubator/qpid/branches/M2/java/client/src/test/java/org/apache/mina/transport/
- copied from r581293,
incubator/qpid/branches/M2.1/java/client/src/test/java/org/apache/mina/transport/
incubator/qpid/branches/M2/java/client/src/test/java/org/apache/mina/transport/vmpipe/
- copied from r581293,
incubator/qpid/branches/M2.1/java/client/src/test/java/org/apache/mina/transport/vmpipe/
incubator/qpid/branches/M2/java/client/src/test/java/org/apache/mina/transport/vmpipe/support/
- copied from r581293,
incubator/qpid/branches/M2.1/java/client/src/test/java/org/apache/mina/transport/vmpipe/support/
incubator/qpid/branches/M2/java/client/src/test/java/org/apache/mina/transport/vmpipe/support/VmPipeIdleStatusChecker.java
- copied unchanged from r581293,
incubator/qpid/branches/M2.1/java/client/src/test/java/org/apache/mina/transport/vmpipe/support/VmPipeIdleStatusChecker.java
incubator/qpid/branches/M2/java/systests/src/main/java/org/apache/mina/
- copied from r581293,
incubator/qpid/branches/M2.1/java/systests/src/main/java/org/apache/mina/
incubator/qpid/branches/M2/java/systests/src/main/java/org/apache/mina/transport/
- copied from r581293,
incubator/qpid/branches/M2.1/java/systests/src/main/java/org/apache/mina/transport/
incubator/qpid/branches/M2/java/systests/src/main/java/org/apache/mina/transport/vmpipe/
- copied from r581293,
incubator/qpid/branches/M2.1/java/systests/src/main/java/org/apache/mina/transport/vmpipe/
incubator/qpid/branches/M2/java/systests/src/main/java/org/apache/mina/transport/vmpipe/support/
- copied from r581293,
incubator/qpid/branches/M2.1/java/systests/src/main/java/org/apache/mina/transport/vmpipe/support/
incubator/qpid/branches/M2/java/systests/src/main/java/org/apache/mina/transport/vmpipe/support/VmPipeIdleStatusChecker.java
- copied unchanged from r581293,
incubator/qpid/branches/M2.1/java/systests/src/main/java/org/apache/mina/transport/vmpipe/support/VmPipeIdleStatusChecker.java
Modified:
incubator/qpid/branches/M2/ (props changed)
incubator/qpid/branches/M2/java/perftests/src/main/java/org/apache/qpid/requestreply/PingPongProducer.java
Propchange: incubator/qpid/branches/M2/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Oct 2 09:45:22 2007
@@ -1 +1 @@
-/incubator/qpid/branches/M2.1:1-573736,573738-577772,577774-578732,578734,578736-578744,578746-578827,578829-580941,580985,580992-580993,581002,581171-581188,581190-581207,581246
+/incubator/qpid/branches/M2.1:1-573736,573738-577772,577774-578732,578734,578736-578744,578746-578827,578829-580941,580985,580992-580993,581002,581171-581188,581190-581207,581246,581293
Modified:
incubator/qpid/branches/M2/java/perftests/src/main/java/org/apache/qpid/requestreply/PingPongProducer.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/M2/java/perftests/src/main/java/org/apache/qpid/requestreply/PingPongProducer.java?rev=581297&r1=581296&r2=581297&view=diff
==============================================================================
---
incubator/qpid/branches/M2/java/perftests/src/main/java/org/apache/qpid/requestreply/PingPongProducer.java
(original)
+++
incubator/qpid/branches/M2/java/perftests/src/main/java/org/apache/qpid/requestreply/PingPongProducer.java
Tue Oct 2 09:45:22 2007
@@ -119,21 +119,11 @@
* <tr><td> Provide command line invocation to loop the ping cycle on a
configurable broker url.
* </table>
*
- * @todo Make the message listener a static for all replies to be sent to? It
won't be any more of a bottle neck than having
- * one per PingPongProducer, as will synchronize on message correlation
id, allowing threads to process messages
- * concurrently for different ids. Needs to be static so that when using
a chained message listener and shared
- * destinations between multiple PPPs, it gets notified about all
replies, not just those that happen to be picked up
- * by the PPP that it is atteched to.
- *
* @todo Use read/write lock in the onmessage, not for reading writing but to
make use of a shared and exlcusive lock pair.
* Obtain read lock on all messages, before decrementing the message
count. At the end of the on message method add a
* block that obtains the write lock for the very last message, releases
any waiting producer. Means that the last
* message waits until all other messages have been handled before
releasing producers but allows messages to be
* processed concurrently, unlike the current synchronized block.
- *
- * @todo Get rid of pauses between batches, it will impact the timing
statistics, and generate meanigless timings.
- * Instead make mina use a bounded blocking buffer, or other form of
back pressure, to stop data being written
- * faster than it can be sent.
*/
public class PingPongProducer implements Runnable /*, MessageListener*/,
ExceptionListener
{
