Merge epicsThreadSelfJoin fixes from 3.15

Author: anjohnson

modules/libcom/src/osi/epicsThread.cpp

@@ -88,13 +88,16 @@ extern "C" void epicsThreadCallEntryPoint ( void * pPvt )
     epicsThread * pThread =
         static_cast <epicsThread *> ( pPvt );
     bool threadDestroyed = false;
-    try {
+    {
+        epicsGuard < epicsMutex > guard ( pThread->mutex );
         pThread->pThreadDestroyed = & threadDestroyed;
+    }
+    try {
         if ( pThread->beginWait () ) {
             pThread->runable.run ();
             // The run() routine may have destroyed the epicsThread
             // object by now; pThread can only be used below here
-            // when the threadDestroyed flag is false.
+            // if the threadDestroyed flag is false.
         }
     }
     catch ( const epicsThread::exitException & ) {
@@ -145,22 +148,11 @@ void epicsThread::exitWait () throw ()
 bool epicsThread::exitWait ( const double delay ) throw ()
 {
     try {
-        // When called (usually by a destructor) in the context of
-        // the managed thread we can't wait for the thread to exit.
-        // Set the threadDestroyed flag and return success.
+        // When called in the context of the managed thread we can't
+        // wait for the thread to exit. Set cancel and return true.
         if ( this->isCurrentThread() ) {
-            if ( this->pThreadDestroyed ) {
-                *this->pThreadDestroyed = true;
-            }
-            bool j;
-            {
-                epicsGuard < epicsMutex > guard ( this->mutex );
-                j = joined;
-                joined = true;
-            }
-            if(!j) {
-                epicsThreadMustJoin(this->id);
-            }
+            epicsGuard < epicsMutex > guard ( this->mutex );
+            this->cancel = true;
             return true;
         }
         epicsTime exitWaitBegin = epicsTime::getCurrent ();
@@ -174,12 +166,6 @@ bool epicsThread::exitWait ( const double delay ) throw ()
             epicsTime current = epicsTime::getCurrent ();
             exitWaitElapsed = current - exitWaitBegin;
         }
-        if(this->terminated && !joined) {
-            joined = true;
-
-            epicsGuardRelease < epicsMutex > unguard ( guard );
-            epicsThreadMustJoin(this->id);
-        }
     }
     catch ( std :: exception & except ) {
         errlogPrintf (
@@ -203,13 +189,12 @@ epicsThread::epicsThread (
     epicsThreadRunable & runableIn, const char * pName,
         unsigned stackSize, unsigned priority ) :
     runable ( runableIn ), id ( 0 ), pThreadDestroyed ( 0 ),
-    begin ( false ), cancel ( false ), terminated ( false ),
-    joined ( false )
+    begin ( false ), cancel ( false ), terminated ( false )
 {
     epicsThreadOpts opts = EPICS_THREAD_OPTS_INIT;
     opts.stackSize = stackSize;
     opts.priority = priority;
-    opts.joinable = 1;
+    /* Don't set joinable, we have our own mechanism for that */
 
     this->id = epicsThreadCreateOpt(
         pName, epicsThreadCallEntryPoint,
@@ -231,6 +216,10 @@ epicsThread::~epicsThread () throw ()
         fprintf ( stderr,
             "was epicsThread object destroyed before thread exit ?\n");
     }
+    epicsGuard < epicsMutex > guard ( this->mutex );
+    if ( this->pThreadDestroyed ) {
+        *this->pThreadDestroyed = true;
+    }
 }
 
 void epicsThread::start () throw ()

modules/libcom/src/osi/epicsThread.h

@@ -372,21 +372,21 @@ class LIBCOM_API epicsThread {
      *
      * cf. epicsThreadOpts
      * \note Threads must be start() ed.
-     * @throws epicsThread::unableToCreateThread on error.
+     * \throws epicsThread::unableToCreateThread on error.
      */
     epicsThread ( epicsThreadRunable &,const char *name, unsigned int stackSize,
         unsigned int priority=epicsThreadPriorityLow );
     ~epicsThread () throw ();
     //! Actually start the thread.
     void start () throw ();
-    //! Wait for the thread epicsRunnable::run() to return.
+    //! Wait for the thread epicsThreadRunable::run() to return.
     void exitWait () throw ();
-    //! Wait for the thread epicsRunnable::run() to return.
+    //! Wait for the thread epicsThreadRunable::run() to return.
     //! \param delay Wait up to this many seconds.
     //! \return true if run() returned.  false on timeout.
     bool exitWait ( const double delay ) throw ();
-    //! @throws A special exitException which will be caught and ignored.
-    //! \note This exitException doesn't not derive from std::exception
+    //! \throws An epicsThread::exitException which will be caught and ignored.
+    //! \note epicsThread::exitException does not derive from std::exception
     static void exit ();
     //! cf. epicsThreadResume()
     void resume () throw ();
@@ -425,7 +425,6 @@ class LIBCOM_API epicsThread {
     bool begin;
     bool cancel;
     bool terminated;
-    bool joined;
 
     bool beginWait () throw ();
     epicsThread ( const epicsThread & );

modules/libcom/test/epicsThreadClassTest.cpp

@@ -55,9 +55,8 @@ const char * const cases[] = {
     "BsErD",    // Parent does exitWait(); child returns; parent deletes thread
     "BsXDr",    // Parent does exitWait(0); parent deletes thread; child returns
     "BwXTDsr",  // Parent does exitWait(0); parent deletes thread; child returns
- // These are currently broken
-//  "BetWSrD",  // Child does exitWait(); sync; child returns; parent deletes thread
-//  "BetWsDr",  // Child does exitWait(); sync; parent deletes thread; child returns
+    "BetrWSD",  // Child does exitWait(); sync; child returns; parent deletes thread
+    "BetsWDr",  // Child does exitWait(); sync; parent deletes thread; child returns
 
  // In these cases the child deletes the thread
     "BdrS",     // Child deletes thread, returns