4 new revisions:
Revision: be57aecc3a9b
Author: Alexandre Mendonça <ammendonca>
Date: Mon Jan 28 18:17:38 2013
Log: Making test scripts runnable
http://code.google.com/p/jdiameter/source/detail?r=be57aecc3a9b
Revision: ba962de805c7
Author: Alexandre Mendonça <ammendonca>
Date: Mon Jan 28 19:13:40 2013
Log: Small improvement to error message and logging.
http://code.google.com/p/jdiameter/source/detail?r=ba962de805c7
Revision: 5b318f729cf4
Author: Alexandre Mendonça <ammendonca>
Date: Mon Jan 28 19:14:49 2013
Log: Fixing wrong logging message arguments order
http://code.google.com/p/jdiameter/source/detail?r=5b318f729cf4
Revision: 1a47291f48ea
Author: Alexandre Mendonça <ammendonca>
Date: Mon Jan 28 19:17:47 2013
Log: Avoiding calls to ThreadGroup interrupt/stop/destroy as it seems
to ca...
http://code.google.com/p/jdiameter/source/detail?r=1a47291f48ea
==============================================================================
Revision: be57aecc3a9b
Author: Alexandre Mendonça <ammendonca>
Date: Mon Jan 28 18:17:38 2013
Log: Making test scripts runnable
http://code.google.com/p/jdiameter/source/detail?r=be57aecc3a9b
Modified:
/testsuite/load/core/diameter-env/run/start_client_cc_event.ksh
/testsuite/load/core/diameter-env/run/start_client_cc_long.ksh
/testsuite/load/core/diameter-env/run/start_client_cxdx_rtr.ksh
/testsuite/load/core/diameter-env/run/start_client_cxdx_uar.ksh
/testsuite/load/core/diameter-env/run/start_client_event_rf.ksh
/testsuite/load/core/diameter-env/run/start_client_session_rf.ksh
/testsuite/load/core/diameter-env/run/start_client_sh.ksh
/testsuite/load/core/diameter-env/run/start_client_sh_long.ksh
/testsuite/load/core/diameter-env/run/start_server_event_rf.ksh
/testsuite/load/core/diameter-env/run/start_server_ro.ksh
/testsuite/load/core/diameter-env/run/start_server_session_rf.ksh
/testsuite/load/core/diameter-env/run/start_server_sh_pnr.ksh
==============================================================================
Revision: ba962de805c7
Author: Alexandre Mendonça <ammendonca>
Date: Mon Jan 28 19:13:40 2013
Log: Small improvement to error message and logging.
http://code.google.com/p/jdiameter/source/detail?r=ba962de805c7
Modified:
/core/jdiameter/impl/src/main/java/org/jdiameter/client/impl/fsm/PeerFSMImpl.java
=======================================
---
/core/jdiameter/impl/src/main/java/org/jdiameter/client/impl/fsm/PeerFSMImpl.java
Wed Jan 23 19:56:54 2013
+++
/core/jdiameter/impl/src/main/java/org/jdiameter/client/impl/fsm/PeerFSMImpl.java
Mon Jan 28 19:13:40 2013
@@ -311,7 +311,7 @@
logger.debug("Not performing validation to message since validator
is DISABLED.");
}
- boolean rc;
+ boolean rc = false;
try {
if(logger.isDebugEnabled()) {
logger.debug("Placing event [{}] into linked blocking queue with
remaining capacity: [{}].", event, eventQueue.remainingCapacity());
@@ -327,7 +327,8 @@
rc = eventQueue.offer(event, IAC_TIMEOUT, TimeUnit.MILLISECONDS);
}
catch (InterruptedException e) {
- throw new InternalError("Can not put event to FSM " +
this.toString());
+ logger.debug("Can not put event '" + event.toString() + "' to FSM "
+ this.toString(), e);
+ throw new InternalError("Can not put event '" + event.toString()
+ "' to FSM " + this.toString());
}
if (!rc) {
throw new OverloadException("FSM overloaded");
==============================================================================
Revision: 5b318f729cf4
Author: Alexandre Mendonça <ammendonca>
Date: Mon Jan 28 19:14:49 2013
Log: Fixing wrong logging message arguments order
http://code.google.com/p/jdiameter/source/detail?r=5b318f729cf4
Modified:
/core/jdiameter/impl/src/main/java/org/jdiameter/client/impl/router/RouterImpl.java
=======================================
---
/core/jdiameter/impl/src/main/java/org/jdiameter/client/impl/router/RouterImpl.java
Thu Jan 24 20:22:41 2013
+++
/core/jdiameter/impl/src/main/java/org/jdiameter/client/impl/router/RouterImpl.java
Mon Jan 28 19:14:49 2013
@@ -390,7 +390,7 @@
return c;
}
else {
- logger.debug("Finding peer by destination host avp [host={}] did not
find anything. Now going to try finding one by destination realm [{}]",
destRealm, destHost);
+ logger.debug("Finding peer by destination host avp [host={}] did not
find anything. Now going to try finding one by destination realm [{}]",
destHost, destRealm);
String peers[] = matchedRealm.getPeerNames();
if (peers == null || peers.length == 0) {
throw new RouteException("Unable to find context by route
information [" + destRealm + " ," + destHost + "]");
==============================================================================
Revision: 1a47291f48ea
Author: Alexandre Mendonça <ammendonca>
Date: Mon Jan 28 19:17:47 2013
Log: Avoiding calls to ThreadGroup interrupt/stop/destroy as it seems
to cause more trouble than it solves.
http://code.google.com/p/jdiameter/source/detail?r=1a47291f48ea
Modified:
/core/jdiameter/impl/src/main/java/org/jdiameter/client/impl/controller/PeerTableImpl.java
=======================================
---
/core/jdiameter/impl/src/main/java/org/jdiameter/client/impl/controller/PeerTableImpl.java
Wed Jan 9 20:01:28 2013
+++
/core/jdiameter/impl/src/main/java/org/jdiameter/client/impl/controller/PeerTableImpl.java
Mon Jan 28 19:17:47 2013
@@ -302,22 +302,23 @@
try {
// Wait for some threads which may take longer...
// FIXME: Change this once we get rid of ThreadGroup and hard
interrupting threads.
- boolean interrupted = false;
+ // boolean interrupted = false;
long remWaitTime = 2000;
logger.debug("Stopping thread group and waiting a max of {}ms for
all threads to finish", remWaitTime);
while(concurrentFactory.getThreadGroup().activeCount() > 0 &&
remWaitTime > 0) {
long waitTime = 250;
Thread.sleep(waitTime);
remWaitTime -= waitTime;
+ logger.debug("Waited {}ms. Time remaining to wait: {}ms. {}
Thread still active.", new Object[]{waitTime, remWaitTime,
concurrentFactory.getThreadGroup().activeCount()});
// it did not terminated, let's interrupt
// FIXME: remove ASAP, this is very bad, it kills threads in
middle of op,
// killing FSM of peer for instance, after that its not
usable.
- if(remWaitTime <= 0 && !interrupted) {
- interrupted = true;
- remWaitTime = 2000;
- logger.debug("Stopping thread group did not work. Interrupting
and waiting a max of {}ms for all threads to finish", remWaitTime);
- concurrentFactory.getThreadGroup().interrupt();
- }
+ // if(remWaitTime <= 0 && !interrupted) {
+ // interrupted = true;
+ // remWaitTime = 2000;
+ // logger.debug("Stopping thread group did not work.
Interrupting and waiting a max of {}ms for all threads to finish",
remWaitTime);
+ // concurrentFactory.getThreadGroup().interrupt();
+ // }
}
}
catch (Exception e) {
@@ -344,8 +345,9 @@
logger.debug("In destroy. Going to destroy concurrentFactory's thread
group");
if (concurrentFactory != null) {
try {
- concurrentFactory.getThreadGroup().stop(); //had to add it to make
testStartStopStart pass....
- concurrentFactory.getThreadGroup().destroy();
+ // concurrentFactory.getThreadGroup().interrupt();
+ // concurrentFactory.getThreadGroup().stop(); //had to add it to
make testStartStopStart pass....
+ // concurrentFactory.getThreadGroup().destroy();
}
catch (IllegalThreadStateException itse) {
if(logger.isDebugEnabled()) {
--
---
You received this message because you are subscribed to the Google Groups "mobicents-commits" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/groups/opt_out.