Revision: 15707
Author: vladimir.ralev
Date: Fri Dec 10 09:26:39 2010
Log: Test accuracy updates
http://code.google.com/p/mobicents/source/detail?r=15707
Modified:
/trunk/tools/sip-balancer/jar/src/main/java/org/mobicents/tools/sip/balancer/BalancerRunner.java
/trunk/tools/sip-balancer/jar/src/test/java/org/mobicents/tools/sip/balancer/performance/TcpForwardingPerformanceTest.java
/trunk/tools/sip-balancer/jar/src/test/java/org/mobicents/tools/sip/balancer/performance/UdpForwardingPerformanceTest.java
=======================================
---
/trunk/tools/sip-balancer/jar/src/main/java/org/mobicents/tools/sip/balancer/BalancerRunner.java
Fri Dec 10 07:43:49 2010
+++
/trunk/tools/sip-balancer/jar/src/main/java/org/mobicents/tools/sip/balancer/BalancerRunner.java
Fri Dec 10 09:26:39 2010
@@ -230,7 +230,7 @@
}
public void stop() {
- timer.cancel();
+ if(timer != null) timer.cancel();
timer = null;
logger.info("Stopping the sip forwarder");
fwd.stop();
=======================================
---
/trunk/tools/sip-balancer/jar/src/test/java/org/mobicents/tools/sip/balancer/performance/TcpForwardingPerformanceTest.java
Thu Dec 9 18:40:06 2010
+++
/trunk/tools/sip-balancer/jar/src/test/java/org/mobicents/tools/sip/balancer/performance/TcpForwardingPerformanceTest.java
Fri Dec 10 09:26:39 2010
@@ -117,11 +117,11 @@
Socket clientSocket = new Socket("localhost", 5060);
//DataOutputStream outToServer = new
DataOutputStream(clientSocket.getOutputStream());
- long sentPackets = 0;
+ long sentUnits = 0;
long startTime = System.currentTimeMillis();
while(true)
{
- boolean diffNotTooBig = sentPackets -
server.numUnitsReceived<maxLostPackets;
+ boolean diffNotTooBig = sentUnits -
server.numUnitsReceived<maxLostPackets;
boolean thereIsStillTime =
System.currentTimeMillis()-startTime<timespan;
if(!thereIsStillTime) {
break;
@@ -129,7 +129,7 @@
try {
if(diffNotTooBig) {
clientSocket.getOutputStream().write(inviteRequestBytes);modCallId();
-
sentPackets+=inviteRequestBytes.length;
+
sentUnits+=inviteRequestBytes.length;
} else {
Thread.sleep(1);
}
@@ -139,7 +139,7 @@
}
}
- System.out.println("Packets sent in " + timespan + " ms are " +
sentPackets/inviteRequestBytes.length + "(making " +
sentPackets/inviteRequestBytes.length/((double)(timespan)/1000.) + "
initial requests per second)");
+ System.out.println("Packets sent in " + timespan + " ms are " +
server.numUnitsReceived/inviteRequestBytes.length + "(making " +
sentUnits/inviteRequestBytes.length/((double)(timespan)/1000.) + " initial
requests per second)");
} catch (Exception e) {
// TODO Auto-generated catch block
e.printStackTrace();
@@ -154,10 +154,11 @@
public static void main(String[] args) {
try {
- TcpForwardingPerformanceTest test = new
TcpForwardingPerformanceTest();
- test.setUp();
- test.testMessagePerformance(20*1000, 1000);
- test.tearDown();
+ TcpForwardingPerformanceTest test = new
TcpForwardingPerformanceTest();
+ test.setUp();
+ test.testMessagePerformance(20*1000, 1000);
+ test.tearDown();
+ System.exit(0);
} catch (Exception e) {
e.printStackTrace();
}
=======================================
---
/trunk/tools/sip-balancer/jar/src/test/java/org/mobicents/tools/sip/balancer/performance/UdpForwardingPerformanceTest.java
Thu Dec 9 18:05:35 2010
+++
/trunk/tools/sip-balancer/jar/src/test/java/org/mobicents/tools/sip/balancer/performance/UdpForwardingPerformanceTest.java
Fri Dec 10 09:26:39 2010
@@ -145,7 +145,7 @@
Thread.sleep(1);
}
}
- System.out.println("Packets sent in " + timespan + " ms are " +
sentPackets + "(making " + sentPackets/((double)(timespan)/1000.) + "
initial requests per second)");
+ System.out.println("Packets sent in " + timespan + " ms are " +
sentPackets + "(making " +
server.numUnitsReceived/((double)(timespan)/1000.) + " initial requests per
second)");
} catch (Exception e) {
// TODO Auto-generated catch block
e.printStackTrace();
@@ -171,7 +171,7 @@
Thread.sleep(1);
}
}
- System.out.println("Packets sent in " + timespan + " ms are " +
sentPackets + "(making " + sentPackets/((double)(timespan)/1000.) + "
initial requests per second)");
+ System.out.println("Packets sent in " + timespan + " ms are " +
sentPackets + "(making " +
server.numUnitsReceived/((double)(timespan)/1000.) + " initial requests per
second)");
} catch (Exception e) {
// TODO Auto-generated catch block
e.printStackTrace();