diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2006-06-29 13:23:05 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2006-06-29 13:23:05 +0000 |
| commit | f7190408cda076afa4b96b92dc49272fdf1f55d4 (patch) | |
| tree | 4a3cd6c80315f87468025bf4fac86a6413e49d47 /TAO/orbsvcs/tests/Notify/performance-tests/RedGreen | |
| parent | 556b1abf72b74581faed8b783fad30fa8d0eeb18 (diff) | |
| download | ATCD-f7190408cda076afa4b96b92dc49272fdf1f55d4.tar.gz | |
ChangeLogTag: Thu Jun 29 10:35:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'TAO/orbsvcs/tests/Notify/performance-tests/RedGreen')
3 files changed, 12 insertions, 6 deletions
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp index 38d260bc9ba..bae67b6d40c 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp +++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp @@ -73,7 +73,8 @@ RedGreen_Test::RedGreen_Test (void) ifgop_ = CosNotifyChannelAdmin::OR_OP; } -RedGreen_Test::~RedGreen_Test () +void +RedGreen_Test::destroy_ec () { if (!CORBA::is_nil (ec_.in ())) { @@ -101,9 +102,12 @@ RedGreen_Test::~RedGreen_Test () "in RedGreen destructor; swallowing.\n"); } ACE_ENDTRY; + + this->ec_ = CORBA::CosNotifyChannelAdmin::EventChannel::_nil (); } } + void RedGreen_Test::init (int argc, char *argv [] @@ -155,8 +159,6 @@ RedGreen_Test::run (ACE_ENV_SINGLE_ARG_DECL) ACE_ENDTRY; ACE_CHECK; - - worker_.thr_mgr ()->wait (); } @@ -280,7 +282,7 @@ RedGreen_Test::create_supplieradmin (ACE_ENV_SINGLE_ARG_DECL) } void -RedGreen_Test:: create_consumeradmin (ACE_ENV_SINGLE_ARG_DECL) +RedGreen_Test::create_consumeradmin (ACE_ENV_SINGLE_ARG_DECL) { CosNotifyChannelAdmin::AdminID adminid; diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h index 03e74861531..480a55ee0b7 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h +++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h @@ -66,9 +66,8 @@ class RedGreen_Test // Shows how consumers RedGreen_Test for events. public: - // = Initialization and Termination. + // = Initialization RedGreen_Test (void); - ~RedGreen_Test (void); int parse_args (int argc, char *argv[]); @@ -86,6 +85,9 @@ class RedGreen_Test void done (void); // Called when all events we are waiting for have occured. + void destroy_ec (void); + // Destroy from the EC + int burst_size_; Worker worker_; int nthreads_; diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/main.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/main.cpp index 8d41fd8fe15..25f07f3583e 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/main.cpp +++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/main.cpp @@ -20,6 +20,8 @@ main (int argc, char *argv []) client.run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; + + client.destroy_ec (); } ACE_CATCH (CORBA::Exception, se) { |