remove windows line endings, and try to get more consistent results

Author: Matthias Radestock

projects/examples/client/PerfTest/src/examples/PerfTest.cs

@@ -55,10 +55,10 @@
 //
 //---------------------------------------------------------------------------
 using System;
-using System.Diagnostics;
+using System.Diagnostics;
 using System.Text;
 
-using RabbitMQ.Client;
+using RabbitMQ.Client;
 using RabbitMQ.Client.MessagePatterns;
 
 namespace RabbitMQ.Client.Examples {
@@ -76,48 +76,45 @@ public static int Main(string[] args) {
                 string serverAddress = args[0];
                 int messageCount = int.Parse(args[1]);
 
-                using (IConnection conn = new ConnectionFactory().CreateConnection(serverAddress))
-                {
+                using (IConnection conn =
+                       new ConnectionFactory().CreateConnection(serverAddress))
+                {
                     Stopwatch sendTimer = new Stopwatch();
-                    Stopwatch sendUnkeyedTimer = new Stopwatch();
                     Stopwatch receiveTimer = new Stopwatch();
 
-                    using (IModel receiveCh = conn.CreateModel()) {
-                        string q = receiveCh.QueueDeclare();
+                    using (IModel ch = conn.CreateModel()) {
+                        sendTimer.Start();
 
-                        using (IModel sendCh = conn.CreateModel()) {
-                            sendTimer.Start();
-
-                            for (int i = 0; i < messageCount; ++i) {
-                                sendCh.BasicPublish("", q, null, Message);
-                            }
+                        for (int i = 0; i < messageCount; ++i) {
+                            ch.BasicPublish("", "", null, Message);
                         }
-                        sendTimer.Stop();
-                        
-                        using (IModel sendCh = conn.CreateModel()) {
-                            sendUnkeyedTimer.Start();
-
-                            for (int i = 0; i < messageCount; ++i) {
-                                sendCh.BasicPublish("", "", null, Message);
-                            }
-                        }
-                        sendUnkeyedTimer.Stop();
+                    }
+                    sendTimer.Stop();
 
-                        QueueingBasicConsumer consumer = new QueueingBasicConsumer(receiveCh);
-                        receiveCh.BasicConsume(q, true, null, consumer);
-                        receiveTimer.Start();
-                        
-                        for (int i = 0; i < messageCount; ++i) {
-                            consumer.Queue.Dequeue();
+                    using (IModel ch = conn.CreateModel()) {
+                        string q = ch.QueueDeclare();
+                        
+                        for (int i = 0; i < messageCount + 1; ++i) {
+                            ch.BasicPublish("", q, null, Message);
+                        }
+                        //This ensures that all messages have been enqueued
+                        ch.BasicGet(q, true);
+
+                        QueueingBasicConsumer consumer =
+                            new QueueingBasicConsumer(ch);
+                        receiveTimer.Start();
+                        ch.BasicConsume(q, true, null, consumer);
+                        
+                        for (int i = 0; i < messageCount; ++i) {
+                            consumer.Queue.Dequeue();
                         }
-                        receiveTimer.Stop();
-                    }
-
-                    Console.WriteLine("Performance Test Completed");
-                    Console.WriteLine("Send (unkeyed): {0}Hz", ToHertz(sendUnkeyedTimer.ElapsedMilliseconds, messageCount));
-                    Console.WriteLine("Send:           {0}Hz", ToHertz(sendTimer.ElapsedMilliseconds, messageCount));
-                    Console.WriteLine("Receive:        {0}Hz", ToHertz(receiveTimer.ElapsedMilliseconds, messageCount));
-
+                        receiveTimer.Stop();
+                    }
+
+                    Console.WriteLine("Performance Test Completed");
+                    Console.WriteLine("Send:    {0}Hz", ToHertz(sendTimer.ElapsedMilliseconds, messageCount));
+                    Console.WriteLine("Receive: {0}Hz", ToHertz(receiveTimer.ElapsedMilliseconds, messageCount));
+
                     return 0;
                 }
             } catch (Exception e) {
@@ -126,9 +123,8 @@ public static int Main(string[] args) {
             }
         }
 
-        private static double ToHertz(long milliseconds, int messageCount) {
-            double secsPerMessage = ((double) milliseconds)/((double) messageCount)/1000f;
-            return 1/secsPerMessage;
+        private static double ToHertz(long milliseconds, int messageCount) {
+            return ((long)messageCount)*1000L/milliseconds;
         }
     }
 }