summaryrefslogtreecommitdiff
path: root/TAO/performance-tests
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2012-05-15 18:23:04 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2012-05-15 18:23:04 +0000
commit38d791f18d8a67b8b9319f4b6a9579101628b28c (patch)
treebe35c69512246f58a303abc27e2028a848a78f8a /TAO/performance-tests
parent7d6ea0dc00c882c452db06f31af9acc17fc18046 (diff)
downloadATCD-38d791f18d8a67b8b9319f4b6a9579101628b28c.tar.gz
Tue May 15 18:16:09 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl>
* ace/ACE.inl: * ace/Atomic_Op_T.h: * ace/Basic_Types.h: * ace/Basic_Types.inl: * ace/Basic_Types.cpp: * ace/CDR_Base.h: * ace/Functor.h: * ace/Functor.inl: * ace/Handle_Set.cpp: * ace/High_Res_Timer.cpp: * ace/Log_Msg.cpp: * ace/Numeric_Limits.h: * ace/OS_NS_Thread.inl: * ace/OS_NS_Thread.cpp: * ace/OS_NS_stdlib.inl: * ace/OS_NS_sys_select.inl: * ace/OS_NS_sys_wait.inl: * ace/OS_NS_time.h: * ace/OS_NS_time.inl: * ace/OS_NS_unistd.inl: * ace/Profile_Timer.cpp: * ace/Sched_Params.cpp: * ace/Stats.cpp: * ace/Task.cpp: * ace/Throughput_Stats.cpp: * ace/Time_Value.h: * ace/Time_Value.inl: * ace/Truncate.h: * ace/UUID.cpp: * ace/os_include/os_pthread.h: * performance-tests/Server_Concurrency/Latency_Stats.h: * performance-tests/Server_Concurrency/Leader_Follower/leader_follower.cpp: * performance-tests/Server_Concurrency/Queue_Based_Workers/workers.cpp: * performance-tests/UDP/udp_test.cpp: * tests/Atomic_Op_Test.cpp: * tests/Basic_Types_Test.cpp: * tests/CDR_Array_Test.cpp: Removed support for Tandem NSK. That was the last platform that needed the emulated versions of ACE_INT64 and ACE_UINT64, that emulation has now been removed * ace/config-tandem-nsk-mips-v2.h: * ace/config-tandem-nsk-mips-v3.h: Removed these files.
Diffstat (limited to 'TAO/performance-tests')
-rw-r--r--TAO/performance-tests/POA/Demux/demux_test_client.cpp4
-rw-r--r--TAO/performance-tests/RTCorba/Thread_Pool/client.cpp6
-rw-r--r--TAO/performance-tests/Throughput/Receiver.cpp4
-rw-r--r--TAO/performance-tests/Throughput/client.cpp4
4 files changed, 1 insertions, 17 deletions
diff --git a/TAO/performance-tests/POA/Demux/demux_test_client.cpp b/TAO/performance-tests/POA/Demux/demux_test_client.cpp
index cc6cb32c954..a08f467c5fe 100644
--- a/TAO/performance-tests/POA/Demux/demux_test_client.cpp
+++ b/TAO/performance-tests/POA/Demux/demux_test_client.cpp
@@ -324,11 +324,7 @@ Demux_Test_Client::run_linear_test (void)
m++;
ACE_OS::fprintf (this->result_fp_, "%d %f\n", m,
-#if defined(ACE_HRTIME_T_IS_BASIC_TYPE)
- 1.0 * (end - start));
-#else
1.0 * ACE_UINT64_DBLCAST_ADAPTER (end - start));
-#endif
}
return 0;
diff --git a/TAO/performance-tests/RTCorba/Thread_Pool/client.cpp b/TAO/performance-tests/RTCorba/Thread_Pool/client.cpp
index 83ed440a5e6..ba3e578c082 100644
--- a/TAO/performance-tests/RTCorba/Thread_Pool/client.cpp
+++ b/TAO/performance-tests/RTCorba/Thread_Pool/client.cpp
@@ -212,11 +212,7 @@ to_seconds (ACE_UINT64 hrtime,
ACE_High_Res_Timer::global_scale_factor_type sf)
{
double seconds =
-#if defined ACE_LACKS_LONGLONG_T
- hrtime / sf;
-#else /* ! ACE_LACKS_LONGLONG_T */
- static_cast<double> (ACE_UINT64_DBLCAST_ADAPTER (hrtime / sf));
-#endif /* ! ACE_LACKS_LONGLONG_T */
+ static_cast<double> (ACE_UINT64_DBLCAST_ADAPTER (hrtime / sf));
seconds /= ACE_HR_SCALE_CONVERSION;
return seconds;
diff --git a/TAO/performance-tests/Throughput/Receiver.cpp b/TAO/performance-tests/Throughput/Receiver.cpp
index 26d04303a2d..b44420fd22c 100644
--- a/TAO/performance-tests/Throughput/Receiver.cpp
+++ b/TAO/performance-tests/Throughput/Receiver.cpp
@@ -58,11 +58,7 @@ Receiver::done (void)
this->last_message_time_ - this->start_time_;
// convert to microseconds
-#if !defined ACE_LACKS_LONGLONG_T
ACE_UINT32 usecs = ACE_UINT32(elapsed_time / gsf);
-#else /* ! ACE_LACKS_LONGLONG_T */
- ACE_UINT32 usecs = elapsed_time / gsf;
-#endif /* ! ACE_LACKS_LONGLONG_T */
if (usecs != 0)
{
diff --git a/TAO/performance-tests/Throughput/client.cpp b/TAO/performance-tests/Throughput/client.cpp
index fd5c633568e..02c342abf9d 100644
--- a/TAO/performance-tests/Throughput/client.cpp
+++ b/TAO/performance-tests/Throughput/client.cpp
@@ -108,11 +108,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
ACE_hrtime_t elapsed_time = ACE_OS::gethrtime () - start;
// convert to microseconds
-#if !defined ACE_LACKS_LONGLONG_T
ACE_UINT32 usecs = ACE_UINT32(elapsed_time / gsf);
-#else /* ! ACE_LACKS_LONGLONG_T */
- ACE_UINT32 usecs = elapsed_time / gsf;
-#endif /* ! ACE_LACKS_LONGLONG_T */
double bytes =
(1000000.0 * message_count * message_size) / usecs;