summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbala <balanatarajan@users.noreply.github.com>2002-08-03 14:10:40 +0000
committerbala <balanatarajan@users.noreply.github.com>2002-08-03 14:10:40 +0000
commitc6f4176eae5f4f35db660328669c4230485b987a (patch)
tree20aae349fcd83f8ac26e17084a90881fa383d41b
parent4b1747ead9d3f40c46c6f774b631f439a72a0f56 (diff)
downloadATCD-c6f4176eae5f4f35db660328669c4230485b987a.tar.gz
ChangeLogTag: Sat Aug 3 09:08:56 2002 Balachandran Natarajan <bala@cs.wustl.edu>
-rw-r--r--TAO/ChangeLog5
-rw-r--r--TAO/examples/AMH/Sink_Server/client.cpp34
2 files changed, 24 insertions, 15 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index a833539da12..d2f3abd465d 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,8 @@
+Sat Aug 3 09:08:56 2002 Balachandran Natarajan <bala@cs.wustl.edu>
+
+ * examples/AMH/Sink_Server/client.cpp: Fixed warnings from
+ explicit template builds.
+
Sat Aug 3 08:08:48 2002 Balachandran Natarajan <bala@cs.wustl.edu>
* examples/AMH/Sink_Server/Base_Server.cpp: Fixed a "reaches end
diff --git a/TAO/examples/AMH/Sink_Server/client.cpp b/TAO/examples/AMH/Sink_Server/client.cpp
index 5739e0037c6..7728d3b31aa 100644
--- a/TAO/examples/AMH/Sink_Server/client.cpp
+++ b/TAO/examples/AMH/Sink_Server/client.cpp
@@ -161,18 +161,33 @@ Client_Task::narrow_servant (void)
int
Client_Task::run_test (void)
{
- ACE_hrtime_t test_start, test_end;
-
ACE_DECLARE_NEW_CORBA_ENV;
ACE_TRY
{
- test_start = ACE_OS::gethrtime ();
+ // High resolution timer calibration
+ ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
+
+ ACE_hrtime_t test_start = ACE_OS::gethrtime ();
+
this->roundtrip_->start_test (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
+
this->svc ();
+
this->roundtrip_->end_test (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
- test_end = ACE_OS::gethrtime ();
+
+ ACE_hrtime_t test_end = ACE_OS::gethrtime ();
+
+ 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 ());
}
ACE_CATCHANY
{
@@ -180,17 +195,6 @@ 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;
}