QPID-3936: Java Performance Test Framework - better PSFC support

Change ProducerParticipant to cancel the sending test messages after maximumDuration is reached.  This is required for
deterministic behaviour when using the Producer Side Flow Control feature of the Java Broker, otherwise the send() can
hang indefinitely after consumers have shutdown.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1342843 13f79535-47bb-0310-9956-ffa450edef68

3 files changed, 32 insertions, 32 deletions

diff --git a/qpid/java/perftests/etc/testdefs/short/AcknowledgementModes.json b/qpid/java/perftests/etc/testdefs/short/AcknowledgementModes.json
index d504c486aa..f910fc894d 100644
--- a/qpid/java/perftests/etc/testdefs/short/AcknowledgementModes.json
+++ b/qpid/java/perftests/etc/testdefs/short/AcknowledgementModes.json
@@ -5,13 +5,13 @@
       "_iterations":[
         {
           "_messageSize": 1024,
-          "_numberOfMessages": 1000000,
+          "_maximumDuration": 30000,
           "_acknowledgeMode": 1,
           "_deliveryMode": 1
         },
         {
           "_messageSize": 1024,
-          "_numberOfMessages": 250000,
+          "_maximumDuration": 30000,
           "_acknowledgeMode": 0,
           "_deliveryMode": 1
         }
@@ -74,13 +74,13 @@
       "_iterations":[
         {
           "_messageSize": 1024,
-          "_numberOfMessages": 100000,
+          "_maximumDuration": 30000,
           "_acknowledgeMode": 1,
           "_deliveryMode": 2
         },
         {
           "_messageSize": 1024,
-          "_numberOfMessages": 25000,
+          "_maximumDuration": 30000,
           "_acknowledgeMode": 0,
           "_deliveryMode": 2
         }
diff --git a/qpid/java/perftests/etc/testdefs/short/MessageSize.json b/qpid/java/perftests/etc/testdefs/short/MessageSize.json
index 3354d72d3e..693e418291 100644
--- a/qpid/java/perftests/etc/testdefs/short/MessageSize.json
+++ b/qpid/java/perftests/etc/testdefs/short/MessageSize.json
@@ -5,47 +5,47 @@
       "_iterations":[
         {
           "_messageSize": 256,
-          "_numberOfMessages": 1000000
+          "_maximumDuration": 30000
         },
         {
           "_messageSize": 512,
-          "_numberOfMessages": 500000
+          "_maximumDuration": 30000
         },
         {
           "_messageSize": 1024,
-          "_numberOfMessages": "250000"
+          "_maximumDuration": 30000
         },
         {
           "_messageSize": 2048,
-          "_numberOfMessages": "125000"
+          "_maximumDuration": 30000
         },
         {
           "_messageSize": 4096,
-          "_numberOfMessages": "62500"
+          "_maximumDuration": 30000
         },
         {
           "_messageSize": 8192,
-          "_numberOfMessages": 31250
+          "_maximumDuration": 30000
         },
         {
           "_messageSize": 16384,
-          "_numberOfMessages": 15625
+          "_maximumDuration": 30000
         },
         {
           "_messageSize": 32768,
-          "_numberOfMessages": 7812
+          "_maximumDuration": 30000
         },
         {
           "_messageSize": 65536,
-          "_numberOfMessages": 3906
+          "_maximumDuration": 30000
         },
         {
           "_messageSize": 131072,
-          "_numberOfMessages": 195
+          "_maximumDuration": 30000
         },
         {
           "_messageSize": 262144,
-          "_numberOfMessages": 97
+          "_maximumDuration": 30000
         }
       ],
       "_queues":[
@@ -109,47 +109,47 @@
       "_iterations":[
         {
           "_messageSize": 256,
-          "_numberOfMessages": 20000
+          "_maximumDuration": 30000
         },
         {
           "_messageSize": 512,
-          "_numberOfMessages": 20000
+          "_maximumDuration": 30000
         },
         {
           "_messageSize": 1024,
-          "_numberOfMessages": 20000
+          "_maximumDuration": 30000
         },
         {
           "_messageSize": 2048,
-          "_numberOfMessages": 20000
+          "_maximumDuration": 30000
         },
         {
           "_messageSize": 4096,
-          "_numberOfMessages": 4000
+          "_maximumDuration": 30000
         },
         {
           "_messageSize": 8192,
-          "_numberOfMessages": 4000
+          "_maximumDuration": 30000
         },
         {
           "_messageSize": 16384,
-          "_numberOfMessages": 4000
+          "_maximumDuration": 30000
         },
         {
           "_messageSize": 32768,
-          "_numberOfMessages": 2000
+          "_maximumDuration": 30000
         },
         {
           "_messageSize": 65536,
-          "_numberOfMessages": 2000
+          "_maximumDuration": 30000
         },
         {
           "_messageSize": 131072,
-          "_numberOfMessages": 2000
+          "_maximumDuration": 30000
         },
         {
           "_messageSize": 262144,
-          "_numberOfMessages": 2000
+          "_maximumDuration": 30000
         }
       ],
       "_queues":[
diff --git a/qpid/java/perftests/etc/testdefs/short/QueueTypes.json b/qpid/java/perftests/etc/testdefs/short/QueueTypes.json
index 2237e8d8b9..427f3d9795 100644
--- a/qpid/java/perftests/etc/testdefs/short/QueueTypes.json
+++ b/qpid/java/perftests/etc/testdefs/short/QueueTypes.json
@@ -16036,7 +16036,7 @@
                       "_destinationName": "direct://amq.direct//sorted-queue?durable='true'",
                       "_deliveryMode": 2,
                       "_messageSize": 1024,
-                      "_numberOfMessages": 20000,
+                      "_maximumDuration": 30000,
                       "_messageProviderName": "messageProvider"
                     }
                   ]
@@ -16059,7 +16059,7 @@
                     {
                       "_name": "Consumer1",
                       "_destinationName": "direct://amq.direct//sorted-queue?durable='true'",
-                      "_numberOfMessages": 20000
+                      "_maximumDuration": 30000
                     }
                   ]
                 }
@@ -16094,7 +16094,7 @@
                       "_destinationName": "direct://amq.direct//simple-queue?durable='true'",
                       "_deliveryMode": 2,
                       "_messageSize": 1024,
-                      "_numberOfMessages": 20000
+                      "_maximumDuration": 30000
                     }
                   ]
                 }
@@ -16116,7 +16116,7 @@
                     {
                       "_name": "Consumer1",
                       "_destinationName": "direct://amq.direct//simple-queue?durable='true'",
-                      "_numberOfMessages": 20000
+                      "_maximumDuration": 30000
                     }
                   ]
                 }
@@ -16161,7 +16161,7 @@
                       "_destinationName": "direct://amq.direct//priority-queue?durable='true'",
                       "_deliveryMode": 2,
                       "_messageSize": 1024,
-                      "_numberOfMessages": 20000,
+                      "_maximumDuration": 30000,
                       "_messageProviderName": "messageProvider"
                     }
                   ]
@@ -16184,7 +16184,7 @@
                     {
                       "_name": "Consumer1",
                       "_destinationName": "direct://amq.direct//priority-queue?durable='true'",
-                      "_numberOfMessages": 20000
+                      "_maximumDuration": 30000
                     }
                   ]
                 }