Merge pull request #1161 from mitza-oci/rwlock

ACE_OS::rwlock_init: On Win32, use unnamed kernel objects (Events and Semaphores) for USYNC_THREAD

Author: mitza-oci

ACE/ace/OS_NS_Thread.cpp

@@ -3134,14 +3134,36 @@ ACE_OS::lwp_setparams (const ACE_Sched_Params &sched_params)
 #if defined ACE_HAS_THREADS && defined ACE_LACKS_RWLOCK_T
 namespace {
 struct UniqueName {
-  explicit UniqueName (const void *addr)
+  UniqueName (int type, const void *addr)
   {
+#ifdef ACE_WIN32
+    if (type == USYNC_THREAD)
+      {
+        this->named_ = false;
+        return;
+      }
+    this->named_ = true;
+#else
+    ACE_UNUSED_ARG (type);
+#endif
     ACE_OS::unique_name (addr, &this->buffer_[0], ACE_UNIQUE_NAME_LEN);
   }
 
-  operator const ACE_TCHAR * () const { return &this->buffer_[0]; }
+  operator const ACE_TCHAR * () const
+  {
+#ifdef ACE_WIN32
+    if (!this->named_)
+      {
+        return 0;
+      }
+#endif
+    return &this->buffer_[0];
+  }
 
   ACE_TCHAR buffer_[ACE_UNIQUE_NAME_LEN];
+#ifdef ACE_WIN32
+  bool named_;
+#endif
 };
 
 enum RWLockCleanup {RWLC_CondAttr, RWLC_Lock, RWLC_CondReaders, RWLC_CondWriters};
@@ -3196,23 +3218,24 @@ ACE_OS::rwlock_init (ACE_rwlock_t *rw,
 
   RWLockCleaner cleanup (attributes, rw);
 
-  if (ACE_OS::mutex_init (&rw->lock_, type, UniqueName (&rw->lock_),
+  if (ACE_OS::mutex_init (&rw->lock_, type, UniqueName (type, &rw->lock_),
                           (ACE_mutexattr_t *) arg) != 0)
     return -1;
 
   cleanup.state_ = RWLC_Lock;
   if (ACE_OS::cond_init (&rw->waiting_readers_, attributes,
-                         UniqueName (&rw->waiting_readers_), arg) != 0)
+                         UniqueName (type, &rw->waiting_readers_), arg) != 0)
     return -1;
 
   cleanup.state_ = RWLC_CondReaders;
   if (ACE_OS::cond_init (&rw->waiting_writers_, attributes,
-                         UniqueName (&rw->waiting_writers_), arg) != 0)
+                         UniqueName (type, &rw->waiting_writers_), arg) != 0)
     return -1;
 
   cleanup.state_ = RWLC_CondWriters;
   if (ACE_OS::cond_init (&rw->waiting_important_writer_, attributes,
-                         UniqueName (&rw->waiting_important_writer_), arg) != 0)
+                         UniqueName (type, &rw->waiting_important_writer_),
+                         arg) != 0)
     return -1;
 
   cleanup.state_ = RWLC_CondAttr;