Merge tag 'v1.6.0'

release v1.6.0

Author: Herbert Koelman

.gitignore

@@ -28,9 +28,7 @@ core
 *.exe
 *.out
 *.app
-exceptions-tests
-without-cpp11-pthread-tests
-with-cpp11-pthread-tests
+tests/*tests
 
 # emacs
 *~
@@ -51,11 +49,12 @@ config.h
 autom4te.cache
 config.status
 config.log
-#configure
 Makefile
 
 # layout
 doxyfile
+*.tar
+sonar-project.properties
 distrib/
 lib/
 doc/

Makefile.in

@@ -27,12 +27,12 @@ pkg:
 	tar cf - `git ls-files`  | gzip -c > distrib/$(PACKAGE)
 
 globber:clean
-	-$(RM) -R Makefile autom4te.cache config.log config.status 
+	-$(RM) -R Makefile autom4te.cache config.log config.status doxyfile sonar-project.properties
 
 clean:
 	-(cd src && $(MAKE) clean)
 
-codecheck: clean all
+codecheck: all
 		$(CODECHECK)
 
 version:

configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for cpp-pthread v1.4.0.
+# Generated by GNU Autoconf 2.69 for cpp-pthread v1.6.0.
 #
 # Report bugs to <[email protected]>.
 #
@@ -579,8 +579,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='cpp-pthread'
 PACKAGE_TARNAME='cpp-pthread'
-PACKAGE_VERSION='v1.4.0'
-PACKAGE_STRING='cpp-pthread v1.4.0'
+PACKAGE_VERSION='v1.6.0'
+PACKAGE_STRING='cpp-pthread v1.6.0'
 PACKAGE_BUGREPORT='[email protected]'
 PACKAGE_URL='http://herbertkoelman.github.io/cpp-pthread/'
 
@@ -1187,7 +1187,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures cpp-pthread v1.4.0 to adapt to many kinds of systems.
+\`configure' configures cpp-pthread v1.6.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1251,7 +1251,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of cpp-pthread v1.4.0:";;
+     short | recursive ) echo "Configuration of cpp-pthread v1.6.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1332,7 +1332,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-cpp-pthread configure v1.4.0
+cpp-pthread configure v1.6.0
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1349,7 +1349,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by cpp-pthread $as_me v1.4.0, which was
+It was created by cpp-pthread $as_me v1.6.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -1995,8 +1995,8 @@ $as_echo "$MKDIR_P" >&6; }
 # Okay, no cppcheck found, maybe we have sonar
 if test -z "$CODECHECK"
 then
-  # Extract the first word of "cppcheck", so it can be a program name with args.
-set dummy cppcheck; ac_word=$2
+  # Extract the first word of "sonar-runner", so it can be a program name with args.
+set dummy sonar-runner; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_prog_CODECHECK+:} false; then :
@@ -2012,7 +2012,7 @@ do
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_CODECHECK="cppcheck --template='{file}:{line},{severity},{id}:\n    {message}\n' --enable=all -I ../include ./"
+    ac_cv_prog_CODECHECK="sonar-runner -Dsonar.cfamily.library.directories=./include,/usr/include"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -2037,8 +2037,8 @@ fi
 # Okay, no cppcheck found, maybe we have sonar
 if test -z "$CODECHECK"
 then
-  # Extract the first word of "sonar-runner", so it can be a program name with args.
-set dummy sonar-runner; ac_word=$2
+  # Extract the first word of "cppcheck", so it can be a program name with args.
+set dummy cppcheck; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_prog_CODECHECK+:} false; then :
@@ -2054,7 +2054,7 @@ do
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_CODECHECK="sonar-runner -Dsonar.cfamily.library.directories=../include,/usr/include,$IMSDIR/include,$TUXDIR/include"
+    ac_cv_prog_CODECHECK="cppcheck --template='{file}:{line},{severity},{id}:\n    {message}\n' --enable=all -I ./include ./src ./include"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -2099,7 +2099,7 @@ HEADERS=$HEADERS
 
 subdirs="$subdirs src"
 
-ac_config_files="$ac_config_files Makefile doxyfile"
+ac_config_files="$ac_config_files Makefile doxyfile sonar-project.properties"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -2643,7 +2643,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by cpp-pthread $as_me v1.4.0, which was
+This file was extended by cpp-pthread $as_me v1.6.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -2697,7 +2697,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-cpp-pthread config.status v1.4.0
+cpp-pthread config.status v1.6.0
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -2811,6 +2811,7 @@ do
   case $ac_config_target in
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "doxyfile") CONFIG_FILES="$CONFIG_FILES doxyfile" ;;
+    "sonar-project.properties") CONFIG_FILES="$CONFIG_FILES sonar-project.properties" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac

configure.ac

@@ -22,13 +22,13 @@ AC_PROG_MKDIR_P
 # Okay, no cppcheck found, maybe we have sonar
 if test -z "$CODECHECK" 
 then
-  AC_CHECK_PROG([CODECHECK],[cppcheck],[cppcheck --template='{file}:{line},{severity},{id}:\n    {message}\n' --enable=all -I ../include ./],[])
+  AC_CHECK_PROG([CODECHECK],[sonar-runner],[sonar-runner -Dsonar.cfamily.library.directories=./include,/usr/include],[])
 fi
 
 # Okay, no cppcheck found, maybe we have sonar
 if test -z "$CODECHECK" 
 then
-  AC_CHECK_PROG([CODECHECK],[sonar-runner],[sonar-runner -Dsonar.cfamily.library.directories=../include,/usr/include,$IMSDIR/include,$TUXDIR/include],[])
+  AC_CHECK_PROG([CODECHECK],[cppcheck],[cppcheck --template='{file}:{line},{severity},{id}:\n    {message}\n' --enable=all -I ./include ./src ./include],[])
 fi
 
 AC_MSG_CHECKING([whether target directory ./lib exists])
@@ -47,6 +47,6 @@ done
 AC_SUBST(HEADERS,$HEADERS)
 
 AC_CONFIG_SUBDIRS(src)
-AC_CONFIG_FILES([Makefile doxyfile])
+AC_CONFIG_FILES([Makefile doxyfile sonar-project.properties])
 AC_OUTPUT
 

doxyfile.in

@@ -991,7 +991,7 @@ USE_MDFILE_AS_MAINPAGE =README.md
 # also VERBATIM_HEADERS is set to NO.
 # The default value is: NO.
 
-SOURCE_BROWSER         = NO
+SOURCE_BROWSER         = YES
 
 # Setting the INLINE_SOURCES tag to YES will include the body of functions,
 # classes and enums directly into the documentation.

include/pthread/condition_variable.hpp

@@ -10,7 +10,7 @@
 // recommandation for more info p.285 §8.3.1).
 #include <pthread.h>
 #include <string>
-#include <time.h>
+#include <ctime>
 #include <sys/time.h>
 
 #include "pthread/config.h"
@@ -20,7 +20,15 @@
 #include "pthread/lock_guard.hpp"
 
 namespace pthread {
-  
+
+  /** \addtogroup concurrency Concurrency
+   *
+   * Set of classes to handle concurrent access to shared ressources.
+   *
+   * @author herbert koelman ([email protected])
+   * @{
+   */
+
   /** condition variable current wait status. */
   enum cv_status {
     no_timeout, /*!< unblocked before a timeout occured */
@@ -43,7 +51,7 @@ namespace pthread {
    *
    * Upon successful return, the mutex shall have been locked and shall be owned by the calling thread.
    *
-   * @author herbert koelman
+   * @author herbert koelman ([email protected])
    */
   class condition_variable {
   public:
@@ -194,6 +202,8 @@ namespace pthread {
     pthread_cond_t _condition;
   };
 
+  /** @} */
+  
   // template implementation ----------------------
 
   template<class Lambda> bool condition_variable::wait( mutex &mtx, Lambda lambda){
@@ -221,7 +231,7 @@ namespace pthread {
     milliseconds(millis); // update timeout
     bool stop_waiting = lambda(); // returns ​false if the waiting should be continued.
 
-    while(! stop_waiting && status == no_timeout){
+    while((! stop_waiting) && (status == no_timeout)){
 
       rc  = pthread_cond_timedwait ( &_condition, &mtx._mutex, &timeout );
 
@@ -232,11 +242,11 @@ namespace pthread {
           break;
 
         case EINVAL:
-          throw condition_variable_exception("The value specified by abstime is invalid.", rc);
+          throw condition_variable_exception("The value specified by abstime is invalid.", rc); // NOSONAR we use throw instead of return.
           break;
 
         case EPERM:
-          throw condition_variable_exception("The mutex was not owned by the current thread at the time of the call.", rc);
+          throw condition_variable_exception("The mutex was not owned by the current thread at the time of the call.", rc); // NOSONAR we use throw instead of return.
           break;
         default:
           status = no_timeout ;
@@ -255,6 +265,9 @@ namespace pthread {
     // return wait_for(*(lck.mutex()),millis, lambda);
     return wait_for(*(lck._mutex),millis, lambda);
   };
+
 
 } // namespace pthread
+
+
 #endif