Merge branch 'iss-49' into develop

Author: HerbertKoelman

include/pthread/thread.hpp

@@ -122,10 +122,9 @@ namespace pthread {
      *
      * This method does not itself cause a thread to be terminated.
      * 
-     * @return the value returned by the joined thread (calling pthread_exit(void *retval))
      * @throws pthread_exception if this is not a thread or if thread_id == this_thread::get_id().
      */
-    void *join();
+    void join();
 
     /** @return true if this thread can be joined.
      */
@@ -246,14 +245,13 @@ namespace pthread {
 
     /** joins this thread.
      *
-     * @return value returned by the joined thread (pthread_exit(void *retval))
      * @throw pthread_exception if deadlock conditions are detected.
      */
-    void *join() { return _thread->join() ;};
+    void join() ;
 
     /** @return true if this thread can be joined.
      */
-    bool joinable() const { return _thread != 0 ;};
+    bool joinable() const ;
 
 
   private:

src/thread.cpp

@@ -23,15 +23,9 @@ namespace pthread {
     }
   }
 
-  void *thread::join () {
-    int    rc     = 0;
-    void *retval = 0;
+  void thread::join () {
 
-#if __cplusplus < 201103L
-    if ( _thread != NULL){
-#else
-    if ( _thread != nullptr){
-#endif
+    if ( _thread != 0){
 
       if ( _thread == this_thread::get_id()){
         throw pthread_exception("join failed, join yourself would endup in deadlock.");
@@ -41,7 +35,12 @@ namespace pthread {
         throw pthread_exception("join failed, this is not a thread.");
       }
 
-      if ( (rc = pthread_join(_thread, (void **)&retval)) != 0){
+      int rc = 0;
+      if ( (rc = pthread_join(_thread, NULL)) == 0){
+        // thread was successfully joined, it's safe to assume that it's not a thread anymore.
+        _status = thread_status::not_a_thread ;
+        _thread = 0;
+      } else {
         switch ( rc ) {
           case EDEADLK:
             throw thread_exception("EDEADLKpthread_join failed because of deadlock conditions.", rc );
@@ -50,9 +49,9 @@ namespace pthread {
           case ESRCH:
             break; // thread has already ended.
         }
-      }
+
+      } 
     }
-    return retval;
   }
 
   int thread::cancel () {
@@ -135,6 +134,14 @@ namespace pthread {
     _thread = new pthread::thread(*this, _stack_size);
   }
 
+  void abstract_thread::join() {
+    return _thread->join() ;
+  };
+
+  bool abstract_thread::joinable() const {
+    return _thread != 0 ;
+  };
+
 #if __cplusplus < 201103L
   thread_group::thread_group(bool destructor_joins_first) throw(): _destructor_joins_first(destructor_joins_first){
 #else
@@ -194,12 +201,13 @@ namespace pthread {
    run method on the thread object passed to it (as a void *).
    */
   void *thread_startup_runnable(void *runner) {
-    
-    static_cast<runnable *>(runner)->run();
-    
-    return (NULL);
+
+    try{
+      static_cast<runnable *>(runner)->run();
+    } catch ( ... ) {
+      printf("uncaugth excpetion in thread_startup_runnable(), check your runnable::run() implementation.");
+    }
+    return NULL ;
   }
 
-  // exception -------
-  
 } // namespace pthread

tests/Makefile.in

@@ -23,16 +23,12 @@ MV=@MV@
 
 BITS=@BITS@
 OBJECT_MODE=$(BITS)
-LIBS=@LIBS@
-
-#DEBUG=-g -bnoquiet
-#PROFILER=-p
 
 CXXFLAGS=@CXXFLAGS@
 CFLAGS=@CFLAGS@
 CPPFLAGS=@CPPFLAGS@
-
 LDFLAGS=@LDFLAGS@
+LIBS=@LIBS@
 
 OBJECTS=without-cpp11-pthread-tests.o
 TARGETS=without-cpp11-pthread-tests exceptions-tests
@@ -42,7 +38,7 @@ all:${TARGETS}
 clean: globber
 
 globber:
-	${RM} *.o core *.a *.out
+	${RM} *.o core core.* *.a *.out
 	${RM} ${TARGETS}
 	$(RM) *unc-backup*~ *unc-backup*~
 	$(RM) ULOG*

tests/configure

@@ -3743,7 +3743,7 @@ $as_echo_n "checking for specific $CXX compiler options... " >&6; }
 case "$CXX" in
   xlC_r | xlC)
 	CPPFLAGS="-qlanglvl=extended0x:decltype:static_assert:rvaluereferences:rvaluereferences -qsourcetype=c++ -O $CPPFLAGS"
-  CFLAGS="-bh:5 -O -qmaxmem=-1 -q$BITS $CFLAGS"
+  CFLAGS="-g -bh:5 -O -qmaxmem=-1 -q$BITS $CFLAGS"
   LDFLAGS="$LDFLAGS -brtl -bmaxdata:0x80000000"
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: using large memory model (maxdata:0x80000000), optimising level 2 (-O),using run-time link method (-brtl)" >&5
 $as_echo "using large memory model (maxdata:0x80000000), optimising level 2 (-O),using run-time link method (-brtl)" >&6; }

tests/configure.ac

@@ -40,7 +40,7 @@ AC_MSG_CHECKING([for specific $CXX compiler options])
 case "$CXX" in
   xlC_r | xlC)
 	CPPFLAGS="-qlanglvl=extended0x:decltype:static_assert:rvaluereferences:rvaluereferences -qsourcetype=c++ -O $CPPFLAGS"
-  CFLAGS="-bh:5 -O -qmaxmem=-1 -q$BITS $CFLAGS"
+  CFLAGS="-g -bh:5 -O -qmaxmem=-1 -q$BITS $CFLAGS"
   LDFLAGS="$LDFLAGS -brtl -bmaxdata:0x80000000"
   AC_MSG_RESULT([using large memory model (maxdata:0x80000000), optimising level 2 (-O),using run-time link method (-brtl)])
   ;;