Merge pull request #318 from DOCGroup/revert-176-master

Revert "some (bundled) minor changes (take 2)"
DOCGroup · Oct 31, 2016 · fb9da42 · fb9da42
2 parents bd5aaab + 8390b59
commit fb9da42
Show file tree

Hide file tree

Showing 63 changed files with 171 additions and 303 deletions.
diff --git a/.gitignore b/.gitignore
@@ -16,9 +16,6 @@
 *S_T.h
 *S_T.inl
 
-*.iobj
-*.ipdb
-
 .depend.*
 GNUmakefile*
 *.ior
@@ -41,4 +38,3 @@ ipch/
 *.res
 *.opendb
 *.VC.db
-build
diff --git a/ACE/NEWS b/ACE/NEWS
@@ -1,28 +1,6 @@
 USER VISIBLE CHANGES BETWEEN ACE-6.4.1 and ACE-6.4.2
 ====================================================
 
-. Added support for getpwnam_r on Solaris 11
-
-. ACE_OSTREAM_TYPE uses the std namespace where applicable
-
-. ACE_WIN32_Asynch_Operation::cancel() uses CancelIOEx on Windows Vista and
-  above
-
-. Bugfix of exported template specializations on Win32 platforms
-  (specifically, ACE_Condition_Recursive_Thread_Mutex)
-
-. Fixed potential memory leak when using the ACE_WIN32_Proactor
-
-. Header sanitizations (specifically, ace/Synch.h)
-
-. Fixed a race condition in ACE_Thread_Manager::task_wait() on Win32
-
-. A (major) cleanup of timer queue code
-
-. Repaired the ACE_Timer_Hash class. This class code was unused for a while
-  and essentially broken due to bit-rot. It is now another (meta-)implementation
-  that can be used stand-alone, or with the other timer queue implementations
-
 USER VISIBLE CHANGES BETWEEN ACE-6.4.0 and ACE-6.4.1
 ====================================================
 

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
 
-ACE_ALLOC_HOOK_DEFINE (ACE_Condition<ACE_Recursive_Thread_Mutex>)
+int
+ACE_Condition<ACE_Recursive_Thread_Mutex>::remove (void)
+{
+  return ACE_OS::cond_destroy (&this->cond_);
+}
 
 void
 ACE_Condition<ACE_Recursive_Thread_Mutex>::dump (void) const
@@ -37,6 +37,11 @@ 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)
 {
@@ -55,11 +60,6 @@ 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,6 +108,24 @@ 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,16 +23,12 @@
 #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
@@ -90,9 +86,6 @@ 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.
@@ -108,23 +101,11 @@ class ACE_Export ACE_Condition<ACE_Recursive_Thread_Mutex>
   ACE_Recursive_Thread_Mutex &mutex_;
 
 };
-// prevent implicit instantiations by includers to relieve the linker
-#if defined (ACE_HAS_CPP11_EXTERN_TEMPLATES)
-# if defined (ACE_LACKS_CPP11_EXTERN_TEMPLATE_ATTRIBUTES)
-extern template class ACE_Condition<ACE_Recursive_Thread_Mutex>;
-# else
-extern template ACE_Export class ACE_Condition<ACE_Recursive_Thread_Mutex>;
-# endif /* ACE_LACKS_CPP11_EXTERN_TEMPLATE_ATTRIBUTES */
-#endif /* ACE_HAS_CPP11_EXTERN_TEMPLATES */
 
 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
diff --git a/ACE/ace/Future.h b/ACE/ace/Future.h
@@ -26,6 +26,8 @@
 #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,14 +56,6 @@ 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,10 +20,6 @@
 # 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.cpp b/ACE/ace/Timer_Queue_Adapters.cpp
@@ -276,7 +276,7 @@ ACE_Thread_Timer_Queue_Adapter<TQ, TYPE>::svc (void)
             {
               // The earliest time on the Timer_Queue lies in future;
               // convert the tv to an absolute time.
-              ACE_Time_Value const tv = tv_curr + (tv_earl - tv_curr);
+              ACE_Time_Value const tv = this->timer_queue_->gettimeofday () + (tv_earl - tv_curr);
               // ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("waiting until %u.%3.3u secs\n"),
               // tv.sec(), tv.msec()));
               this->condition_.wait (&tv);

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/Synch_Traits.h"
+#include "ace/Condition_Recursive_Thread_Mutex.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,12 +175,7 @@ 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_,
-                                         0);
-#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,12 +636,6 @@ 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
@@ -382,9 +382,7 @@ 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
@@ -394,7 +392,6 @@ 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 {
@@ -407,9 +404,7 @@ 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
@@ -464,7 +459,6 @@ 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-g++-common.h b/ACE/ace/config-g++-common.h
@@ -38,22 +38,7 @@
 # if __cplusplus > 201103L
 #  define ACE_HAS_CPP14
 # endif
-#endif /* __GNUC__ >= 4.7 */
-
-// *NOTE*: this feature may go back further, see e.g.:
-//         https://gcc.gnu.org/projects/cxx0x.html
-#if defined (ACE_HAS_CPP11)
-# if (__GNUC__ >= 5 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3))
-#  define ACE_HAS_CPP11_EXTERN_TEMPLATES
-# endif /* __GNUC__ >= 4.3 */
-
-// *NOTE*: suppress a warning, g++ 5.2.1 does not support attributes on template
-// instantiation declarations
-// *TODO*: this probably goes back further than 5.2
-# if (__GNUC__ >= 6 || (__GNUC__ == 5 && __GNUC_MINOR__ >= 2))
-#  define ACE_LACKS_CPP11_EXTERN_TEMPLATE_ATTRIBUTES
-# endif /* __GNUC__ >= 5.2 */
-#endif /* ACE_HAS_CPP11 */
+#endif
 
 #if (defined (i386) || defined (__i386__)) && !defined (ACE_SIZEOF_LONG_DOUBLE)
 # define ACE_SIZEOF_LONG_DOUBLE 12

diff --git a/ACE/ace/config-macros.h b/ACE/ace/config-macros.h
@@ -49,11 +49,7 @@
 # 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,7 +10,4 @@
 // #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/ace/config-win32-msvc-14.h b/ACE/ace/config-win32-msvc-14.h
@@ -41,10 +41,6 @@
 // Visual Studio 2015 has adequate C++11 support
 #define ACE_HAS_CPP11
 
-// *TODO*: this C++11-feature goes back further (at least to MSVC 2010), see:
-//         https://msdn.microsoft.com/en-us/library/hh567368.aspx#featurelist
-#define ACE_HAS_CPP11_EXTERN_TEMPLATES
-
 #define ACE_PUTENV_EQUIVALENT ::_putenv
 #define ACE_TEMPNAM_EQUIVALENT ::_tempnam
 #define ACE_STRDUP_EQUIVALENT ::_strdup

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/SOCK_Acceptor.h"
 #include "ace/Svc_Handler.h"
-#include "ace/Synch_Traits.h"
+#include "ace/SOCK_Acceptor.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/Free_List.h"
+#include "ace/Synch.h"
 #include "ace/Malloc.h"
-#include "ace/Synch_Traits.h"
+#include "ace/Free_List.h"
 
 #define JAWS_DEFAULT_ALLOCATOR_CHUNKS 10
 #define JAWS_CACHED_ALLOCATOR(T) \