diff options
| author | mayur <mayur@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-08-04 03:47:53 +0000 |
|---|---|---|
| committer | mayur <mayur@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-08-04 03:47:53 +0000 |
| commit | 9b4e0509b62511e7109bfe979220d9645b35cac3 (patch) | |
| tree | b272122670d6a04f3626ed3109e419256d044a80 | |
| parent | 8c986b349e1b8aed2669d0ce670fe7211c7292e2 (diff) | |
| download | ATCD-9b4e0509b62511e7109bfe979220d9645b35cac3.tar.gz | |
Sat Aug 3 20:44:51 2002 Mayur Deshpande <mayur@ics.uci.edu>
| -rw-r--r-- | TAO/ChangeLog | 9 | ||||
| -rw-r--r-- | TAO/examples/AMH/Sink_Server/Base_Server.cpp | 4 | ||||
| -rw-r--r-- | TAO/examples/AMH/Sink_Server/client.cpp | 33 |
3 files changed, 31 insertions, 15 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 1ea6ad23243..58e183a1e50 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,12 @@ +Sat Aug 3 20:44:51 2002 Mayur Deshpande <mayur@ics.uci.edu> + + * examples/AMH/Sink_Server/Base_Server.cpp: + * examples/AMH/Sink_Server/client.cpp: + Fixes for warnings in g++ 2.96 static builds. The compiler was, + in essense, complaining about uninitialised variables + (start_test, end_test) in Base_Server.cpp. Thanks to Bala for + already fixing the return-warning in client.cpp + Sat Aug 03 18:50:11 2002 Balachandran Natarajan <bala@cs.wustl.edu> * orbsvcs/PSS/PSDL.dsp: diff --git a/TAO/examples/AMH/Sink_Server/Base_Server.cpp b/TAO/examples/AMH/Sink_Server/Base_Server.cpp index fea2ad63125..bc5a5c53c43 100644 --- a/TAO/examples/AMH/Sink_Server/Base_Server.cpp +++ b/TAO/examples/AMH/Sink_Server/Base_Server.cpp @@ -143,7 +143,9 @@ Base_Server::start_orb_and_poa (void) } ACE_ENDTRY; - return 0; + // If we have got to this point, everything has gone well. return + // normally + return 1; } void diff --git a/TAO/examples/AMH/Sink_Server/client.cpp b/TAO/examples/AMH/Sink_Server/client.cpp index 7728d3b31aa..100c99070a1 100644 --- a/TAO/examples/AMH/Sink_Server/client.cpp +++ b/TAO/examples/AMH/Sink_Server/client.cpp @@ -161,13 +161,13 @@ Client_Task::narrow_servant (void) int Client_Task::run_test (void) { + ACE_hrtime_t test_start = 0; + ACE_hrtime_t test_end = 0; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - // High resolution timer calibration - ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor (); - - ACE_hrtime_t test_start = ACE_OS::gethrtime (); + test_start = ACE_OS::gethrtime (); this->roundtrip_->start_test (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; @@ -177,17 +177,8 @@ Client_Task::run_test (void) this->roundtrip_->end_test (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - ACE_hrtime_t test_end = ACE_OS::gethrtime (); - - ACE_Basic_Stats totals; - - this->accumulate_and_dump (totals, "Task", gsf); - - totals.dump_results ("Total", gsf); + test_end = ACE_OS::gethrtime (); - ACE_Throughput_Stats::dump_throughput ("Total", gsf, - test_end - test_start, - totals.samples_count ()); } ACE_CATCHANY { @@ -195,6 +186,20 @@ Client_Task::run_test (void) } ACE_ENDTRY; + + // High resolution timer calibration + ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor (); + + ACE_Basic_Stats totals; + + this->accumulate_and_dump (totals, "Task", gsf); + + totals.dump_results ("Total", gsf); + + ACE_Throughput_Stats::dump_throughput ("Total", gsf, + test_end - test_start, + totals.samples_count ()); + return 1; } |