diff options
| author | nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-05-13 21:15:18 +0000 |
|---|---|---|
| committer | nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-05-13 21:15:18 +0000 |
| commit | 71760f525ac2c6ff9f2ce302cf737c6703165557 (patch) | |
| tree | 4f0759450b056e3bd6e900f04c7248b0e472c906 | |
| parent | d0b0dd041cc4cc9dc398033fa5fcc28b67af602d (diff) | |
| download | ATCD-71760f525ac2c6ff9f2ce302cf737c6703165557.tar.gz | |
*** empty log message ***
| -rw-r--r-- | ChangeLog-98b | 4 | ||||
| -rw-r--r-- | performance-tests/Synch-Benchmarks/Options.cpp | 27 |
2 files changed, 26 insertions, 5 deletions
diff --git a/ChangeLog-98b b/ChangeLog-98b index d37c404bcf0..772a02d78d4 100644 --- a/ChangeLog-98b +++ b/ChangeLog-98b @@ -1,5 +1,9 @@ Wed May 13 11:29:56 1998 Nanbor Wang <nanbor@cs.wustl.edu> + * performance-tests/Synch-Benchmarks/Options.cpp (print_results): + My previous change to add print_results functionality when + ACE_HAS_GETRUSAGE broke this on Win32. + * ace/config-g++-common.h (ACE_HAS_GNUC_BROKEN_TEMPLATE_INLINE_FUNCTIONS): Made this macro defined for all versions of g++. diff --git a/performance-tests/Synch-Benchmarks/Options.cpp b/performance-tests/Synch-Benchmarks/Options.cpp index 95b457cf3cb..3c551c9ba4f 100644 --- a/performance-tests/Synch-Benchmarks/Options.cpp +++ b/performance-tests/Synch-Benchmarks/Options.cpp @@ -323,8 +323,7 @@ Options::print_results (void) rusage.pr_majf, rusage.pr_minf, ACE_Thread::getconcurrency ())); -#else - // need to write dump ops for rusage... +#elif defined (ACE_HAS_GETRUSAGE) && !defined (ACE_WIN32) ACE_DEBUG ((LM_INFO, "\n%8d PEs\n" "%8.2f Mbit/sec\n" @@ -346,7 +345,15 @@ Options::print_results (void) rusage.ru_majflt, rusage.ru_minflt, ACE_Thread::getconcurrency ())); - +#else defined (ACE_HAS_GETRUSAGE) && defined (ACE_WIN32) + // Need more stuff for Win32. + ACE_DEBUG ((LM_INFO, + "\n%8d PEs\n" + "%8.2f Mbit/sec\n" + "%8d (number of LWPs)\n", + this->thr_count (), + (nbytes / et.real_time) * 8.0 / 1024.0 / 1024.0, + ACE_Thread::getconcurrency ())); #endif /* ACE_HAS_PRUSAGE_T */ } else @@ -404,8 +411,7 @@ Options::print_results (void) rusage.pr_ioch, ACE_Thread::getconcurrency (), et.real_time, et.user_time, et.system_time)); -#else - // need to write dump ops for rusage... +#elif defined (ACE_HAS_GETRUSAGE) && !defined (ACE_WIN32) ACE_DEBUG ((LM_INFO, "%8d = minor page faults\n" "%8d = major page faults\n" @@ -435,6 +441,17 @@ Options::print_results (void) rusage.ru_nvcsw + rusage.ru_nivcsw, ACE_Thread::getconcurrency (), et.real_time, et.user_time, et.system_time)); +#elif defined (ACE_HAS_GETRUSAGE) && defined (ACE_WIN32) + // need to write more dump ops for rusage on Win32 + ACE_DEBUG ((LM_INFO, + "%8d = number of LWPs\n" + "---------------------\n" + "real time = %.3f\n" + "user time = %.3f\n" + "system time = %.3f\n" + "---------------------\n", + ACE_Thread::getconcurrency (), + et.real_time, et.user_time, et.system_time)); #endif /* ACE_HAS_PRUSAGE_T */ } if (options.do_eager_exit ()) |