diff --git a/test-suite/build.xml b/test-suite/build.xml index 39b5f8b..3518101 100644 --- a/test-suite/build.xml +++ b/test-suite/build.xml @@ -149,7 +149,7 @@ --> - + @@ -190,8 +190,8 @@ --> - - + + diff --git a/test-suite/src/main/java/org/mobicents/protocols/ss7/gmlc/load/Client.java b/test-suite/src/main/java/org/mobicents/protocols/ss7/gmlc/load/Client.java index e088eff..eaf077a 100644 --- a/test-suite/src/main/java/org/mobicents/protocols/ss7/gmlc/load/Client.java +++ b/test-suite/src/main/java/org/mobicents/protocols/ss7/gmlc/load/Client.java @@ -760,11 +760,11 @@ public void onDialogRelease(MAPDialog mapDialog) { this.endCount++; if (this.endCount < NDIALOGS) { - if ((this.endCount % 2000) == 0) { + if ((this.endCount % 10000) == 0) { long current = System.currentTimeMillis(); float sec = (float) (current - prev) / 1000f; prev = current; - logger.warn("Completed 2000 Dialogs, dlg per a sec: " + (float) (2000 / sec)); + logger.warn("Completed 10000 Dialogs, dlg/sec: " + (float) (10000 / sec)); } } else { if (this.endCount == NDIALOGS) { diff --git a/test-suite/src/main/java/org/mobicents/protocols/ss7/gmlc/load/ClientServer.java b/test-suite/src/main/java/org/mobicents/protocols/ss7/gmlc/load/ClientServer.java index 76ef71a..6263304 100644 --- a/test-suite/src/main/java/org/mobicents/protocols/ss7/gmlc/load/ClientServer.java +++ b/test-suite/src/main/java/org/mobicents/protocols/ss7/gmlc/load/ClientServer.java @@ -887,11 +887,11 @@ public void onDialogRelease(MAPDialog mapDialog) { this.serverEndCount++; - if ((this.serverEndCount % 2000) == 0) { + if (((this.serverEndCount % 10000) == 0) && serverEndCount>1) { long currentTime = System.currentTimeMillis(); long processingTime = currentTime - serverStart; serverStart = currentTime; - logger.warn("Completed 2000 Dialogs in=" + processingTime); + logger.warn("Completed 10000 Dialogs in=" + processingTime + " ms. Dialogs per sec: "+ + (float) (10000000 / processingTime)); } } diff --git a/test-suite/src/main/java/org/mobicents/protocols/ss7/gmlc/load/Server.java b/test-suite/src/main/java/org/mobicents/protocols/ss7/gmlc/load/Server.java index 3cd8521..9608b0c 100644 --- a/test-suite/src/main/java/org/mobicents/protocols/ss7/gmlc/load/Server.java +++ b/test-suite/src/main/java/org/mobicents/protocols/ss7/gmlc/load/Server.java @@ -442,11 +442,11 @@ public void onDialogRelease(MAPDialog mapDialog) { this.endCount++; - if ((this.endCount % 2000) == 0) { + if (((this.endCount % 10000) == 0) && endCount>1) { long currentTime = System.currentTimeMillis(); long processingTime = currentTime - start; start = currentTime; - logger.warn("Completed 2000 Dialogs in=" + processingTime); + logger.warn("Completed 10000 Dialogs in=" + processingTime + " ms. Dialogs per sec: "+ + (float) (10000000 / processingTime)); } } @@ -576,9 +576,11 @@ public void onAnyTimeInterrogationRequest(AnyTimeInterrogationRequest atiReq) { if (logger.isDebugEnabled()) { logger.debug( String.format("onAnyTimeInterrogationRequest for DialogId=%d", atiReq.getMAPDialog().getLocalDialogId())); - } else { + } if (logger.isInfoEnabled()) { logger.info(String.format("onAnyTimeInterrogationRequest for DialogId=%d", atiReq.getMAPDialog().getLocalDialogId())); - } + } /*else { + logger.warn(String.format("onAnyTimeInterrogationRequest for DialogId=%d", atiReq.getMAPDialog().getLocalDialogId())); + }*/ try { long invokeId = atiReq.getInvokeId(); diff --git a/test-suite/src/main/java/org/mobicents/protocols/ss7/gmlc/load/TestHarness.java b/test-suite/src/main/java/org/mobicents/protocols/ss7/gmlc/load/TestHarness.java index 33b106c..35d1eba 100644 --- a/test-suite/src/main/java/org/mobicents/protocols/ss7/gmlc/load/TestHarness.java +++ b/test-suite/src/main/java/org/mobicents/protocols/ss7/gmlc/load/TestHarness.java @@ -71,7 +71,7 @@ public abstract class TestHarness implements MAPDialogListener, MAPServiceMobili protected static int NDIALOGS = 50000; - protected static int MAXCONCURRENTDIALOGS = 225; + protected static int MAXCONCURRENTDIALOGS = 500; // MTPL3 Details protected static int CLIENT_SPC = 1; // Client Signaling Point Code diff --git a/test-suite/src/main/resources/log4j.properties b/test-suite/src/main/resources/log4j.properties index 579237f..32f32c0 100644 --- a/test-suite/src/main/resources/log4j.properties +++ b/test-suite/src/main/resources/log4j.properties @@ -1,5 +1,5 @@ # Set root logger level to DEBUG and its only appender to A1. -log4j.rootLogger=INFO, A1, R +log4j.rootLogger=WARN, A1, R # A1 is set to be a ConsoleAppender. log4j.appender.A1=org.apache.log4j.ConsoleAppender