1 files changed, 28 insertions, 62 deletions
diff --git a/perf/ruby/local_thr.rb b/perf/ruby/local_thr.rb
index 6e2c62a..4d9357b 100644
--- a/perf/ruby/local_thr.rb
+++ b/perf/ruby/local_thr.rb
@@ -17,74 +17,40 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 require 'librbzmq'
-class Context
-end
 
-class Socket
+if ARGV.length != 3
+	puts "usage: local_thr <bind-to> <message-size> <message-count>"
+    Process.exit
 end
 
-class AssertionFailure < StandardError
-end
+bind_to = ARGV[0]
+message_size = ARGV[1].to_i
+message_count = ARGV[2].to_i
+					
+ctx = Context.new(1, 1)
+s = Socket.new(ctx, SUB);
+s.bind(bind_to);
 
-def assert(bool, message = 'assertion failure')
-    raise AssertionFailure.new(message) unless bool
+msg = s.recv(0)
+    
+start_time = Time.now
+   
+for i in 1...message_count.to_i do
+    msg = s.recv(0)
 end
 
-	if ARGV.length != 3
-		puts "usage: local_thr <in-interface> <message-size>" + \
-		" <message-count>"
-        Process.exit
-    end
+end_time = Time.now
 
-	in_interface = ARGV[0]
-   	message_size = ARGV[1]
-	message_count = ARGV[2]
-	
-	#  Print out the test parameters.
-    puts "message size: " + message_size.to_s + " [B]"
-	puts "message count: " + message_count.to_s
-						
-	#  Create 0MQ transport.
-    rb_zmq = Zmq.new();
-    
-    #  Create context.
-	context = rb_zmq.context(1, 1);    
-    	    
-    #  Create the socket.
-	in_socket = rb_zmq.socket(context, ZMQ_SUB);
-		
-   	#  Connect.
-   	rb_zmq.connect(in_socket, in_interface.to_s);
-   	
-   	#  Receive first message
-    data = rb_zmq.recv(in_socket, ZMQ_NOBLOCK);
-    assert(rb_zmq.msg_size(data.msg) == message_size.to_i)
-	    
-    #  Get initial timestamp.
-    start_time = Time.now
-       
-    #  The message loop.
-    for i in 0...message_count.to_i-1 do
-    	data = rb_zmq.recv(in_socket, ZMQ_NOBLOCK);
-    	assert(rb_zmq.msg_size(data.msg) == message_size.to_i)
-    end
- 
-    #  Get terminal timestamp.
-    end_time = Time.now
-    
-    #  Compute and print out the throughput.
-    if end_time.to_f - start_time.to_f != 0
-    	message_throughput = message_count.to_i / 
-    		(end_time.to_f - start_time.to_f);
-    else
-    	message_throughput = message_count.to_i
-    end
-    
-    megabit_throughput = message_throughput.to_f * message_size.to_i * 8 /
-       1000000;
-    puts "Your average throughput is " + "%0.2f" % message_throughput.to_s + 
-    	" [msg/s]"
-    puts "Your average throughput is " + "%0.2f" % megabit_throughput.to_s + 
-    	" [Mb/s]"    
+elapsed = (end_time.to_f - start_time.to_f) * 1000000
+if elapsed == 0
+    elapsed = 1
+end
+
+throughput = message_count * 1000000 / elapsed
+megabits = throughput * message_size * 8 / 1000000
 
+puts "message size: %i [B]" % message_size
+puts "message count: %i" % message_count
+puts "mean throughput: %i [msg/s]" % throughput
+puts "mean throughput: %.3f [Mb/s]" % megabits