X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Ftest_boost_threads.cpp;h=bb51287e50d4b02745b0c470e023db01352ebf45;hb=586d78659d671683f33ec55f4a7d32b28e345ccd;hp=08af85606bc4fee6066a0dc42a72560b4be26f58;hpb=83ff1cfb6e933cc70a5c3c8f331f92c941325188;p=metaproxy-moved-to-github.git

diff --git a/src/test_boost_threads.cpp b/src/test_boost_threads.cpp
index 08af856..bb51287 100644
--- a/src/test_boost_threads.cpp
+++ b/src/test_boost_threads.cpp
@@ -1,96 +1,117 @@
+/* This file is part of Metaproxy.
+   Copyright (C) Index Data
 
+Metaproxy is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+Metaproxy is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+#include "config.hpp"
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/thread.hpp>
+
+#define BOOST_AUTO_TEST_MAIN
+#define BOOST_TEST_DYN_LINK
+#include <boost/test/auto_unit_test.hpp>
+
 #include <list>
 #include <iostream>
 
-boost::mutex io_mutex; // The iostreams are not guaranteed to be thread-safe!
-
 class counter
 {
    public:
       counter() : count(0) { }
-      
-      int increment() {
-         boost::mutex::scoped_lock scoped_lock(mutex);
-         return ++count;
-      }
-      
-   private:
-      boost::mutex mutex;
-      int count;
-};
 
+    int increment() {
+        boost::mutex::scoped_lock scoped_lock(mutex);
+        return ++count;
+    }
 
-counter c;
+private:
+    boost::mutex mutex;
+    int count;
+};
 
-void change_count()
-{
-   int i = c.increment();
-   boost::mutex::scoped_lock scoped_lock(io_mutex);
-   std::cout << "count == " << i << std::endl;
-}
 
+counter c;
 
 class worker {
 public:
     void operator() (void) {
-        int i = c.increment();
-        
-        i = c.increment();
-        
-        i = c.increment();
-        boost::mutex::scoped_lock scoped_lock(io_mutex);
-        std::cout << "count == " << i << std::endl;
+        c.increment();
     }
-    virtual ~worker() { std::cout << "destroyed\n"; }
 };
 
+#define USE_GROUP 1
 
 
-int main(int, char*[])
+BOOST_AUTO_TEST_CASE( thread_group )
 {
-   try 
-   {
-      const int num_threads = 4;
-      boost::thread_group thrds;
-      
-      std::list<boost::thread *> thread_list;
-      
-      for (int i=0; i < num_threads; ++i)
-      {
-          // thrds.create_thread(&change_count);
-          worker *w = new worker;
-
-          boost::thread *thr = new boost::thread(*w);
-
-          thrds.add_thread(thr);
-
-          thread_list.push_back(thr);
-      }
-      
-      thrds.join_all();
-#if 0
-      std::list<boost::thread *>::iterator it;
-      for (it = thread_list.begin(); it != thread_list.end(); it++)
-      {
-          delete *it;
-          *it = 0;
-      }
-#endif
-   }
-   catch (std::exception &e) 
-   {
-      std::cout << e.what() << "\n";
-      exit(1);
-   }
-   exit(0);
+    try
+    {
+        const int num_threads = 4;
+        boost::thread_group thrds;
+
+        for (int i=0; i < num_threads; ++i)
+        {
+            worker w;
+            thrds.add_thread(new boost::thread(w));
+        }
+        thrds.join_all();
+    }
+    catch (...)
+    {
+        BOOST_CHECK(false);
+    }
+    BOOST_CHECK(c.increment() == 5);
 }
 
+
+BOOST_AUTO_TEST_CASE( thread_list )
+{
+    try
+    {
+        const int num_threads = 4;
+        std::list<boost::thread *> thread_list;
+
+        for (int i=0; i < num_threads; ++i)
+        {
+            worker w;
+            thread_list.push_back(new boost::thread(w));
+        }
+        std::list<boost::thread *>::iterator it;
+        for (it = thread_list.begin(); it != thread_list.end(); it++)
+        {
+            (*it)->join();
+            delete *it;
+        }
+
+    }
+    catch (...)
+    {
+        BOOST_CHECK(false);
+    }
+    BOOST_CHECK(c.increment() == 10);
+}
+
+
+
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab
  */
+