DOCGroup · jwillemsen · Oct 31, 2016 · Dec 1, 2015 · Dec 1, 2015 · Dec 1, 2015
diff --git a/ACE/ace/Condition_Recursive_Thread_Mutex.cpp b/ACE/ace/Condition_Recursive_Thread_Mutex.cpp
@@ -12,15 +12,15 @@
 
 #if defined (ACE_HAS_THREADS)
 
+#if !defined (__ACE_INLINE__)
+#include "ace/Condition_Recursive_Thread_Mutex.inl"
+#endif /* __ACE_INLINE__ */
+
 #include "ace/Log_Category.h"
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
-int
-ACE_Condition<ACE_Recursive_Thread_Mutex>::remove (void)
-{
-  return ACE_OS::cond_destroy (&this->cond_);
-}
+ACE_ALLOC_HOOK_DEFINE (ACE_Condition<ACE_Recursive_Thread_Mutex>)
 
 void
 ACE_Condition<ACE_Recursive_Thread_Mutex>::dump (void) const
@@ -37,11 +37,6 @@ ACE_Condition<ACE_Recursive_Thread_Mutex>::dump (void) const
 #endif /* ACE_HAS_DUMP */
 }
 
-ACE_Condition<ACE_Recursive_Thread_Mutex>::~ACE_Condition (void)
-{
-  this->remove ();
-}
-
 ACE_Condition<ACE_Recursive_Thread_Mutex>::ACE_Condition (ACE_Recursive_Thread_Mutex &m)
   : mutex_ (m)
 {
@@ -60,6 +55,11 @@ ACE_Condition<ACE_Recursive_Thread_Mutex>::ACE_Condition (ACE_Recursive_Thread_M
                 ACE_TEXT ("ACE_Condition<ACE_Recursive_Thread_Mutex>::ACE_Condition<ACE_Recursive_Thread_Mutex>")));
 }
 
