*** empty log message ***

3 files changed, 6 insertions, 321 deletions

diff --git a/ace/OS.i b/ace/OS.i
index 45f58bf978f..24001f64638 100644
--- a/ace/OS.i
+++ b/ace/OS.i
@@ -5338,7 +5338,7 @@ ACE_OS::hostname (char name[], size_t maxnamelen)
 }
 
 ACE_INLINE int 
-ACE_OS::msgctl (int msqid, int cmd, msqid_ds *val)
+ACE_OS::msgctl (int msqid, int cmd, struct msqid_ds *val)
 {
   // ACE_TRACE ("ACE_OS::msgctl");
 #if defined (ACE_HAS_SYSV_IPC)
diff --git a/ace/Synch.i b/ace/Synch.i
index c5c2f76eb3a..ea8794082ff 100644
--- a/ace/Synch.i
+++ b/ace/Synch.i
@@ -418,7 +418,10 @@ ACE_Thread_Mutex_Guard::ACE_Thread_Mutex_Guard (ACE_Thread_Mutex &m,
   : lock_ (m) 
 { 
 // ACE_TRACE ("ACE_Thread_Mutex_Guard::ACE_Thread_Mutex_Guard");
-  this->owner_ = block ? this->lock_.acquire () : this->lock_.tryacquire ();
+  if (block)
+    this->acquire ();
+  else
+    this->tryacquire ();
 }
 
 // Implicitly release the lock.
diff --git a/performance-tests/Misc/Makefile b/performance-tests/Misc/Makefile
index c4263173b99..5024c7edaec 100644
--- a/performance-tests/Misc/Makefile
+++ b/performance-tests/Misc/Makefile
@@ -52,324 +52,6 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
-basic_func.o: basic_func.cpp basic_func.h
-basic_perf.o: basic_perf.cpp basic_func.h \
- ${ACE_ROOT}/ace/High_Res_Timer.h \
- ${ACE_ROOT}/ace/ACE.h \
- ${ACE_ROOT}/ace/OS.h \
- ${ACE_ROOT}/ace/config.h \
- ${ACE_ROOT}/ace/stdcpp.h \
- ${ACE_ROOT}/ace/OS.i \
- ${ACE_ROOT}/ace/Trace.h \
- ${ACE_ROOT}/ace/Log_Msg.h \
- ${ACE_ROOT}/ace/Log_Record.h \
- ${ACE_ROOT}/ace/Log_Priority.h \
- ${ACE_ROOT}/ace/Log_Record.i \
- ${ACE_ROOT}/ace/ACE.i \
- ${ACE_ROOT}/ace/High_Res_Timer.i \
- ${ACE_ROOT}/ace/Get_Opt.h \
- ${ACE_ROOT}/ace/Get_Opt.i
-childbirth_time.o: childbirth_time.cpp \
- ${ACE_ROOT}/ace/OS.h \
- ${ACE_ROOT}/ace/config.h \
- ${ACE_ROOT}/ace/stdcpp.h \
- ${ACE_ROOT}/ace/OS.i \
- ${ACE_ROOT}/ace/Trace.h \
- ${ACE_ROOT}/ace/Log_Msg.h \
- ${ACE_ROOT}/ace/Log_Record.h \
- ${ACE_ROOT}/ace/ACE.h \
- ${ACE_ROOT}/ace/ACE.i \
- ${ACE_ROOT}/ace/Log_Priority.h \
- ${ACE_ROOT}/ace/Log_Record.i \
- ${ACE_ROOT}/ace/Get_Opt.h \
- ${ACE_ROOT}/ace/Get_Opt.i \
- ${ACE_ROOT}/ace/Process.h \
- ${ACE_ROOT}/ace/Process.i \
- ${ACE_ROOT}/ace/Profile_Timer.h \
- ${ACE_ROOT}/ace/Time_Value.h \
- ${ACE_ROOT}/ace/High_Res_Timer.h \
- ${ACE_ROOT}/ace/High_Res_Timer.i \
- ${ACE_ROOT}/ace/Profile_Timer.i
-context_switch_time.o: context_switch_time.cpp \
- ${ACE_ROOT}/ace/Sched_Params.h \
- ${ACE_ROOT}/ace/OS.h \
- ${ACE_ROOT}/ace/config.h \
- ${ACE_ROOT}/ace/stdcpp.h \
- ${ACE_ROOT}/ace/OS.i \
- ${ACE_ROOT}/ace/Trace.h \
- ${ACE_ROOT}/ace/Log_Msg.h \
- ${ACE_ROOT}/ace/Log_Record.h \
- ${ACE_ROOT}/ace/ACE.h \
- ${ACE_ROOT}/ace/ACE.i \
- ${ACE_ROOT}/ace/Log_Priority.h \
- ${ACE_ROOT}/ace/Log_Record.i \
- ${ACE_ROOT}/ace/Sched_Params.i \
- ${ACE_ROOT}/ace/Task.h \
- ${ACE_ROOT}/ace/Service_Object.h \
- ${ACE_ROOT}/ace/Shared_Object.h \
- ${ACE_ROOT}/ace/Shared_Object.i \
- ${ACE_ROOT}/ace/Event_Handler.h \
- ${ACE_ROOT}/ace/Event_Handler.i \
- ${ACE_ROOT}/ace/Service_Object.i \
- ${ACE_ROOT}/ace/Thread_Manager.h \
- ${ACE_ROOT}/ace/Thread.h \
- ${ACE_ROOT}/ace/Thread.i \
- ${ACE_ROOT}/ace/Synch.h \
- ${ACE_ROOT}/ace/SV_Semaphore_Complex.h \
- ${ACE_ROOT}/ace/SV_Semaphore_Simple.h \
- ${ACE_ROOT}/ace/SV_Semaphore_Simple.i \
- ${ACE_ROOT}/ace/SV_Semaphore_Complex.i \
- ${ACE_ROOT}/ace/Synch.i \
- ${ACE_ROOT}/ace/Synch_T.h \
- ${ACE_ROOT}/ace/Synch_T.i \
- ${ACE_ROOT}/ace/Synch_T.cpp \
- ${ACE_ROOT}/ace/Thread_Manager.i \
- ${ACE_ROOT}/ace/Task.i \
- ${ACE_ROOT}/ace/Task_T.h \
- ${ACE_ROOT}/ace/Message_Queue.h \
- ${ACE_ROOT}/ace/Message_Block.h \
- ${ACE_ROOT}/ace/Malloc.h \
- ${ACE_ROOT}/ace/Malloc.i \
- ${ACE_ROOT}/ace/Malloc_T.h \
- ${ACE_ROOT}/ace/Free_List.h \
- ${ACE_ROOT}/ace/Free_List.i \
- ${ACE_ROOT}/ace/Free_List.cpp \
- ${ACE_ROOT}/ace/Malloc_T.i \
- ${ACE_ROOT}/ace/Malloc_T.cpp \
- ${ACE_ROOT}/ace/Memory_Pool.h \
- ${ACE_ROOT}/ace/Signal.h \
- ${ACE_ROOT}/ace/Containers.h \
- ${ACE_ROOT}/ace/Containers.i \
- ${ACE_ROOT}/ace/Containers.cpp \
- ${ACE_ROOT}/ace/Signal.i \
- ${ACE_ROOT}/ace/Mem_Map.h \
- ${ACE_ROOT}/ace/Mem_Map.i \
- ${ACE_ROOT}/ace/Memory_Pool.i \
- ${ACE_ROOT}/ace/Message_Block.i \
- ${ACE_ROOT}/ace/IO_Cntl_Msg.h \
- ${ACE_ROOT}/ace/Strategies.h \
- ${ACE_ROOT}/ace/Strategies_T.h \
- ${ACE_ROOT}/ace/Service_Config.h \
- ${ACE_ROOT}/ace/Service_Config.i \
- ${ACE_ROOT}/ace/Reactor.h \
- ${ACE_ROOT}/ace/Handle_Set.h \
- ${ACE_ROOT}/ace/Handle_Set.i \
- ${ACE_ROOT}/ace/Timer_Queue.h \
- ${ACE_ROOT}/ace/Timer_Queue_T.h \
- ${ACE_ROOT}/ace/Time_Value.h \
- ${ACE_ROOT}/ace/Timer_Queue_T.i \
- ${ACE_ROOT}/ace/Timer_Queue_T.cpp \
- ${ACE_ROOT}/ace/Token.h \
- ${ACE_ROOT}/ace/Token.i \
- ${ACE_ROOT}/ace/Pipe.h \
- ${ACE_ROOT}/ace/Pipe.i \
- ${ACE_ROOT}/ace/SOCK_Stream.h \
- ${ACE_ROOT}/ace/SOCK_IO.h \
- ${ACE_ROOT}/ace/SOCK.h \
- ${ACE_ROOT}/ace/Addr.h \
- ${ACE_ROOT}/ace/Addr.i \
- ${ACE_ROOT}/ace/IPC_SAP.h \
- ${ACE_ROOT}/ace/IPC_SAP.i \
- ${ACE_ROOT}/ace/SOCK.i \
- ${ACE_ROOT}/ace/SOCK_IO.i \
- ${ACE_ROOT}/ace/INET_Addr.h \
- ${ACE_ROOT}/ace/INET_Addr.i \
- ${ACE_ROOT}/ace/SOCK_Stream.i \
- ${ACE_ROOT}/ace/Reactor.i \
- ${ACE_ROOT}/ace/Proactor.h \
- ${ACE_ROOT}/ace/Asynch_IO.h \
- ${ACE_ROOT}/ace/Timer_List.h \
- ${ACE_ROOT}/ace/Timer_List_T.h \
- ${ACE_ROOT}/ace/Timer_List_T.cpp \
- ${ACE_ROOT}/ace/Timer_Heap.h \
- ${ACE_ROOT}/ace/Timer_Heap_T.h \
- ${ACE_ROOT}/ace/Timer_Heap_T.cpp \
- ${ACE_ROOT}/ace/Timer_Wheel.h \
- ${ACE_ROOT}/ace/Timer_Wheel_T.h \
- ${ACE_ROOT}/ace/Timer_Wheel_T.cpp \
- ${ACE_ROOT}/ace/High_Res_Timer.h \
- ${ACE_ROOT}/ace/High_Res_Timer.i \
- ${ACE_ROOT}/ace/ReactorEx.h \
- ${ACE_ROOT}/ace/ReactorEx.i \
- ${ACE_ROOT}/ace/Svc_Conf_Tokens.h \
- ${ACE_ROOT}/ace/Synch_Options.h \
- ${ACE_ROOT}/ace/Hash_Map_Manager.h \
- ${ACE_ROOT}/ace/Hash_Map_Manager.cpp \
- ${ACE_ROOT}/ace/Strategies_T.cpp \
- ${ACE_ROOT}/ace/Message_Queue.i \
- ${ACE_ROOT}/ace/Message_Queue.cpp \
- ${ACE_ROOT}/ace/Task_T.i \
- ${ACE_ROOT}/ace/Task_T.cpp \
- ${ACE_ROOT}/ace/Module.h \
- ${ACE_ROOT}/ace/Module.i \
- ${ACE_ROOT}/ace/Module.cpp \
- ${ACE_ROOT}/ace/Stream_Modules.h \
- ${ACE_ROOT}/ace/Stream_Modules.i \
- ${ACE_ROOT}/ace/Stream_Modules.cpp \
- ${ACE_ROOT}/ace/Get_Opt.h \
- ${ACE_ROOT}/ace/Get_Opt.i
-test_mutex.o: test_mutex.cpp \
- ${ACE_ROOT}/ace/Log_Msg.h \
- ${ACE_ROOT}/ace/Log_Record.h \
- ${ACE_ROOT}/ace/ACE.h \
- ${ACE_ROOT}/ace/OS.h \
- ${ACE_ROOT}/ace/config.h \
- ${ACE_ROOT}/ace/stdcpp.h \
- ${ACE_ROOT}/ace/OS.i \
- ${ACE_ROOT}/ace/Trace.h \
- ${ACE_ROOT}/ace/ACE.i \
- ${ACE_ROOT}/ace/Log_Priority.h \
- ${ACE_ROOT}/ace/Log_Record.i \
- ${ACE_ROOT}/ace/Profile_Timer.h \
- ${ACE_ROOT}/ace/Time_Value.h \
- ${ACE_ROOT}/ace/High_Res_Timer.h \
- ${ACE_ROOT}/ace/High_Res_Timer.i \
- ${ACE_ROOT}/ace/Profile_Timer.i
-test_singleton.o: test_singleton.cpp \
- ${ACE_ROOT}/ace/Profile_Timer.h \
- ${ACE_ROOT}/ace/ACE.h \
- ${ACE_ROOT}/ace/OS.h \
- ${ACE_ROOT}/ace/config.h \
- ${ACE_ROOT}/ace/stdcpp.h \
- ${ACE_ROOT}/ace/OS.i \
- ${ACE_ROOT}/ace/Trace.h \
- ${ACE_ROOT}/ace/Log_Msg.h \
- ${ACE_ROOT}/ace/Log_Record.h \
- ${ACE_ROOT}/ace/Log_Priority.h \
- ${ACE_ROOT}/ace/Log_Record.i \
- ${ACE_ROOT}/ace/ACE.i \
- ${ACE_ROOT}/ace/Time_Value.h \
- ${ACE_ROOT}/ace/High_Res_Timer.h \
- ${ACE_ROOT}/ace/High_Res_Timer.i \
- ${ACE_ROOT}/ace/Profile_Timer.i \
- ${ACE_ROOT}/ace/Singleton.h \
- ${ACE_ROOT}/ace/Synch.h \
- ${ACE_ROOT}/ace/SV_Semaphore_Complex.h \
- ${ACE_ROOT}/ace/SV_Semaphore_Simple.h \
- ${ACE_ROOT}/ace/SV_Semaphore_Simple.i \
- ${ACE_ROOT}/ace/SV_Semaphore_Complex.i \
- ${ACE_ROOT}/ace/Synch.i \
- ${ACE_ROOT}/ace/Synch_T.h \
- ${ACE_ROOT}/ace/Event_Handler.h \
- ${ACE_ROOT}/ace/Event_Handler.i \
- ${ACE_ROOT}/ace/Synch_T.i \
- ${ACE_ROOT}/ace/Thread.h \
- ${ACE_ROOT}/ace/Thread.i \
- ${ACE_ROOT}/ace/Synch_T.cpp \
- ${ACE_ROOT}/ace/Singleton.i \
- ${ACE_ROOT}/ace/Singleton.cpp
-test_naming.o: test_naming.cpp \
- ${ACE_ROOT}/ace/SString.h \
- ${ACE_ROOT}/ace/ACE.h \
- ${ACE_ROOT}/ace/OS.h \
- ${ACE_ROOT}/ace/config.h \
- ${ACE_ROOT}/ace/stdcpp.h \
- ${ACE_ROOT}/ace/OS.i \
- ${ACE_ROOT}/ace/Trace.h \
- ${ACE_ROOT}/ace/Log_Msg.h \
- ${ACE_ROOT}/ace/Log_Record.h \
- ${ACE_ROOT}/ace/Log_Priority.h \
- ${ACE_ROOT}/ace/Log_Record.i \
- ${ACE_ROOT}/ace/ACE.i \
- ${ACE_ROOT}/ace/SString.i \
- ${ACE_ROOT}/ace/Naming_Context.h \
- ${ACE_ROOT}/ace/Containers.h \
- ${ACE_ROOT}/ace/Containers.i \
- ${ACE_ROOT}/ace/Containers.cpp \
- ${ACE_ROOT}/ace/Service_Object.h \
- ${ACE_ROOT}/ace/Shared_Object.h \
- ${ACE_ROOT}/ace/Shared_Object.i \
- ${ACE_ROOT}/ace/Event_Handler.h \
- ${ACE_ROOT}/ace/Event_Handler.i \
- ${ACE_ROOT}/ace/Service_Object.i \
- ${ACE_ROOT}/ace/Name_Proxy.h \
- ${ACE_ROOT}/ace/INET_Addr.h \
- ${ACE_ROOT}/ace/Addr.h \
- ${ACE_ROOT}/ace/Addr.i \
- ${ACE_ROOT}/ace/INET_Addr.i \
- ${ACE_ROOT}/ace/SOCK_Connector.h \
- ${ACE_ROOT}/ace/SOCK_Stream.h \
- ${ACE_ROOT}/ace/SOCK_IO.h \
- ${ACE_ROOT}/ace/SOCK.h \
- ${ACE_ROOT}/ace/IPC_SAP.h \
- ${ACE_ROOT}/ace/IPC_SAP.i \
- ${ACE_ROOT}/ace/SOCK.i \
- ${ACE_ROOT}/ace/SOCK_IO.i \
- ${ACE_ROOT}/ace/SOCK_Stream.i \
- ${ACE_ROOT}/ace/Time_Value.h \
- ${ACE_ROOT}/ace/SOCK_Connector.i \
- ${ACE_ROOT}/ace/Service_Config.h \
- ${ACE_ROOT}/ace/Thread_Manager.h \
- ${ACE_ROOT}/ace/Thread.h \
- ${ACE_ROOT}/ace/Thread.i \
- ${ACE_ROOT}/ace/Synch.h \
- ${ACE_ROOT}/ace/SV_Semaphore_Complex.h \
- ${ACE_ROOT}/ace/SV_Semaphore_Simple.h \
- ${ACE_ROOT}/ace/SV_Semaphore_Simple.i \
- ${ACE_ROOT}/ace/SV_Semaphore_Complex.i \
- ${ACE_ROOT}/ace/Synch.i \
- ${ACE_ROOT}/ace/Synch_T.h \
- ${ACE_ROOT}/ace/Synch_T.i \
- ${ACE_ROOT}/ace/Synch_T.cpp \
- ${ACE_ROOT}/ace/Thread_Manager.i \
- ${ACE_ROOT}/ace/Signal.h \
- ${ACE_ROOT}/ace/Signal.i \
- ${ACE_ROOT}/ace/Service_Config.i \
- ${ACE_ROOT}/ace/Reactor.h \
- ${ACE_ROOT}/ace/Handle_Set.h \
- ${ACE_ROOT}/ace/Handle_Set.i \
- ${ACE_ROOT}/ace/Timer_Queue.h \
- ${ACE_ROOT}/ace/Timer_Queue_T.h \
- ${ACE_ROOT}/ace/Free_List.h \
- ${ACE_ROOT}/ace/Free_List.i \
- ${ACE_ROOT}/ace/Free_List.cpp \
- ${ACE_ROOT}/ace/Timer_Queue_T.i \
- ${ACE_ROOT}/ace/Timer_Queue_T.cpp \
- ${ACE_ROOT}/ace/Token.h \
- ${ACE_ROOT}/ace/Token.i \
- ${ACE_ROOT}/ace/Pipe.h \
- ${ACE_ROOT}/ace/Pipe.i \
- ${ACE_ROOT}/ace/Reactor.i \
- ${ACE_ROOT}/ace/Proactor.h \
- ${ACE_ROOT}/ace/Asynch_IO.h \
- ${ACE_ROOT}/ace/Timer_List.h \
- ${ACE_ROOT}/ace/Timer_List_T.h \
- ${ACE_ROOT}/ace/Timer_List_T.cpp \
- ${ACE_ROOT}/ace/Timer_Heap.h \
- ${ACE_ROOT}/ace/Timer_Heap_T.h \
- ${ACE_ROOT}/ace/Timer_Heap_T.cpp \
- ${ACE_ROOT}/ace/Timer_Wheel.h \
- ${ACE_ROOT}/ace/Timer_Wheel_T.h \
- ${ACE_ROOT}/ace/Timer_Wheel_T.cpp \
- ${ACE_ROOT}/ace/High_Res_Timer.h \
- ${ACE_ROOT}/ace/High_Res_Timer.i \
- ${ACE_ROOT}/ace/ReactorEx.h \
- ${ACE_ROOT}/ace/Message_Queue.h \
- ${ACE_ROOT}/ace/Message_Block.h \
- ${ACE_ROOT}/ace/Malloc.h \
- ${ACE_ROOT}/ace/Malloc.i \
- ${ACE_ROOT}/ace/Malloc_T.h \
- ${ACE_ROOT}/ace/Malloc_T.i \
- ${ACE_ROOT}/ace/Malloc_T.cpp \
- ${ACE_ROOT}/ace/Memory_Pool.h \
- ${ACE_ROOT}/ace/Mem_Map.h \
- ${ACE_ROOT}/ace/Mem_Map.i \
- ${ACE_ROOT}/ace/Memory_Pool.i \
- ${ACE_ROOT}/ace/Message_Block.i \
- ${ACE_ROOT}/ace/IO_Cntl_Msg.h \
- ${ACE_ROOT}/ace/Strategies.h \
- ${ACE_ROOT}/ace/Strategies_T.h \
- ${ACE_ROOT}/ace/Synch_Options.h \
- ${ACE_ROOT}/ace/Hash_Map_Manager.h \
- ${ACE_ROOT}/ace/Hash_Map_Manager.cpp \
- ${ACE_ROOT}/ace/Strategies_T.cpp \
- ${ACE_ROOT}/ace/Message_Queue.i \
- ${ACE_ROOT}/ace/Message_Queue.cpp \
- ${ACE_ROOT}/ace/ReactorEx.i \
- ${ACE_ROOT}/ace/Svc_Conf_Tokens.h \
- ${ACE_ROOT}/ace/Name_Request_Reply.h \
- ${ACE_ROOT}/ace/Name_Space.h \
- ${ACE_ROOT}/ace/Profile_Timer.h \
- ${ACE_ROOT}/ace/Profile_Timer.i
+.obj/basic_func.o .shobj/basic_func.so: basic_func.cpp basic_func.h
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY