Merge branch 'iss-63' into develop

Author: Herbert Koelman

include/pthread/sync_queue.hpp

@@ -12,7 +12,10 @@
 #include <list>           // std::list
 
 #include "pthread/pthread.hpp"
+#if __cplusplus < 201103L
+#else
 #include <atomic>
+#endif
 #include <string>
 
 
@@ -92,9 +95,16 @@ namespace pthread {
        */
       void set_max_size( size_t ms ){
         if (ms > 0){
+#if __cplusplus < 201103L
+          pthread::lock_guard<pthread::mutex> lck(_mutex);
+#endif
           _max_size = ms;
         }else{
+#if __cplusplus < 201103L
+          throw queue_exception("synchronized_queue's max size must be greater then 0.");
+#else
           throw queue_exception("synchronized_queue's max size must be greater then 0, max_size " + std::to_string(ms) + " is not.");
+#endif
         }
       }
 
@@ -113,7 +123,11 @@ namespace pthread {
       pthread::condition_variable _not_empty_cv;
       pthread::condition_variable _not_full_cv;
       std::list<T>                _items ;
+#if __cplusplus < 201103L
+      int                         _max_size ;
+#else
       std::atomic<int>            _max_size ;
+#endif
 
     };
 
@@ -166,7 +180,8 @@ namespace pthread {
 
 #if __cplusplus < 201103L
       bool not_full = true;
-      while ( ! (not_full = (_items.size() < _max_size)) && not_full_cv.wait(_mutex)){
+      while ( ! (not_full = (_items.size() < _max_size))){
+        _not_full_cv.wait(_mutex);
       }
 #else      
       _not_full_cv.wait(_mutex,[this]{ return _items.size() < _max_size; });

tests/configure

@@ -3675,7 +3675,7 @@ OBJECTS=$OBJECTS
 $as_echo_n "checking for specific $CXX compiler options... " >&6; }
 case "$CXX" in
   xlC_r | xlC)
-    CPPFLAGS="-qlanglvl=extended0x:decltype:static_assert:rvaluereferences -qsourcetype=c++ -O $CPPFLAGS"
+    CPPFLAGS="-D__IBMCPP_TR1__ -qlanglvl=extended0x:decltype:static_assert:rvaluereferences -qsourcetype=c++ -O $CPPFLAGS"
     CFLAGS="-bh:5 -qmaxmem=-1 -q$BITS $CFLAGS"
     CXXFLAGS="-g"
     LDFLAGS="$LDFLAGS -brtl -bmaxdata:0x80000000"

tests/configure.ac

@@ -39,7 +39,7 @@ AC_SUBST(OBJECTS,$OBJECTS)
 AC_MSG_CHECKING([for specific $CXX compiler options])
 case "$CXX" in
   xlC_r | xlC)
-    CPPFLAGS="-qlanglvl=extended0x:decltype:static_assert:rvaluereferences -qsourcetype=c++ -O $CPPFLAGS"
+    CPPFLAGS="-D__IBMCPP_TR1__ -qlanglvl=extended0x:decltype:static_assert:rvaluereferences -qsourcetype=c++ -O $CPPFLAGS"
     CFLAGS="-bh:5 -qmaxmem=-1 -q$BITS $CFLAGS"
     CXXFLAGS="-g"
     LDFLAGS="$LDFLAGS -brtl -bmaxdata:0x80000000"

tests/synchronized_queue_tests.cpp

@@ -6,7 +6,6 @@
 #include <cstdio>
 #include <iostream>
 #include <string>
-#include <atomic>
 #include <memory>
 #include <ctime>
 
@@ -46,7 +45,12 @@ class message {
   unsigned long _number;
 };
 
+#if __IBMCPP_TR1__
+typedef std::tr1::shared_ptr<message> message_ptr;
+#else
 typedef std::shared_ptr<message> message_ptr;
+#endif
+
 typedef pthread::util::sync_queue<message_ptr> sync_message_queue;
 
 class status {
@@ -82,7 +86,11 @@ class producer : public status, public pthread::abstract_thread {
     producer(sync_message_queue &queue): status(queue){
     };
 
+#if __cplusplus < 201103L
+    void run() throw() {
+#else
     void run() noexcept {
+#endif
       printf ("start producing %d messages\n", MESSAGES_TO_PRODUCE);
       for( auto x = MESSAGES_TO_PRODUCE; (x > 0) && running() ; x-- ){
         message_ptr pmessage(new message("producer creation...", x));
@@ -103,7 +111,11 @@ class consumer : public status, public pthread::abstract_thread {
     consumer(sync_message_queue &queue): status(queue){
     };
 
+#if __cplusplus < 201103L
+    void run() throw() {
+#else
     void run() noexcept {
+#endif
       printf ("starting consumer\n");
       message_ptr pmessage ; // (new message("hello"));
       while( running() ){