Merge branch 'develop' of mut-mut-scmv1.dev.parimutuel.local:p094212/cpp-pthread into develop

Author: Herbert KOELMAN

Makefile.in

@@ -4,9 +4,12 @@
 #
 
 prefix=@prefix@
+exec_prefix=@exec_prefix@
+INCLUDEDIR=@includedir@/pthread
+LIBDIR=@libdir@
+LOCALEDIR=@localedir@
 
 INSTALL=@INSTALL@ 
-LOCALEDIR=@localedir@
 RM=@RM@
 MKDIR=@MKDIR_P@
 PACKAGE=@PACKAGE_NAME@-@PACKAGE_VERSION@-@[email protected]
@@ -17,7 +20,7 @@ CODECHECK=@CODECHECK@
 PTHREADLIB=libcpp-pthread.a
 
 all: 
-	cd src && $(MAKE) clean all
+	cd src && $(MAKE)
 
 pkg: 
 	$(MKDIR) distrib
@@ -40,11 +43,10 @@ doxygen:
 	${DOXYGEN} doxyfile
 
 install:
-	$(MKDIR) ${prefix}/include/pthread
-	$(MKDIR) ${prefix}/lib/pthread
-	$(INSTALL) ${HEADERS} ${prefix}/include/pthread
-	$(INSTALL) lib/libcpp-pthread.a ${prefix}/lib/
+	$(MKDIR) $(INCLUDEDIR)
+	cd include/pthread && $(INSTALL) *.hpp *.h $(INCLUDEDIR)
+	$(INSTALL) lib/$(PTHREADLIB) @libdir@
 
 uninstall:
-	$(RM) -R  ${prefix}/include/pthread
-	$(RM) ${prefix}/lib/libcpp-pthread.a
+	$(RM) -R  $(INCLUDEDIR)
+	$(RM) @libdir@/$(PTHREADLIB)

configure

@@ -589,6 +589,7 @@ ac_subst_vars='LTLIBOBJS
 LIBOBJS
 subdirs
 HEADERS
+MKDIR_P
 DOXYGEN
 RM
 INSTALL_DATA
@@ -1948,6 +1949,48 @@ $as_echo "no" >&6; }
 fi
 
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
+$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
+if test -z "$MKDIR_P"; then
+  if ${ac_cv_path_mkdir+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in mkdir gmkdir; do
+	 for ac_exec_ext in '' $ac_executable_extensions; do
+	   as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue
+	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
+	     'mkdir (GNU coreutils) '* | \
+	     'mkdir (coreutils) '* | \
+	     'mkdir (fileutils) '4.1*)
+	       ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
+	       break 3;;
+	   esac
+	 done
+       done
+  done
+IFS=$as_save_IFS
+
+fi
+
+  test -d ./--version && rmdir ./--version
+  if test "${ac_cv_path_mkdir+set}" = set; then
+    MKDIR_P="$ac_cv_path_mkdir -p"
+  else
+    # As a last resort, use the slow shell script.  Don't cache a
+    # value for MKDIR_P within a source directory, because that will
+    # break other packages using the cache if that directory is
+    # removed, or if the value is a relative name.
+    MKDIR_P="$ac_install_sh -d"
+  fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
+$as_echo "$MKDIR_P" >&6; }
+
 
 # Okay, no cppcheck found, maybe we have sonar
 if test -z "$CODECHECK"
@@ -2665,6 +2708,7 @@ gives unlimited permission to copy, distribute and modify it."
 ac_pwd='$ac_pwd'
 srcdir='$srcdir'
 INSTALL='$INSTALL'
+MKDIR_P='$MKDIR_P'
 test -n "\$AWK" || AWK=awk
 _ACEOF
 
@@ -3105,6 +3149,11 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
   [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
   *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
   esac
+  ac_MKDIR_P=$MKDIR_P
+  case $MKDIR_P in
+  [\\/$]* | ?:[\\/]* ) ;;
+  */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
+  esac
 _ACEOF
 
 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
@@ -3159,6 +3208,7 @@ s&@builddir@&$ac_builddir&;t t
 s&@abs_builddir@&$ac_abs_builddir&;t t
 s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
 s&@INSTALL@&$ac_INSTALL&;t t
+s&@MKDIR_P@&$ac_MKDIR_P&;t t
 $ac_datarootdir_hack
 "
 eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \

configure.ac

@@ -17,6 +17,7 @@ AC_ARG_ENABLE([codecheck], \
 AC_PROG_INSTALL
 AC_CHECK_PROG([RM],[rm],[rm -f])
 AC_CHECK_PROG([DOXYGEN],[doxygen],[doxygen],[echo \"please install doxygen and re-run ./configure, or run it manualy doxygen \"])
+AC_PROG_MKDIR_P
 
 # Okay, no cppcheck found, maybe we have sonar
 if test -z "$CODECHECK" 

src/thread.cpp

@@ -128,12 +128,14 @@ namespace pthread {
     std::swap(_status, other._status);
   }
 
-  abstract_thread::abstract_thread(const std::size_t stack_size): _stack_size(stack_size){
+  abstract_thread::abstract_thread(const std::size_t stack_size): _stack_size(stack_size), _thread(NULL){
   }
 
   abstract_thread::~abstract_thread(){
 
-    delete _thread;
+    if ( _thread != NULL ){
+      delete _thread;
+    }
   }
 
   void abstract_thread::start(){
@@ -174,7 +176,7 @@ namespace pthread {
           pat->join();
         } catch ( pthread_exception &err ){
           printf("thread_group destructor failed to join one thread. %s, (%d) %s.\n", err.what(), err.pthread_errno(), err.pthread_errmsg());
-        } catch ( ... ){ //NOSONAR this was done on purpose to avoid crashes due to unhandled error conditions
+        } catch ( ... ){ //NOSONAR this was done on purpose to avoid crashes due to unhandled error conditions. This should never happen.
           printf("thread_group destructor received an unexpected exception when joining threads.");
         };
       }