refs #41

* use large memory model (-bmaxdata:0x80000000)

Author: Herbert Koelman

tests/Makefile.in

@@ -20,7 +20,6 @@ RANLIB=@RANLIB@
 RM=rm -f
 AR=@AR@
 MV=@MV@
-BEAUTIFIER=@BEAUTIFIER@
 
 BITS=@BITS@
 OBJECT_MODE=$(BITS)

tests/configure

@@ -630,7 +630,6 @@ EGREP
 GREP
 CXXCPP
 RANLIB
-BEAUTIFIER
 MV
 AR
 ac_ct_CC
@@ -3194,44 +3193,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
@@ -3760,14 +3721,12 @@ then
   BITS="64"
 
   BITS=64
-  #CXXFLAGS="-m$ac_cv_sizeof_long $CXXFLAGS -I ../include -I ./"
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: using 32 bits (default)" >&5
 $as_echo "using 32 bits (default)" >&6; }
   BITS="32"
 
   BITS=32
-  #CXXFLAGS="-m$ac_cv_sizeof_long $CXXFLAGS -I ../include -I ./"
 fi
 
 OBJECTS=""
@@ -3784,7 +3743,8 @@ $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 -q$BITS $CFLAGS"
+  CFLAGS="-bh:5 -O -qmaxmem=-1 -q$BITS $CFLAGS"
+#  LDFLAGS="$LDFLASG -brtl -bmaxdata:0x80000000"
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
   ;;

tests/configure.ac

@@ -12,7 +12,6 @@ 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
 
 CFLAGS="$CFLAGS -I ../include -I ./"
@@ -23,12 +22,10 @@ if test $ac_cv_sizeof_long == "8"
 then
   AC_SUBST(BITS,"64")
   BITS=64
-  #CXXFLAGS="-m$ac_cv_sizeof_long $CXXFLAGS -I ../include -I ./"
 else
   AC_MSG_RESULT([using 32 bits (default)])
   AC_SUBST(BITS,"32")
   BITS=32
-  #CXXFLAGS="-m$ac_cv_sizeof_long $CXXFLAGS -I ../include -I ./"
 fi
 
 OBJECTS=""
@@ -43,7 +40,8 @@ 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 -brtl -O -q$BITS $CFLAGS"
+  CFLAGS="-bh:5 -O -qmaxmem=-1 -q$BITS $CFLAGS"
+  LDFLAGS="$LDFLAGS -brtl -bmaxdata:0x80000000"
   AC_MSG_RESULT([yes])
   ;;
   g++ | gcc)

tests/without-cpp11-pthread-tests.cpp

@@ -47,26 +47,35 @@ class worker: public pthread::abstract_thread {
 #else
   void run() noexcept override {
 #endif
-    message("worker: " + msg);
-    {
-      pthread::lock_guard<pthread::mutex> lck(mtx);
-      
-      message("running worker class. wait max 2s for condition to be signaled");
-      bool stop_waiting = true;
-      auto delay = _sleep;
-      while ( ! (stop_waiting = (counter >= 10000)) && (condition.wait_for(mtx, delay) == pthread::cv_status::no_timeout)){
-        delay = -1 ;
-      }
-      if ( counter >= 10000 ) {
-        message("worker class, counter >= 10000");
-      } else {
-        message("worker class, counter < 10000");
+    try {
+      message("worker: " + msg);
+      {
+        pthread::lock_guard<pthread::mutex> lck(mtx);
+        
+        message("running worker class. wait max 2s for condition to be signaled");
+        bool stop_waiting = true;
+        auto delay = _sleep;
+        while ( ! (stop_waiting = (counter >= 10000)) && (condition.wait_for(mtx, delay) == pthread::cv_status::no_timeout)){
+          delay = -1 ;
+        }
+        if ( counter >= 10000 ) {
+          message("worker class, counter >= 10000");
+        } else {
+          message("worker class, counter < 10000");
+        }
       }
+      
+      message("worker sleeping");
+      pthread::this_thread::sleep(200);
+      message("worker class is ending");
+
+    } catch ( pthread::pthread_exception &err ){
+      message(err.what());
+    } catch ( std::exception &err ) {
+      message(err.what());
+    } catch ( ... ) {
+      message("Unexpected exception was thrown.");
     }
-    
-    message("worker sleeping");
-    pthread::this_thread::sleep(200);
-    message("worker class is ending");
   };
 
 private: