summaryrefslogtreecommitdiff
path: root/TAO
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2010-08-28 10:08:09 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2010-08-28 10:08:09 +0000
commit068753da98a702d4ec07932ee62e71e788000d08 (patch)
tree459d202bf7d444448666175143a56670462fd689 /TAO
parent800871ac77e20c3ce31cea9ec38c3f411f30d51b (diff)
downloadATCD-068753da98a702d4ec07932ee62e71e788000d08.tar.gz
Diffstat (limited to 'TAO')
-rw-r--r--TAO/performance-tests/CSD_Strategy/TestInf/ClientTask.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/ClientTask.cpp b/TAO/performance-tests/CSD_Strategy/TestInf/ClientTask.cpp
index 0eaaf6367e8..088566ac96b 100644
--- a/TAO/performance-tests/CSD_Strategy/TestInf/ClientTask.cpp
+++ b/TAO/performance-tests/CSD_Strategy/TestInf/ClientTask.cpp
@@ -62,7 +62,7 @@ ClientTask::svc()
unsigned num_loops;
{
- ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
+ ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, 0);
this->engines_.get(engine, this->engines_.size() - 1);
this->engines_.pop_back();
num_loops = this->num_loops_;
@@ -72,7 +72,7 @@ ClientTask::svc()
{
if (engine->execute(num_loops) == false)
{
- ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
+ ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, 0);
++this->failure_count_;
}
}
@@ -81,7 +81,7 @@ ClientTask::svc()
ex._tao_print_exception (
"ClientTask::svc Caught exception from execute():");
- ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
+ ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, 0);
++this->failure_count_ ;
}
catch (...)
@@ -89,7 +89,7 @@ ClientTask::svc()
ACE_ERROR((LM_ERROR,
"(%P|%t) ClientTask::svc caught unknown (...) exception "\
"in execute() " ));
- ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
+ ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, 0);
++this->failure_count_;
}