QPID-3858: Updated branch - merged from trunk r.1368650

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

3 files changed, 109 insertions, 3 deletions

diff --git a/java/perftests/example/log4j.properties b/java/perftests/example/log4j.properties
index 8af70ebef2..cabb774156 100644
--- a/java/perftests/example/log4j.properties
+++ b/java/perftests/example/log4j.properties
@@ -25,11 +25,11 @@ log4j.appender.console=org.apache.log4j.ConsoleAppender
 log4j.appender.console.Threshold=all
 log4j.appender.console.layout=org.apache.log4j.PatternLayout
 
-log4j.appender.console.layout.ConversionPattern=%d %p [%c{1}] %m%n
+log4j.appender.console.layout.ConversionPattern=%d %p [%t] [%c{1}] %m%n
 
 log4j.appender.fileApp=org.apache.log4j.FileAppender
 log4j.appender.fileApp.file=perftests.log
 log4j.appender.fileApp.Threshold=info
 log4j.appender.fileApp.append=false
 log4j.appender.fileApp.layout=org.apache.log4j.PatternLayout
-log4j.appender.fileApp.layout.ConversionPattern=%d %p [%c{1}] %m%n
\ No newline at end of file
+log4j.appender.fileApp.layout.ConversionPattern=%d %p [%t] [%c{1}] %m%n
diff --git a/java/perftests/example/perftests-jndi.properties b/java/perftests/example/perftests-jndi.properties
index 8ad0decaad..04a8ad9101 100644
--- a/java/perftests/example/perftests-jndi.properties
+++ b/java/perftests/example/perftests-jndi.properties
@@ -23,4 +23,4 @@ java.naming.factory.initial = org.apache.qpid.jndi.PropertiesFileInitialContextF
 # use QpidBrokerTestCase's default port
 connectionfactory.connectionfactory = amqp://guest:guest@clientid/test?brokerlist='tcp://localhost:5672'
 
-destination.controllerqueue = direct://amq.direct//controllerqueue
+destination.controllerqueue = direct://amq.direct//controllerqueue?autodelete='true'
diff --git a/java/perftests/example/perftests.js b/java/perftests/example/perftests.js
new file mode 100644
index 0000000000..51160e7214
--- /dev/null
+++ b/java/perftests/example/perftests.js
@@ -0,0 +1,106 @@
+
+var jsonObject = {
+    _tests:[]
+};
+
+jsonObject._tests= jsonObject._tests.concat(
+    QPID.transform(
+    {
+      "_name": "Multiple clients: 1 consumer - 1 producer - PERSISTENT - message size=1024",
+      "_queues":[
+        {
+          "_name": "direct://amq.direct//varying-consumers?durable='true'",
+          "_durable": true,
+          "_attributes":
+            {
+              "x-qpid-capacity": 10485760,
+              "x-qpid-flow-resume-capacity": 8388608
+            }
+        }
+      ],
+      "_clients":[
+        {
+          "_name": "producingClient",
+          "_connections":[
+            {
+              "_name": "connection__INDEX_",
+              "_factory": "connectionfactory",
+              "_sessions": [
+                {
+                  "_sessionName": "session__INDEX_",
+                  "_acknowledgeMode": 1,
+                  "_producers": [
+                    {
+                      "_name": "Producer__INDEX_",
+                      "_destinationName": "direct://amq.direct//varying-consumers?durable='true'",
+                      "_maximumDuration": 60000,
+                      "_deliveryMode": 2,
+                      "_messageSize": 1024
+                    }
+                  ]
+                }
+              ]
+            }
+          ]
+        },
+        {
+          "_name": "consumingClient",
+          "_connections":[
+            {
+              "_name": "connection__INDEX_",
+              "_factory": "connectionfactory",
+              "_sessions": [
+                {
+                  "_sessionName": "session__INDEX_",
+                  "_acknowledgeMode": 1,
+                  "_consumers": [
+                    {
+                      "_name": "Consumer__INDEX_",
+                      "_destinationName": "direct://amq.direct//varying-consumers?durable='true'",
+                      "_maximumDuration": 60000
+                    }
+                  ]
+                }
+              ]
+            }
+          ]
+        }
+      ]
+    },
+    function(json)
+    {
+        var producerNumbers = [1, 2, 5, 10];
+        var consumerNumbers = [1, 2, 5, 10];
+        var results = [];
+        for( var i =0; i < producerNumbers.length; i++)
+        {
+            for( var j = 0; j < consumerNumbers.length; j++)
+            {
+                var test = QPID.cloneJSON(json);
+                test._name = "Multiple clients: " + consumerNumbers[j] + " consumer - " + producerNumbers[i] + " producer";
+                results.push(test);
+                test._clients[0]._connections = QPID.times(producerNumbers[i], test._clients[0]._connections[0], "__INDEX_")
+                test._clients[1]._connections = QPID.times(consumerNumbers[j], test._clients[1]._connections[0], "__INDEX_")
+                for (var k =0; k< consumerNumbers[j]; k++)
+                {
+                    test._clients[1]._connections[k]._sessions[0]._consumers[0]._name = "consumer_" + k;
+                    test._clients[1]._connections[k]._sessions[0]._sessionName = "session_" + k;
+                    test._clients[1]._connections[k]._name = "connection_" + k;
+                    test._clients[1]._connections[k]._sessions[0]._consumers[0]._maximumDuration = 30000;
+                }
+                for (var k =0; k< producerNumbers[i]; k++)
+                {
+                    test._clients[0]._connections[k]._sessions[0]._producers[0]._name = "producer_" + k;
+                    test._clients[0]._connections[k]._sessions[0]._sessionName = "session_" + k;
+                    test._clients[0]._connections[k]._name = "connection_" + k;
+                    test._clients[0]._connections[k]._sessions[0]._producers[0]._maximumDuration= 30000;
+                    test._queues[0]._attributes["x-qpid-capacity"] = Math.round(10485760/producerNumbers[i]);
+                    test._queues[0]._attributes["x-qpid-flow-resume-capacity"] = Math.round(8388608/producerNumbers[i]);
+                }
+            }
+        }
+        return results;
+    }
+    )
+);
+