Added tests for the thread_pool and future objects.

--HG--
extra : convert_revision : svn%3Afdd8eb12-d10e-0410-9acb-85c331704f74/trunk%402677

dlib/test/CMakeLists.txt

@@ -65,6 +65,7 @@ set (tests
    string.cpp
    svm.cpp
    threads.cpp
+   thread_pool.cpp
    timer.cpp
    tokenizer.cpp
    tuple.cpp

dlib/test/makefile

@@ -75,6 +75,7 @@ SRC += static_set.cpp
 SRC += string.cpp
 SRC += svm.cpp
 SRC += threads.cpp
+SRC += thread_pool.cpp
 SRC += timer.cpp
 SRC += tokenizer.cpp
 SRC += tuple.cpp

dlib/test/thread_pool.cpp

+// Copyright (C) 2008  Davis E. King (davisking@users.sourceforge.net)
+// License: Boost Software License   See LICENSE.txt for the full license.
+
+
+#include <sstream>
+#include <string>
+#include <cstdlib>
+#include <ctime>
+#include <dlib/misc_api.h>
+#include <dlib/threads.h>
+
+#include "tester.h"
+
+namespace  
+{
+    using namespace test;
+    using namespace dlib;
+    using namespace std;
+
+    logger dlog("test.thread_pool");
+
+
+    struct some_struct : noncopyable
+    {
+        float val;
+    };
+
+    void set_struct_to_zero (some_struct& a) { a.val = 0; }
+    void gset_to_zero (int& a) { a = 0; }
+    void increment (int& a) { ++a; }
+    void add (int a, const int& b, int& res) { dlib::sleep(20); res = a + b; }
+    void add1(int& a, int& res) { res += a; }
+    void add2 (int c, int a, const int& b, int& res) { dlib::sleep(20); res = a + b + c; }
+
+    class thread_pool_tester : public tester
+    {
+    public:
+        thread_pool_tester (
+        ) :
+            tester ("test_thread_pool",
+                    "Runs tests on the thread_pool component.")
+        {}
+
+        void perform_test (
+        )
+        {
+            thread_pool tp(3);
+            print_spinner();
+
+            future<int> a, b, c, res;
+            future<some_struct> obj;
+
+
+            for (int i = 0; i < 4; ++i)
+            {
+                a = 1;
+                b = 2;
+                c = 3;
+                res = 4;
+
+
+                DLIB_CASSERT(a==a,"");
+                DLIB_CASSERT(a!=b,"");
+                DLIB_CASSERT(a==1,"");
+
+                tp.add_task(gset_to_zero, a);
+                tp.add_task(gset_to_zero, b);
+                tp.add_task(*this, &thread_pool_tester::set_to_zero, c);
+                tp.add_task(gset_to_zero, res);
+                DLIB_CASSERT(a == 0,"");
+                DLIB_CASSERT(b == 0,"");
+                DLIB_CASSERT(c == 0,"");
+                DLIB_CASSERT(res == 0,"");
+
+
+                tp.add_task(::increment, a);
+                tp.add_task(*this, &thread_pool_tester::increment, b);
+                tp.add_task(*this, &thread_pool_tester::increment, c);
+                tp.add_task(::increment, res);
+
+                DLIB_CASSERT(a == 1,"");
+                DLIB_CASSERT(b == 1,"");
+                DLIB_CASSERT(c == 1,"");
+                DLIB_CASSERT(res == 1,"");
+
+                tp.add_task(&::increment, a);
+                tp.add_task(*this, &thread_pool_tester::increment, b);
+                tp.add_task(*this, &thread_pool_tester::increment, c);
+                tp.add_task(&::increment, res);
+                tp.add_task(::increment, a);
+                tp.add_task(*this, &thread_pool_tester::increment, b);
+                tp.add_task(*this, &thread_pool_tester::increment, c);
+                tp.add_task(::increment, res);
+
+                DLIB_CASSERT(a == 3,"");
+                DLIB_CASSERT(b == 3,"");
+                DLIB_CASSERT(c == 3,"");
+                DLIB_CASSERT(res == 3,"");
+
+                tp.add_task(*this, &thread_pool_tester::increment, c);
+                tp.add_task(::increment, res);
+                DLIB_CASSERT(c == 4,"");
+                DLIB_CASSERT(res == 4,"");
+
+
+                tp.add_task(::add, a, b, res);
+                DLIB_CASSERT(res == a+b,"");
+                DLIB_CASSERT(res == 6,"");
+                a = 3;
+                b = 4;
+                res = 99;
+                DLIB_CASSERT(res == 99,"");
+                tp.add_task(*this, &thread_pool_tester::add, a, b, res);
+                DLIB_CASSERT(res == a+b,"");
+                DLIB_CASSERT(res == 7,"");
+
+                a = 1;
+                b = 2;
+                c = 3;
+                res = 88;
+                DLIB_CASSERT(res == 88,"");
+                DLIB_CASSERT(a == 1,"");
+                DLIB_CASSERT(b == 2,"");
+                DLIB_CASSERT(c == 3,"");
+
+                tp.add_task(::add2, a, b, c, res);
+                DLIB_CASSERT(res == 6,"");
+                DLIB_CASSERT(a == 1,"");
+                DLIB_CASSERT(b == 2,"");
+                DLIB_CASSERT(c == 3,"");
+
+                a = 1;
+                b = 2;
+                c = 3;
+                res = 88;
+                DLIB_CASSERT(res == 88,"");
+                DLIB_CASSERT(a == 1,"");
+                DLIB_CASSERT(b == 2,"");
+                DLIB_CASSERT(c == 3,"");
+                tp.add_task(*this, &thread_pool_tester::add2, a, b, c, res);
+                DLIB_CASSERT(res == 6,"");
+                DLIB_CASSERT(a == 1,"");
+                DLIB_CASSERT(b == 2,"");
+                DLIB_CASSERT(c == 3,"");
+
+                a = 1;
+                b = 2;
+                c = 3;
+                res = 88;
+                tp.add_task(::add1, a, b);
+                DLIB_CASSERT(a == 1,"");
+                DLIB_CASSERT(b == 3,"");
+                a = 2;
+                tp.add_task(*this, &thread_pool_tester::add1, a, b);
+                DLIB_CASSERT(a == 2,"");
+                DLIB_CASSERT(b == 5,"");
+
+
+                val = 4;
+                uint64 id = tp.add_task(*this, &thread_pool_tester::zero_val);
+                tp.wait_for_task(id);
+                DLIB_CASSERT(val == 0,"");
+                id = tp.add_task(*this, &thread_pool_tester::accum2, 1,2);
+                tp.wait_for_all_tasks();
+                DLIB_CASSERT(val == 3,"");
+                id = tp.add_task(*this, &thread_pool_tester::accum1, 3);
+                tp.wait_for_task(id);
+                DLIB_CASSERT(val == 6,"");
+
+
+                obj.get().val = 8;
+                DLIB_CASSERT(obj.get().val == 8,"");
+                tp.add_task(::set_struct_to_zero, obj);
+                DLIB_CASSERT(obj.get().val == 0,"");
+                obj.get().val = 8;
+                DLIB_CASSERT(obj.get().val == 8,"");
+                tp.add_task(*this,&thread_pool_tester::set_struct_to_zero, obj);
+                DLIB_CASSERT(obj.get().val == 0,"");
+            }
+        }
+
+        long val;
+        void accum1(long a) { val += a; }
+        void accum2(long a, long b) { val += a + b; }
+        void zero_val() { dlib::sleep(20); val = 0; }
+
+
+        void set_struct_to_zero (some_struct& a) { a.val = 0; }
+        void set_to_zero (int& a) { dlib::sleep(20); a = 0; }
+        void increment (int& a) const { dlib::sleep(20); ++a; }
+        void add (int a, const int& b, int& res) { dlib::sleep(20); res = a + b; }
+        void add1(int& a, int& res) const { res += a; }
+        void add2 (int c, int a, const int& b, int& res) { res = a + b + c; }
+
+
+    } a;
+
+
+}
+
+
+