Merge branch 'iss-41' into develop

Author: Herbert Koelman

README.md

@@ -43,6 +43,20 @@ cd tests
 
 ### Usefull links
 
+#### Memory management on AIX
+
+Memory management on AIX is quite sophisticated making it possible to fine tuned very precisely the way your program uses memory. Consider using these compiler/linker options when using pthreads:
+* -bmaxdata:0xN0000000 this option activates the large memory model, N is a number in the range of [1-8].
+* -bmaxmem=-1 this option tell the compiler to use as much memory it needs (usefull when -O option is used).
+
+Thread stack size:
+* 32bits programs allocate 96KB per thread on the program's heap.
+* 64bits programs allocate 192KB per thread on the program's heap.
+
+On many Linux implementations and on Mac OS X the stack size is defaulted to 8MB. You may consider setting this as a default.
+
+More detailed information can be found in this [RedBook](http://www.redbooks.ibm.com/redbooks/pdfs/sg245674.pdf) (chapter 8).
+
 #### project links
 
 * [project's home](https://github.com/HerbertKoelman/cpp-pthread)

include/pthread/condition_variable.hpp

@@ -6,14 +6,16 @@
 #ifndef pthread_condition_variable_hpp
 #define pthread_condition_variable_hpp
 
+// must be include as first hearder file of each source code file (see IBM's
+// recommandation for more info p.285 §8.3.1).
 #include <pthread.h>
 #include <string>
 #include <time.h>
 #include <sys/time.h>
 
 #include "pthread/config.h"
 
-#include "pthread/pthread_exception.hpp"
+#include "pthread/exceptions.hpp"
 #include "pthread/mutex.hpp"
 #include "pthread/lock_guard.hpp"
 

include/pthread/pthread_exception.hpp renamed to include/pthread/exceptions.hpp

@@ -1,18 +1,20 @@
 //
-//  mutex.hpp
+//  exceptions.hpp
 //  cpp-pthread
 //
 //  Created by herbert koelman on 18/03/2016.
 //
 //
 
-#ifndef pthread_pthread_exception_hpp
-#define pthread_pthread_exception_hpp
+#ifndef PTHREAD_EXCEPTIONS_HPP
+#define PTHREAD_EXCEPTIONS_HPP
 
-#include "pthread/config.h"
+#include <pthread.h>
 
 #include <errno.h>
+#include <string>    // std::string
 #include <cstring>
+#include <exception> // std::exception
 
 namespace pthread {
 
@@ -28,26 +30,33 @@ namespace pthread {
      * @param message error message
      * @param pthread_errno a pthread function return code.
      */
-    pthread_exception( const string message, const int pthread_errno = 0 ): _message(message), _pthread_errno(pthread_errno){};
+    pthread_exception( const char *message, const int pthread_errno = 0 );
 
-    virtual ~pthread_exception(){};
+    /**
+     * @param message error message
+     * @param pthread_errno a pthread function return code.
+     */
+    pthread_exception( const string message, const int pthread_errno = 0 );
+
+    virtual ~pthread_exception();
 
     /** @return exception's error message. */
 #if __cplusplus < 201103L
-    virtual const char *what() const throw() { return _message.c_str();};
+    virtual const char *what() const throw() ;
 #else
-    virtual const char *what() const noexcept override{ return _message.c_str();};
+    virtual const char *what() const noexcept override ;
 #endif    
 
     /** @return pthread error code that was at the orgin of the error */
-    virtual int pthread_errno(){ return _pthread_errno ;};
+    virtual int pthread_errno() ;
 
     /** @return related pthread_errno error message using strerror */
-    virtual const char *pthread_errmsg(){ return strerror(_pthread_errno );};
+    virtual const char *pthread_errmsg() ;
 
   private:
-    string  _message;
-    int     _pthread_errno;
+    //std::string  _message;
+    const char  *_message;
+    int          _pthread_errno;
 
   };
 
@@ -59,7 +68,7 @@ namespace pthread {
      *
      * @param message timeout condition
      */
-    timeout_exception(const string message): pthread_exception(message, ETIMEDOUT){};
+    timeout_exception(const string message);
   };
 
 } // namespace pthread

include/pthread/lock_guard.hpp

@@ -9,6 +9,8 @@
 #ifndef pthread_lock_guard_H
 #define pthread_lock_guard_H
 
+// must be include as first hearder file of each source code file (see IBM's
+// recommandation for more info p.285 §8.3.1).
 #include <pthread.h>
 
 #include "pthread/config.h"

include/pthread/mutex.hpp

@@ -9,13 +9,16 @@
 #ifndef pthread_mutex_hpp
 #define pthread_mutex_hpp
 
+// must be include as first hearder file of each source code file (see IBM's
+// recommandation for more info p.285 §8.3.1).
 #include <pthread.h>
+
 #include <exception>
 #include <string>
 
 #include "pthread/config.h"
 
-#include "pthread/pthread_exception.hpp"
+#include "pthread/exceptions.hpp"
 
 namespace pthread {
 

include/pthread/pthread.hpp

@@ -14,16 +14,16 @@
 #ifndef pthread_pthread_hpp
 #define pthread_pthread_hpp
 
-#include <errno.h>
-#include <exception>
-#include <string>
+// must be include as first hearder file of each source code file (see IBM's
+// recommandation for more info p.285 §8.3.1).
+#include <pthread.h>
 
 #include "pthread/config.h"
-
 #include "pthread/mutex.hpp"
 #include "pthread/lock_guard.hpp"
 #include "pthread/condition_variable.hpp"
 #include "pthread/thread.hpp"
+#include "pthread/exceptions.hpp"
 
 /** \namespace pthread 
  *

include/pthread/thread.hpp

@@ -6,19 +6,22 @@
 //  Copyright © 2016 urbix-software. All rights reserved.
 //
 
-#ifndef pthread_thread_hpp
-#define pthread_thread_hpp
+#ifndef PTHREAD_THREAD_HPP
+#define PTHREAD_THREAD_HPP
+
+// must be include as first hearder file of each source code file (see IBM's 
+// recommandation for more info p.285 §8.3.1).
+#include <pthread.h> 
+
 #include <iostream>
-#include <pthread.h>
 #include <string>
 #include <functional>
 #include <memory> // std::auto_ptr, std::unique_ptr
 #include <list>
 #include <cstddef>
 
 #include "pthread/config.h"
-
-#include "pthread/pthread_exception.hpp"
+#include "pthread/exceptions.hpp"
 #include "pthread/mutex.hpp"
 #include "pthread/lock_guard.hpp"
 
@@ -164,6 +167,7 @@ namespace pthread {
     void swap ( thread& other );
 
     pthread_t      _thread;
+    pthread_attr_t _attr;
 
     thread_status  _status;
   };

src/Makefile.in

@@ -34,6 +34,7 @@ CFLAGS=$(OPTIONS) @CFLAGS@
 CPPFLAGS=$(OPTIONS) @CPPFLAGS@
 
 LDFLAGS=@LDFLAGS@
+LIBS=@LIBS@
 
 OBJECTS=@OBJECTS@
 
@@ -61,4 +62,7 @@ beautifull:
 
 # cpp build rule
 .cpp.o:
-	$(CCC) $(CPPFLAGS) $(CXXFLAGS) -c $<
+	$(CCC) $(CPPFLAGS) $(CFLAGS) -c $<
+
+.cpp:
+	$(CCC) $(CPPFLAGS) $(CFLAGS) $< -o $@ $(LDFLAGS) $(LIBS)

src/configure

@@ -630,7 +630,6 @@ EGREP
 GREP
 CXXCPP
 RANLIB
-BEAUTIFIER
 MV
 AR
 ac_ct_CC
@@ -3347,44 +3346,6 @@ $as_echo "no" >&6; }
 fi
 
 
-# Extract the first word of "uncrustify", so it can be a program name with args.
-set dummy uncrustify; 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_BEAUTIFIER+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$BEAUTIFIER"; then
-  ac_cv_prog_BEAUTIFIER="$BEAUTIFIER" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  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_BEAUTIFIER="uncrustify -l CPP --replace -c ../crust.cfg *.bsr *.bcl *.cpp *.hpp"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  test -z "$ac_cv_prog_BEAUTIFIER" && ac_cv_prog_BEAUTIFIER="echo \"install crustify to run beautifier\""
-fi
-fi
-BEAUTIFIER=$ac_cv_prog_BEAUTIFIER
-if test -n "$BEAUTIFIER"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BEAUTIFIER" >&5
-$as_echo "$BEAUTIFIER" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
@@ -3478,8 +3439,7 @@ else
 fi
 
 
-CPPFLAGS="$CPPFLAGS -I ../include -I ./"
-LDFLAGS="$LDFLAGS -L ../lib"
+CFLAGS="-I ../include -I ./"
 
 
 ac_ext=cpp
@@ -3934,14 +3894,14 @@ OBJECTS=$OBJECTS
 $as_echo_n "checking for specific $CXX compiler options... " >&6; }
 case "$CXX" in
   xlC_r | xlC)
-  CPPFLAGS="-bh:5 -q$bits -O $CPPFLAGS"
-	CXXFLAGS="-qlanglvl=extended0x:decltype:static_assert::rvaluereferences:rvaluereferences -qwarn0x  -qsourcetype=c++ $CXXFLAGS"
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+	CPPFLAGS="-qlanglvl=extended0x:decltype:static_assert:rvaluereferences:rvaluereferences -qsourcetype=c++ -O $CPPFLAGS"
+  CFLAGS="-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; }
   ;;
   g++ | gcc)
-	#permissive is not required anymore - CXXFLAGS="-x c++ -std=c++11 -frtti -fpermissive $CXXFLAGS "
-	CXXFLAGS="-x c++ -std=c++11 -frtti $CXXFLAGS "
+	CPPFLAGS="-x c++ -std=c++11 -frtti $CPPFLAGS "
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
   ;;
@@ -4155,8 +4115,6 @@ fi
 done
 
 
-LDFLAGS="$LDFLAGS $LIBS"
-
 ac_config_files="$ac_config_files Makefile pthread.cpp"
 
 cat >confcache <<\_ACEOF

src/configure.ac

@@ -14,11 +14,9 @@ AC_PROG_CXX([xlC_r xlC g++ c++ gcc cl KCC CC cxx cc++ aCC ])
 AC_PROG_CC([xlc xlc_r gcc cl cc])
 AC_CHECK_PROG([AR],[ar],[ar -rv])
 AC_CHECK_PROG([MV],[mv],[mv],[echo "no mv command found"])
-AC_CHECK_PROG([BEAUTIFIER],[uncrustify],[uncrustify -l CPP --replace -c ../crust.cfg *.bsr *.bcl *.cpp *.hpp],[echo \"install crustify to run beautifier\"])
 AC_PROG_RANLIB
 
-CPPFLAGS="$CPPFLAGS -I ../include -I ./"
-LDFLAGS="$LDFLAGS -L ../lib"
+CFLAGS="-I ../include -I ./"
 
 AC_CHECK_SIZEOF([long])
 if test $ac_cv_sizeof_long == "8" 
@@ -42,13 +40,13 @@ AC_SUBST(OBJECTS,$OBJECTS)
 AC_MSG_CHECKING([for specific $CXX compiler options])
 case "$CXX" in
   xlC_r | xlC)
-  CPPFLAGS="-bh:5 -q$bits -O $CPPFLAGS"
-	CXXFLAGS="-qlanglvl=extended0x:decltype:static_assert::rvaluereferences:rvaluereferences -qwarn0x  -qsourcetype=c++ $CXXFLAGS"
-  AC_MSG_RESULT([yes])
+	CPPFLAGS="-qlanglvl=extended0x:decltype:static_assert:rvaluereferences:rvaluereferences -qsourcetype=c++ -O $CPPFLAGS"
+  CFLAGS="-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)])
   ;;
   g++ | gcc)
-	#permissive is not required anymore - CXXFLAGS="-x c++ -std=c++11 -frtti -fpermissive $CXXFLAGS "
-	CXXFLAGS="-x c++ -std=c++11 -frtti $CXXFLAGS "
+	CPPFLAGS="-x c++ -std=c++11 -frtti $CPPFLAGS "
   AC_MSG_RESULT([yes])
   ;;
   *)
@@ -82,8 +80,6 @@ AC_HEADER_STDBOOL
 #AC_FUNC_MALLOC
 AC_CHECK_FUNCS([gettimeofday])
 
-LDFLAGS="$LDFLAGS $LIBS"
-
 AC_CONFIG_FILES([Makefile pthread.cpp])
 AC_OUTPUT