cleaned up the sockets test

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

dlib/test/sockets.cpp

@@ -12,8 +12,7 @@
 
 #include "tester.h"
 
-namespace  
-{
+namespace  {
 
     using namespace test;
     using namespace dlib;
@@ -23,8 +22,6 @@ namespace
     dlib::signaler s(m);
     const char magic_num = 42;
     const int min_bytes_sent = 10000;
-    int thread_count;
-    int thread_count2;
     int assigned_port;
 
     logger dlog("test.sockets");
@@ -36,7 +33,8 @@ namespace
     public:
         serv (
         ) :
-            error_occurred (false)
+            error_occurred (false),
+            got_connections(false)
         {}
 
         void on_listening_port_assigned (
@@ -73,31 +71,54 @@ namespace
                 tag = 5.0;
                 error_occurred = true;
             }
+            got_connections = true;
             dlog << LINFO << "in serv::on_connect(): on_connect ending";
         }
 
         bool error_occurred;
+        bool got_connections;
         double tag;
     };
 
 // ----------------------------------------------------------------------------------------
 
+    class thread_container : public multithreaded_object
+    {
+    public:
+
+        serv& srv;
+
+        thread_container (
+            serv& srv_
+        ) : srv(srv_)
+        {
+            for (int i = 0; i < 10; ++i)
+                register_thread(*this, &thread_container::thread_proc);
+
+            // start up the threads
+            start();
+        }
+
+        ~thread_container ()
+        {
+            // wait for all threads to terminate
+            wait();
+        }
+
         void thread_proc (
-        void* param
         )
         {
-        serv& srv = *reinterpret_cast<serv*>(param);
             try
             {
                 dlog << LTRACE << "enter thread";
                 {
-                auto_mutex M(m);
+                    auto_mutex M(::m);
                     while (assigned_port == 0)
-                    s.wait();
+                        ::s.wait();
                 }
 
                 int status;
-            connection* con;
+                scoped_ptr<connection> con;
                 string hostname;
                 string ip;
                 status = get_local_hostname(hostname);
@@ -106,7 +127,8 @@ namespace
                     srv.tag = 1.0;
                     srv.error_occurred = true;
                     srv.clear();
-                dlog << LWARN << "leaving thread, line: " << __LINE__;
+                    dlog << LERROR << "leaving thread, line: " << __LINE__;
+                    dlog << LERROR << "get_local_hostname() failed";
                     return;
                 }
 
@@ -116,7 +138,8 @@ namespace
                     srv.tag = 2.0;
                     srv.error_occurred = true;
                     srv.clear();
-                dlog << LWARN << "leaving thread, line: " << __LINE__;
+                    dlog << LERROR << "leaving thread, line: " << __LINE__;
+                    dlog << LERROR << "hostname_to_ip() failed";
                     return;
                 }
 
@@ -127,7 +150,8 @@ namespace
                     srv.tag = 3.0;
                     srv.error_occurred = true;
                     srv.clear();
-                dlog << LWARN << "leaving thread, line: " << __LINE__;
+                    dlog << LERROR << "leaving thread, line: " << __LINE__;
+                    dlog << LERROR << "create_connection() failed";
                     return;
                 }
 
@@ -141,17 +165,6 @@ namespace
                 dlog << LTRACE << "shutting down connection to server";
                 close_gracefully(con);
                 dlog << LTRACE << "finished calling close_gracefully() on the connection";
-
-            auto_mutex M(m);
-            --thread_count;
-            s.broadcast();
-            while (thread_count > 0)
-                s.wait();
-
-            srv.clear();
-
-            --thread_count2;
-            s.broadcast();
             }
             catch (exception& e)
             {
@@ -161,6 +174,14 @@ namespace
             }
             dlog << LTRACE << "exit thread";
         }
+    };
+
+    void run_server(serv* srv)
+    {
+        dlog << LTRACE << "calling srv.start()";
+        srv->start();
+        dlog << LTRACE << "srv.start() just ended.";
+    }
 
     void sockets_test (
     )
@@ -176,36 +197,29 @@ namespace
         dlog << LTRACE << "starting test";
         serv srv;
 
-        thread_count = 10;
         assigned_port = 0;
-        thread_count2 = thread_count;
 
 
         dlog << LTRACE << "spawning threads";
-        int num = thread_count;
-        for (int i = 0; i < num; ++i)
-        {
-            create_new_thread(thread_proc,&srv);
-        }
+        thread_container stuff(srv);
 
 
 
-        dlog << LTRACE << "calling srv.start()";
-        srv.start();
-        dlog << LTRACE << "srv.start() just ended.";
+        thread_function thread2(run_server, &srv);
+
+        // wait until all the sending threads have ended
+        stuff.wait();
 
-        {
-            auto_mutex M(m);
-            while (thread_count2 > 0)
-                s.wait();
-        }
         if (srv.error_occurred)
         {
             dlog << LDEBUG << "tag: " << srv.tag;
         }
 
+        srv.clear();
+
         dlog << LTRACE << "ending successful test";
         DLIB_CASSERT( !srv.error_occurred,""); 
+        DLIB_CASSERT( srv.got_connections,""); 
     }
 
 // ----------------------------------------------------------------------------------------