diff options
author | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-09-27 14:29:31 +0000 |
---|---|---|
committer | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-09-27 14:29:31 +0000 |
commit | cc481aadab488f3fd7761a00a52ca5d3a7df3455 (patch) | |
tree | fdcc5aa56b548a27f883691af8ce252ff23a9056 | |
parent | bd1c529a0488cf5e64ef29513a8e4131bff04280 (diff) | |
download | ATCD-cc481aadab488f3fd7761a00a52ca5d3a7df3455.tar.gz |
ChangeLogTag: Mon Sep 27 09:25:37 2004 Jeff Parsons <j.parsons@vanderbilt.edu>
-rw-r--r-- | ChangeLog | 9 | ||||
-rw-r--r-- | performance-tests/Server_Concurrency/Leader_Follower/RT_CORBA_Leader_Follower.cpp | 15 |
2 files changed, 15 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog index c42cd3320e9..da384ec26c5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +Mon Sep 27 09:25:37 2004 Jeff Parsons <j.parsons@vanderbilt.edu> + + * performance-tests/Server_Concurrency/Leader_Follower/RT_CORBA_Leader_Follower.cpp: + + Put back the recently-removed ACE_UINT64_DBLCAST_ADAPTER, + so now it and static_cast<double> are both applied to the + computation of elapsed_time_per_invocation, which will hopefully + satisfy both MSVC 6 and MSVC 7.1. + Mon Sep 27 12:54:12 UTC 2004 Johnny Willemsen <jwillemsen@remedy.nl> * bin/MakeProjectCreator/config/xerces.mpb: diff --git a/performance-tests/Server_Concurrency/Leader_Follower/RT_CORBA_Leader_Follower.cpp b/performance-tests/Server_Concurrency/Leader_Follower/RT_CORBA_Leader_Follower.cpp index 4b9fa5410d1..16be67daf7d 100644 --- a/performance-tests/Server_Concurrency/Leader_Follower/RT_CORBA_Leader_Follower.cpp +++ b/performance-tests/Server_Concurrency/Leader_Follower/RT_CORBA_Leader_Follower.cpp @@ -164,6 +164,7 @@ Leader_Follower_Task::svc (void) while (leader_available) { int result = this->synch_.condition_.wait (); + if (result == -1) { ACE_ERROR_RETURN ((LM_ERROR, @@ -289,6 +290,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { int result = parse_args (argc, argv); + if (result != 0) { return result; @@ -304,13 +306,9 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) Leader_Follower_Task *[number_of_threads], -1); - - - int priority = ACE_Sched_Params::priority_max (ACE_SCHED_FIFO); - long flags = THR_SCOPE_PROCESS; // Number of messages left = Number_Of_messages @@ -365,11 +363,9 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) test_timer.elapsed_time (elapsed_time); double elapsed_time_per_invocation = - static_cast<double> (elapsed_time / number_of_messages); - - /*ACE_DEBUG ((LM_DEBUG, - "(%P|%t) Throughput is [%f] \n", - elapsed_time_per_invocation));*/ + static_cast<double> ( + ACE_UINT64_DBLCAST_ADAPTER (elapsed_time / number_of_messages) + ); ACE_DEBUG ((LM_DEBUG, "(%P|%t) Throughput is [%f] \n", @@ -383,6 +379,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) i, leader_followers[i]->processed ())); delete leader_followers[i]; } + delete[] leader_followers; return result; |