diff options
| author | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-09-02 05:03:46 +0000 |
|---|---|---|
| committer | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-09-02 05:03:46 +0000 |
| commit | 1e12a7e44db5cc6b55180ea4ffa0d40cb993d4e3 (patch) | |
| tree | 73abed2053800d85134270006108216480eb1def | |
| parent | 11204c986d6d29a2eedd8d63f31688984719535a (diff) | |
| download | ATCD-1e12a7e44db5cc6b55180ea4ffa0d40cb993d4e3.tar.gz | |
ChangeLogTag:Fri Sep 1 22:01:07 2000 Carlos O'Ryan <coryan@uci.edu>
| -rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 6 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp | 13 |
2 files changed, 15 insertions, 4 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index 058174fe3f0..1fbf6a41d57 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,9 @@ +Fri Sep 1 22:01:07 2000 Carlos O'Ryan <coryan@uci.edu> + + * orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp: + Use perform_work() instead of run()/shutdown() because we need + to do some cleanup after the event loop finishes. + Fri Sep 1 18:16:47 2000 Carlos O'Ryan <coryan@uci.edu> * TAO_IDL/be/be_visitor_operation/operation_ss.cpp: diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp index fa45a1a2d8e..ddd0e3ff20f 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp @@ -167,8 +167,15 @@ ECT_Consumer_Driver::run (int argc, char* argv[]) ACE_DEBUG ((LM_DEBUG, "connected consumer(s)\n")); ACE_DEBUG ((LM_DEBUG, "running the test\n")); - if (this->orb_->run () == -1) - ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "orb->run"), -1); + for (;;) + { + ACE_Time_Value tv (0, 10000); + this->orb_->perform_work (tv, ACE_TRY_ENV); + ACE_TRY_CHECK; + ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, 1); + if (this->active_count_ <= 0) + break; + } ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); this->dump_results (); @@ -206,8 +213,6 @@ ECT_Consumer_Driver::shutdown_consumer (void*, ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->lock_); this->active_count_--; - if (this->active_count_ <= 0) - this->orb_->shutdown (); } void |