summaryrefslogtreecommitdiff
path: root/performance-tests/Misc
diff options
context:
space:
mode:
authorcoryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2000-12-05 18:10:37 +0000
committercoryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2000-12-05 18:10:37 +0000
commit3a5c759cc0cb5fd1f658700d182f833800febcfd (patch)
tree239e8dbde18f6ffe7a7a12ef33de479d785eaf29 /performance-tests/Misc
parentf547d4668ca8236f433ba44f882ea4a823933db4 (diff)
downloadATCD-3a5c759cc0cb5fd1f658700d182f833800febcfd.tar.gz
ChangeLogTag:Tue Dec 5 10:07:14 2000 Carlos O'Ryan <coryan@uci.edu>
Diffstat (limited to 'performance-tests/Misc')
-rw-r--r--performance-tests/Misc/childbirth_time.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/performance-tests/Misc/childbirth_time.cpp b/performance-tests/Misc/childbirth_time.cpp
index a0a06beb977..f02682559a0 100644
--- a/performance-tests/Misc/childbirth_time.cpp
+++ b/performance-tests/Misc/childbirth_time.cpp
@@ -84,7 +84,7 @@ typedef double (*Profiler)(size_t);
static int do_exec_after_fork = 0;
/// do nothing thread function
-extern "C" void *empty (void*)
+extern "C" void *ace_empty (void*)
{
return 0;
}
@@ -193,14 +193,14 @@ prof_native_thread (size_t iteration)
#if defined (ACE_HAS_WTHREADS)
if (::CreateThread (NULL,
0,
- LPTHREAD_START_ROUTINE (empty),
+ LPTHREAD_START_ROUTINE (ace_empty),
0,
CREATE_SUSPENDED,
0) == NULL)
#elif defined (ACE_HAS_STHREADS)
if (::thr_create (NULL,
0,
- empty,
+ &ace_empty,
0,
THR_SUSPENDED,
NULL) != 0)
@@ -238,7 +238,7 @@ prof_ace_os_thread (size_t iteration)
ptimer.start ();
for (size_t j = 0; j < MULTIPLY_FACTOR; j++)
- if (ACE_OS::thr_create ((ACE_THR_FUNC) empty,
+ if (ACE_OS::thr_create ((ACE_THR_FUNC) ace_empty,
0,
THR_SUSPENDED,
NULL) == -1)
@@ -275,7 +275,7 @@ prof_tm_thread (size_t iteration)
ptimer.start ();
if (ACE_Thread_Manager::instance ()->spawn_n (MULTIPLY_FACTOR,
- (ACE_THR_FUNC) empty,
+ (ACE_THR_FUNC) ace_empty,
0,
THR_SUSPENDED) == -1)
ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "CreateThread"), -1);