+ACE_Condition<ACE_Recursive_Thread_Mutex>::~ACE_Condition (void)
+{
+  this->remove ();
+}
+
 int
 ACE_Condition<ACE_Recursive_Thread_Mutex>::wait (const ACE_Time_Value *abstime)
 {
@@ -108,24 +108,6 @@ ACE_Condition<ACE_Recursive_Thread_Mutex>::wait (ACE_Recursive_Thread_Mutex &mut
   return result;
 }
 
-int
-ACE_Condition<ACE_Recursive_Thread_Mutex>::signal (void)
-{
-  return ACE_OS::cond_signal (&this->cond_);
-}
-
-int
-ACE_Condition<ACE_Recursive_Thread_Mutex>::broadcast (void)
-{
-  return ACE_OS::cond_broadcast (&this->cond_);
-}
-
-ACE_Recursive_Thread_Mutex &
-ACE_Condition<ACE_Recursive_Thread_Mutex>::mutex (void)
-{
-  return this->mutex_;
-}
-
 ACE_END_VERSIONED_NAMESPACE_DECL
 
 #endif /* ACE_HAS_THREADS */
diff --git a/ACE/ace/Condition_Recursive_Thread_Mutex.h b/ACE/ace/Condition_Recursive_Thread_Mutex.h
@@ -23,12 +23,16 @@
 #if !defined (ACE_HAS_THREADS)
 #  include "ace/Null_Condition.h"
 #else /* ACE_HAS_THREADS */
+// ACE platform supports some form of threading.
+
 #include "ace/Recursive_Thread_Mutex.h"
 #include "ace/Condition_Attributes.h"
 #include "ace/Condition_T.h"
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
+class ACE_Time_Value;
+
 /**
  * @brief ACE_Condition template specialization written using
  *  @a ACE_Recursive_Thread_Mutex.  This allows threads to block until
@@ -86,6 +90,9 @@ class ACE_Export ACE_Condition<ACE_Recursive_Thread_Mutex>
   /// Dump the state of an object.
   void dump (void) const;
 
+  /// Declare the dynamic allocation hooks.
+  ACE_ALLOC_HOOK_DECLARE;
+
 private:
 
   // = Prevent assignment and copying.
@@ -101,11 +108,22 @@ class ACE_Export ACE_Condition<ACE_Recursive_Thread_Mutex>
   ACE_Recursive_Thread_Mutex &mutex_;
 
 };
+// *NOTE*: prevent implicit instantiations by includees to relieve the linker
+#if defined (__GNUG__)
+// g++ (5.2.1) does not support attributes on explicit template instantiations
+extern template class ACE_Condition<ACE_Recursive_Thread_Mutex>;
+#else
+extern template ACE_Export class ACE_Condition<ACE_Recursive_Thread_Mutex>;
+#endif /* __GNUG__ */
 
 typedef ACE_Condition<ACE_Recursive_Thread_Mutex> ACE_Condition_Recursive_Thread_Mutex;
 
 ACE_END_VERSIONED_NAMESPACE_DECL
 
+#if defined (__ACE_INLINE__)
+#include "ace/Condition_Recursive_Thread_Mutex.inl"
+#endif /* __ACE_INLINE__ */
+
 #endif /* !ACE_HAS_THREADS */
 
 #include /**/ "ace/post.h"

diff --git a/ACE/ace/Condition_Recursive_Thread_Mutex.inl b/ACE/ace/Condition_Recursive_Thread_Mutex.inl
@@ -0,0 +1,28 @@
+// -*- C++ -*-
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
+ACE_INLINE int
+ACE_Condition<ACE_Recursive_Thread_Mutex>::remove (void)
+{
+  return ACE_OS::cond_destroy (&this->cond_);
+}
+
+ACE_INLINE ACE_Recursive_Thread_Mutex &
+ACE_Condition<ACE_Recursive_Thread_Mutex>::mutex (void)
+{
+  return this->mutex_;
+}
+
+ACE_INLINE int
+ACE_Condition<ACE_Recursive_Thread_Mutex>::signal (void)
+{
+  return ACE_OS::cond_signal (&this->cond_);
+}
+
+ACE_INLINE int
+ACE_Condition<ACE_Recursive_Thread_Mutex>::broadcast (void)
+{
+  return ACE_OS::cond_broadcast (&this->cond_);
+}
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/Future.h b/ACE/ace/Future.h
@@ -26,8 +26,6 @@
 #if defined (ACE_HAS_THREADS)
 
 #include "ace/Synch_Traits.h"
-#include "ace/Recursive_Thread_Mutex.h"
-#include "ace/Condition_Recursive_Thread_Mutex.h"
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 

diff --git a/ACE/ace/OS_NS_pwd.inl b/ACE/ace/OS_NS_pwd.inl
@@ -56,6 +56,14 @@ ACE_OS::getpwnam_r (const char *name,
     }
   *result = pwd;
   return 0;
+#elif defined (ACE_HAS_SOLARIS11_GETPWNAM_R)
+  if (::getpwnam_r (name, pwd, buffer, bufsize) == 0)
+  {
+    *result = 0;
+    return -1;
+  }
+  *result = pwd;
+  return 0;
 #elif defined (ACE_HAS_STHREADS)
   if (::getpwnam_r (name, pwd, buffer, bufsize) != 0)
     {

diff --git a/ACE/ace/Synch.h b/ACE/ace/Synch.h
@@ -20,6 +20,10 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+// *NOTE*: never never never ever #include this file in a header
+//         --> #include "ace/Synch_Traits.h" instead and #include "ace/Synch.h"
+//             in the .cpp. This prevents multiple implicit template
+//             instantiations (linker errors on MSVC)
 #if !defined (DO_NOT_INCLUDE_SYNCH_H)
 
 /* All the classes have been moved out into their own headers as part of

diff --git a/ACE/ace/Timer_Queue_Adapters.h b/ACE/ace/Timer_Queue_Adapters.h
@@ -21,7 +21,7 @@
 
 #include "ace/Signal.h"
 #include "ace/Sig_Handler.h"
-#include "ace/Condition_Recursive_Thread_Mutex.h"
+#include "ace/Synch_Traits.h"
 
 #if defined (ACE_HAS_DEFERRED_TIMER_COMMANDS)
 #  include "ace/Unbounded_Queue.h"

diff --git a/ACE/ace/WIN32_Asynch_IO.cpp b/ACE/ace/WIN32_Asynch_IO.cpp
@@ -175,7 +175,12 @@ ACE_WIN32_Asynch_Operation::cancel (void)
 
   // @@ This API returns 0 on failure. So, I am returning -1 in that
   //    case. Is that right? (Alex).
+#if (_WIN32_WINNT < 0x0600)
   int const result = (int) ::CancelIo (this->handle_);
+#else
+  int const result = (int) ::CancelIoEx (this->handle_,
+                                         NULL);
+#endif /* _WIN32_WINNT < 0x0600 */
 
   if (result == 0)
     // Couldn't cancel the operations.

diff --git a/ACE/ace/WIN32_Proactor.cpp b/ACE/ace/WIN32_Proactor.cpp
@@ -636,6 +636,12 @@ ACE_WIN32_Proactor::application_specific_code (ACE_WIN32_Asynch_Result *asynch_r
                                                const void *completion_key,
                                                u_long error)
 {
+  // *NOTE*: on Win32 with MSVC (ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS set), this
+  //         needs to be compiled with '/EHa' to work properly, otherwise
+  //         'finally' is skipped, leaking memory
+  // *TODO*: the default (auto-)generated MPC MSVC project files do not enforce
+  //         this (uses '/EHsc', see $MPC_ROOT/templates/nmakedll.mpt:36)
+  // *WORKAROUND*: #undef(ine) ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS in config.h
   ACE_SEH_TRY
     {
       // Call completion hook

diff --git a/ACE/ace/ace.mpc b/ACE/ace/ace.mpc
@@ -3,6 +3,10 @@ project(ACE) : ace_output, acedefaults, install, other, codecs, token, svcconf,
   avoids       = ace_for_tao
   sharedname   = ACE
   dynamicflags += ACE_BUILD_DLL
+//  specific(prop:microsoft) {
+//      compile_flags -= /EHsc
+//      compile_flags += /EHa
+//  }
 
   Source_Files(ACE_COMPONENTS) {
     ACE.cpp
@@ -382,7 +386,9 @@ project(ACE) : ace_output, acedefaults, install, other, codecs, token, svcconf,
 
   Inline_Files {
     Bound_Ptr.inl
+    Condition_Recursive_Thread_Mutex.inl
     Condition_T.inl
+    Condition_Thread_Mutex.inl
     Guard_T.inl
     Handle_Gobbler.inl
     Intrusive_Auto_Ptr.inl
@@ -392,6 +398,7 @@ project(ACE) : ace_output, acedefaults, install, other, codecs, token, svcconf,
     Reverse_Lock_T.inl
     TSS_T.inl
     Time_Value_T.inl
+    Timer_Queue_Adapters.inl
   }
 
   Header_Files {
@@ -404,7 +411,9 @@ project(ACE) : ace_output, acedefaults, install, other, codecs, token, svcconf,
     Codeset_Symbols.h
     CORBA_macros.h
     Codeset_Symbols.h
+    Condition_Recursive_Thread_Mutex.h
     Condition_T.h
+    Condition_Thread_Mutex.h
     Countdown_Time.h
     Default_Constants.h
     Event_Base.h
@@ -459,6 +468,7 @@ project(ACE) : ace_output, acedefaults, install, other, codecs, token, svcconf,
     Timer_Heap.h
     Timer_List.h
     Timer_Queue.h
+    Timer_Queue_Adapters.h
     Timer_Queuefwd.h
     Timer_Wheel.h
     Truncate.h

diff --git a/ACE/ace/config-macros.h b/ACE/ace/config-macros.h
@@ -49,7 +49,11 @@
 # if defined (ACE_LACKS_IOSTREAM_TOTALLY)
 #   define ACE_OSTREAM_TYPE FILE
 # else  /* ! ACE_LACKS_IOSTREAM_TOTALLY */
+#  if defined ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB
+#   define ACE_OSTREAM_TYPE std::ostream
+#  else
 #   define ACE_OSTREAM_TYPE ostream
+#  endif /* ! ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB */
 # endif /* ! ACE_LACKS_IOSTREAM_TOTALLY */
 #endif /* ! ACE_OSTREAM_TYPE */
 

diff --git a/ACE/ace/config-sunos5.11.h b/ACE/ace/config-sunos5.11.h
@@ -10,4 +10,7 @@
 // #include the SunOS 5.10 config, then add any SunOS 5.11 updates below.
 #include "ace/config-sunos5.10.h"
 
+// *TODO*: find out how far this also hold for previous solaris releases
+#define ACE_HAS_SOLARIS11_GETPWNAM_R
+
 #endif /* ACE_CONFIG_H */
diff --git a/ACE/apps/JAWS3/http/HTTP_Service_Handler.h b/ACE/apps/JAWS3/http/HTTP_Service_Handler.h
@@ -2,10 +2,10 @@
 #ifndef JAWS_HTTP_SERVICE_HANDLER_H
 #define JAWS_HTTP_SERVICE_HANDLER_H
 
-#include "ace/Synch.h"
 #include "ace/Acceptor.h"
-#include "ace/Svc_Handler.h"
 #include "ace/SOCK_Acceptor.h"
+#include "ace/Svc_Handler.h"
+#include "ace/Synch_Traits.h"
 
 #include "jaws3/Protocol_Handler.h"
 

diff --git a/ACE/apps/JAWS3/jaws3/Cached_Allocator_T.h b/ACE/apps/JAWS3/jaws3/Cached_Allocator_T.h
@@ -3,9 +3,9 @@
 #define JAWS_CACHED_ALLOCATOR_T_H
 
 #include "ace/ACE.h"
-#include "ace/Synch.h"
-#include "ace/Malloc.h"
 #include "ace/Free_List.h"
+#include "ace/Malloc.h"
+#include "ace/Synch_Traits.h"
 
 #define JAWS_DEFAULT_ALLOCATOR_CHUNKS 10
 #define JAWS_CACHED_ALLOCATOR(T) \

diff --git a/ACE/apps/JAWS3/jaws3/Config_File.cpp b/ACE/apps/JAWS3/jaws3/Config_File.cpp
@@ -1,8 +1,9 @@
-#include "ace/OS_NS_stdlib.h"
-#include "ace/OS_NS_string.h"
 #include "ace/FILE_Connector.h"
 #include "ace/Message_Block.h"
+#include "ace/OS_NS_stdlib.h"
+#include "ace/OS_NS_string.h"
 #include "ace/Singleton.h"
+#include "ace/Synch.h"
 #include "ace/Unbounded_Queue.h"
 
 #ifndef JAWS_BUILD_DLL

diff --git a/ACE/apps/JAWS3/jaws3/Datagram.h b/ACE/apps/JAWS3/jaws3/Datagram.h
@@ -3,9 +3,9 @@
 #define JAWS_DATAGRAM_H
 
 #include "ace/Addr.h"
-#include "ace/Synch.h"
 #include "ace/Singleton.h"
 #include "ace/SOCK_Dgram.h"
+#include "ace/Synch_Traits.h"
 
 #include "jaws3/Export.h"
 #include "jaws3/Event_Completer.h"

diff --git a/ACE/apps/JAWS3/jaws3/Options.h b/ACE/apps/JAWS3/jaws3/Options.h
@@ -3,7 +3,7 @@
 #define JAWS_OPTIONS_H
 
 #include "ace/Singleton.h"
-#include "ace/Synch.h"
+#include "ace/Synch_Traits.h"
 
 #include "jaws3/Export.h"
 #include "jaws3/Config_File.h"

diff --git a/ACE/apps/JAWS3/jaws3/Signal_Task.h b/ACE/apps/JAWS3/jaws3/Signal_Task.h
@@ -2,9 +2,9 @@
 #ifndef JAWS_SIGNAL_TASK_H
 #define JAWS_SIGNAL_TASK_H
 
-#include "ace/Synch.h"
 #include "ace/Signal.h"
 #include "ace/Singleton.h"
+#include "ace/Synch_Traits.h"
 
 #include "jaws3/Export.h"
 

diff --git a/ACE/apps/JAWS3/jaws3/Symbol_Table.cpp b/ACE/apps/JAWS3/jaws3/Symbol_Table.cpp
@@ -2,6 +2,8 @@
 #define JAWS_BUILD_DLL
 #endif
 
+#include "ace/Synch.h"
+
 #include "jaws3/Symbol_Table.h"
 
 JAWS_Symbol_Table::JAWS_Symbol_Table (size_t size)

diff --git a/ACE/apps/JAWS3/jaws3/Symbol_Table.h b/ACE/apps/JAWS3/jaws3/Symbol_Table.h
@@ -3,7 +3,7 @@
 #define JAWS_SYMBOL_TABLE_H
 
 #include "ace/Hash_Map_Manager.h"
-#include "ace/Synch.h"
+#include "ace/Synch_Traits.h"
 
 #include "jaws3/Export.h"
 

diff --git a/ACE/apps/JAWS3/small/SS_Service_Handler.h b/ACE/apps/JAWS3/small/SS_Service_Handler.h
@@ -2,11 +2,11 @@
 #ifndef TERA_SS_SERVICE_HANDLER_H
 #define TERA_SS_SERVICE_HANDLER_H
 
-#include "ace/Synch.h"
 #include "ace/Acceptor.h"
-#include "ace/Svc_Handler.h"
 #include "ace/SOCK_Acceptor.h"
 #include "ace/svc_export.h"
+#include "ace/Svc_Handler.h"
+#include "ace/Synch_Traits.h"
 
 #include "jaws3/Protocol_Handler.h"