diff options
Diffstat (limited to 'TAO/orbsvcs/tests/Event')
| -rw-r--r-- | TAO/orbsvcs/tests/Event/Basic/Observer.cpp | 3 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp | 3 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/Event/Performance/Connect.cpp | 12 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/Event/Performance/Latency.cpp | 3 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/Event/lib/Driver.cpp | 3 |
5 files changed, 16 insertions, 8 deletions
diff --git a/TAO/orbsvcs/tests/Event/Basic/Observer.cpp b/TAO/orbsvcs/tests/Event/Basic/Observer.cpp index 302bb16f9e8..f39b060867f 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Observer.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Observer.cpp @@ -310,7 +310,8 @@ EC_Observer::dump_results (void) ACE_DEBUG ((LM_DEBUG, "===== Results for %d =====\n", this->id_)); ACE_Throughput_Stats throughput; - ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor (); + ACE_High_Res_Timer::global_scale_factor_type gsf = + ACE_High_Res_Timer::global_scale_factor (); for (int j = 0; j < this->n_consumers_; ++j) { this->consumers_[j]->accumulate (throughput); diff --git a/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp index 31e4d1de658..fca70e30dd4 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp @@ -91,7 +91,8 @@ EC_Reconnect::execute_test (void) this->execute_consumer_test (); this->execute_supplier_test (); - ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor (); + ACE_High_Res_Timer::global_scale_factor_type gsf = + ACE_High_Res_Timer::global_scale_factor (); this->consumer_reconnect_.dump_results (ACE_TEXT("Reconnect/consumer"), gsf); this->supplier_reconnect_.dump_results (ACE_TEXT("Reconnect/supplier"), gsf); diff --git a/TAO/orbsvcs/tests/Event/Performance/Connect.cpp b/TAO/orbsvcs/tests/Event/Performance/Connect.cpp index 91e0b6738a3..0a10dba7a89 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Connect.cpp +++ b/TAO/orbsvcs/tests/Event/Performance/Connect.cpp @@ -96,7 +96,8 @@ EC_Connect::print_args (void) const void EC_Connect::dump_results (void) { - ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor (); + ACE_High_Res_Timer::global_scale_factor_type gsf = + ACE_High_Res_Timer::global_scale_factor (); ACE_DEBUG ((LM_DEBUG, "\nConnect time:\n")); this->consumer_connect_.dump_results (ACE_TEXT("Consumer/connect"), gsf); this->supplier_connect_.dump_results (ACE_TEXT("Supplier/connect"), gsf); @@ -241,7 +242,8 @@ EC_Connect::disconnect_clients (void) now - start); } } - ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor (); + ACE_High_Res_Timer::global_scale_factor_type gsf = + ACE_High_Res_Timer::global_scale_factor (); this->consumer_disconnect_.dump_results (ACE_TEXT("Consumer/disconnect"), gsf); this->supplier_disconnect_.dump_results (ACE_TEXT("Supplier/disconnect"), gsf); } @@ -260,7 +262,8 @@ EC_Connect::disconnect_consumers (void) this->consumer_disconnect_.sample (now - start_time, now - start); } - ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor (); + ACE_High_Res_Timer::global_scale_factor_type gsf = + ACE_High_Res_Timer::global_scale_factor (); this->consumer_disconnect_.dump_results (ACE_TEXT("Consumer/disconnect"), gsf); if (this->verbose ()) @@ -281,7 +284,8 @@ EC_Connect::disconnect_suppliers (void) this->supplier_disconnect_.sample (now - start_time, now - start); } - ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor (); + ACE_High_Res_Timer::global_scale_factor_type gsf = + ACE_High_Res_Timer::global_scale_factor (); this->supplier_disconnect_.dump_results (ACE_TEXT("Supplier/disconnect"), gsf); if (this->verbose ()) diff --git a/TAO/orbsvcs/tests/Event/Performance/Latency.cpp b/TAO/orbsvcs/tests/Event/Performance/Latency.cpp index 9b1f4d5bc5e..12d25b6a41c 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Latency.cpp +++ b/TAO/orbsvcs/tests/Event/Performance/Latency.cpp @@ -193,7 +193,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "Calibrating high res timer ....")); ACE_High_Res_Timer::calibrate (); - ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor (); + ACE_High_Res_Timer::global_scale_factor_type gsf = + ACE_High_Res_Timer::global_scale_factor (); ACE_DEBUG ((LM_DEBUG, "Done (%d)\n", gsf)); if (do_dump_history) { diff --git a/TAO/orbsvcs/tests/Event/lib/Driver.cpp b/TAO/orbsvcs/tests/Event/lib/Driver.cpp index 4c3d1c11106..84cc1a7c48f 100644 --- a/TAO/orbsvcs/tests/Event/lib/Driver.cpp +++ b/TAO/orbsvcs/tests/Event/lib/Driver.cpp @@ -641,7 +641,8 @@ void EC_Driver::dump_results (void) { ACE_Throughput_Stats throughput; - ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor (); + ACE_High_Res_Timer::global_scale_factor_type gsf = + ACE_High_Res_Timer::global_scale_factor (); ACE_TCHAR buf[BUFSIZ]; for (int j = 0; j < this->n_consumers_; ++j) { |