Merge branch 'iss-64' into develop

Author: Herbert Koelman

.gitignore

@@ -53,6 +53,8 @@ Makefile
 
 # layout
 doxyfile
+*.tar
+sonar-project.properties
 distrib/
 lib/
 doc/

Makefile.in

@@ -32,7 +32,7 @@ globber:clean
 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.3.3.
+# Generated by GNU Autoconf 2.69 for cpp-pthread v1.4.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.3.3'
-PACKAGE_STRING='cpp-pthread v1.3.3'
+PACKAGE_VERSION='v1.4.0'
+PACKAGE_STRING='cpp-pthread v1.4.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.3.3 to adapt to many kinds of systems.
+\`configure' configures cpp-pthread v1.4.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.3.3:";;
+     short | recursive ) echo "Configuration of cpp-pthread v1.4.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.3.3
+cpp-pthread configure v1.4.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.3.3, which was
+It was created by cpp-pthread $as_me v1.4.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -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="sonar-runner -Dsonar.cfamily.library.directories=./include,/usr/include,$IMSDIR/include,$TUXDIR/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
@@ -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.3.3, which was
+This file was extended by cpp-pthread $as_me v1.4.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.3.3
+cpp-pthread config.status v1.4.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,7 +22,7 @@ AC_PROG_MKDIR_P
 # 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],[sonar-runner],[sonar-runner -Dsonar.cfamily.library.directories=./include,/usr/include],[])
 fi
 
 # Okay, no cppcheck found, maybe we have sonar
@@ -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
 

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"
@@ -231,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 );
 
@@ -242,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 ;

include/pthread/exceptions.hpp

@@ -11,15 +11,15 @@
 
 #include <pthread.h>
 
-#include <errno.h>
+#include <cerrno>
 #include <string>    // std::string
 #include <cstring>
 #include <exception> // std::exception
 
 
 namespace pthread {
 
-  using namespace std ;
+//  using namespace std ;
 
   /** \addtogroup exception Errors and exceptions
    *
@@ -31,15 +31,15 @@ namespace pthread {
 
   /** general purpose pthread exception.
    */
-  class pthread_exception: public exception {
+  class pthread_exception: public std::exception {
 
   public:
 
     /**
      * @param message error message
      * @param pthread_errno a pthread function return code.
      */
-    pthread_exception( const string &message, const int pthread_errno = -1 );
+    pthread_exception( const std::string &message, const int pthread_errno = -1 );
 
     virtual ~pthread_exception();
 
@@ -71,7 +71,7 @@ namespace pthread {
      *
      * @param message timeout condition
      */
-    timeout_exception(const string &message);
+    explicit timeout_exception(const std::string &message);
   };
 
   /** throw to indicate that something went wrong with a mutex.
@@ -84,7 +84,7 @@ namespace pthread {
      * @param message short description
      * @param pthread_errno error returned by the pthread function
      */
-    mutex_exception( const std::string &message, const int pthread_errno = -1) ;
+    explicit mutex_exception( const std::string &message, const int pthread_errno = -1) ;
 
   };
 
@@ -98,7 +98,7 @@ namespace pthread {
      * @param message short description
      * @param pthread_errno error returned by the pthread function
      */
-    condition_variable_exception( const string &message, const int pthread_errno = -1);
+    condition_variable_exception( const std::string &message, const int pthread_errno = -1);
     virtual ~condition_variable_exception(){};
   };
 
@@ -109,7 +109,7 @@ namespace pthread {
      * @param message short error description.
      * @param pthread_error value return by a function in the pthread library.
      */
-    thread_exception(const string &message, const int pthread_error = -1);
+    thread_exception(const std::string &message, const int pthread_error = -1);
   };
 
   namespace util {

include/pthread/lock_guard.hpp

@@ -19,8 +19,6 @@
 
 namespace pthread {
 
-  using namespace std ;
-  
   /** \addtogroup concurrency
    *
    * @{

include/pthread/thread.hpp

@@ -67,6 +67,8 @@ namespace pthread {
 #else
     virtual void run () noexcept = 0 ;
 #endif
+
+    virtual ~runnable() {};
   };
 
   /**
@@ -107,7 +109,7 @@ namespace pthread {
      *
      * @param other thread that will be moved, on completion other is no longer a thread.
      */
-    thread( thread&& other);
+    thread( thread&& other); // NOSONAR this is std interface and cannot be changed
 
     /** Copy constructor is flagged deleted because it makes no sense to copy a thread.
      */
@@ -160,7 +162,7 @@ namespace pthread {
      * @param other thread to move, on completion it is not a thread anymore (thread_status::not_a_thread).
      * @return a thread 
      */
-    thread& operator=(thread&& other);
+    thread& operator=(thread&& other); // NOSONAR this is a std method signature
 
   private:
 
@@ -241,7 +243,7 @@ namespace pthread {
      *
      * @param stack_size thread's stack size (default 0 which means use PTHREAD_STACK_MIN)
      */
-    abstract_thread(const std::size_t stack_size = 0);
+    explicit abstract_thread(const std::size_t stack_size = 0);
     virtual ~abstract_thread();
 
     /** start running the `run()` method in a new thread.
@@ -294,9 +296,9 @@ namespace pthread {
      * @param destructor_joins_first if true then destructor tries to wait for all registered threads to join the calling one before deleting thread instances.
      */
 #if __cplusplus < 201103L
-    thread_group( bool destructor_joins_first = false ) throw();
+    explicit thread_group( bool destructor_joins_first = false ) throw();
 #else
-    thread_group( bool destructor_joins_first = false ) noexcept;
+    explicit thread_group( bool destructor_joins_first = false ) noexcept;
 #endif
 
     /** delete all abstract_thread referenced by the thread_group.

sonar-project.properties

@@ -14,10 +14,12 @@ sonar.projectKey=pmu:cpp_pthread
 
 # Name of the project that will be displayed on the web interface.
 sonar.projectName=pmu:cpp-pthread
-sonar.projectVersion=draft
+sonar.projectVersion=v1.4.0
 
 # Comma-separated paths to directories containing source files
-sonar.sources=src
+sonar.sources=src,include/pthread
+sonar.cfamily.build-wrapper-output.bypass=true
+
 # Set the language of the source code to analyze. If not set, a multi-language analysis will be triggered.
 #sonar.language=
 # to exclude source code files

sonar-project.properties.in

@@ -0,0 +1,37 @@
+#
+# Project Configuration
+# Customize & run /path/to/sonar-runner/bin/sonar-runner -Dproject.settings=/path/to/sonar-project.properties
+#
+# Add more detail to both client and server-side analysis logs.
+sonar.verbose=false
+
+# Specify not the the source directory, but some parent of the source directory
+#sonar.projectBaseDir=/path/to/project/root
+#sonar.working.directory=/path/to/working/folder/.sonar
+
+# The project key that is unique for each project.
+sonar.projectKey=pmu:cpp_pthread
+
+# Name of the project that will be displayed on the web interface.
+sonar.projectName=pmu:cpp-pthread
+sonar.projectVersion=@PACKAGE_VERSION@
+
+# Comma-separated paths to directories containing source files
+sonar.sources=src,include/pthread
+sonar.cfamily.build-wrapper-output.bypass=true
+
+# Set the language of the source code to analyze. If not set, a multi-language analysis will be triggered.
+#sonar.language=
+# to exclude source code files
+sonar.exclusions=**/TST/**/*,**/TST/*
+
+# Comma-separated list of suffixes for files to analyze. To not filter, leave the list empty.
+#sonar.cobol.file.suffixes=cbl,kbl,sqb,kqb,cpy
+#sonar.cobol.copy.directories=
+#sonar.cobol.copy.suffixes=
+
+#sonar.c.file.suffixes=.c,.h
+#sonar.cpp.file.suffixes=.cc,.cpp,.cxx,.c++,.hh,.hpp,.hxx,.h++,.ipp,.kpp,.sqC,.kqp
+#sonar.cfamily.predefinedMacros=#include "requiredMacros.h"
+#sonar.cfamily.library.directories=/path/to/requiredMacros.h,/path/to/include/files
+