X-Git-Url: http://developer.intra2net.com/git/?p=libt2n;a=blobdiff_plain;f=test%2Freentrant.cpp;h=13f62503bad6bb6cce37171d04d1ea94ee8148e5;hp=7187ffe0d97af0b3712a5f536b4e6d90de0b7e2c;hb=0995cebb9189b872e8d7e58d8b8122fa00cc9061;hpb=56f3994d74dbc36d10bfa83b50b016bf269ac563

diff --git a/test/reentrant.cpp b/test/reentrant.cpp
index 7187ffe..13f6250 100644
--- a/test/reentrant.cpp
+++ b/test/reentrant.cpp
@@ -35,11 +35,17 @@ using namespace std;
 using namespace CppUnit;
 using namespace libt2n;
 
-namespace
+namespace reentrant
 {
 
 command_server *global_server = NULL;
 
+int fork_count = 3;
+int requests_per_child = 100;
+int all_requests = (2 << (fork_count-1)) * requests_per_child;
+
+int seen_client_requests = 0;
+
 string testfunc(const string& str)
 {
     string ret;
@@ -49,6 +55,8 @@ string testfunc(const string& str)
     if (global_server)
         global_server->handle(10000);
 
+    ++seen_client_requests;
+
     return ret;
 }
 
@@ -67,7 +75,8 @@ class testfunc_res : public libt2n::result
 
     public:
         testfunc_res()
-            { }
+            {
+            }
 
         testfunc_res(const string& str)
         {
@@ -96,7 +105,8 @@ class testfunc_cmd : public libt2n::command
 
     public:
         testfunc_cmd()
-            { }
+            {
+            }
 
         testfunc_cmd(const string& str)
         {
@@ -111,10 +121,13 @@ class testfunc_cmd : public libt2n::command
 
 }
 
+
 #include <boost/serialization/export.hpp>
 
-BOOST_CLASS_EXPORT(testfunc_cmd)
-BOOST_CLASS_EXPORT(testfunc_res)
+BOOST_CLASS_EXPORT(reentrant::testfunc_cmd)
+BOOST_CLASS_EXPORT(reentrant::testfunc_res)
+
+using namespace reentrant;
 
 class test_reentrant : public TestFixture
 {
@@ -145,18 +158,18 @@ class test_reentrant : public TestFixture
             // child
             {
                 // wait till server is up
-                sleep(3);
+                sleep(2);
 
-                // we want 8 identical childs hammering the server
-                fork();
-                fork();
-                fork();
+                // hammer the server
+                for (int i = 0; i < fork_count; i++)
+                    fork();
 
                 try
                 {
-                    for (int i=0; i < 100; i++)
+                    for (int i=0; i < requests_per_child; i++)
                     {
                         socket_client_connection sc("./socket");
+                        // sc.set_logging(&cerr,debug);
                         command_client cc(&sc);
 
                         result_container rc;
@@ -167,16 +180,19 @@ class test_reentrant : public TestFixture
                         {
                             string ret = res->get_data();
                             if (ret != "hello, testfunc() was here")
-                                std::cout << "ERROR reentrant server testfunc_res failed, res: " << ret << "\n";
+                                std::cout << "ERROR reentrant server testfunc_res failed, res: \"" << ret << "\"\n";
                         }
                         else
                         {
-                            std::cout << "ERROR result from reentrant server empty\n";
+                            std::cout << "ERROR result from reentrant server empty (" << rc.get_result() << ")\n";
                         }
                     }
                 } catch (exception &e)
                 {
                     cerr << "caught exception: " << e.what() << endl;
+                } catch(...)
+                {
+                    std::cerr << "exception in child. ignoring\n";
                 }
 
                 // don't call atexit and stuff
@@ -194,26 +210,26 @@ class test_reentrant : public TestFixture
 
                 global_server=&cs;
 
-                // max 10 sec
-                long long maxtime=1000000;
-                while(maxtime > 0)
-                    cs.handle(maxtime,&maxtime);
-
-                // max 10 sec
-                maxtime=1000000;
-                while(maxtime > 0)
-                    cs.handle(maxtime,&maxtime);
+                // Wait until all requests have successed
+                int safety_check = 0;
+                while (seen_client_requests < all_requests)
+                {
+                    ++safety_check;
+                    if (safety_check > 10) {
+                        std::cerr << "reached safety check, aborting.\n";
+                        break;
+                    }
 
-                // max 10 sec
-                maxtime=1000000;
-                while(maxtime > 0)
-                    cs.handle(maxtime,&maxtime);
+                    long long maxtime=1000000;
+                    while(maxtime > 0)
+                        cs.handle(maxtime,&maxtime);
+                }
 
                 global_server = NULL;
             }
 
             // we are still alive, everything is ok
-            CPPUNIT_ASSERT_EQUAL(1,1);
+            CPPUNIT_ASSERT_EQUAL(all_requests, seen_client_requests);
         }
     }