X-Git-Url: http://developer.intra2net.com/git/?p=libt2n;a=blobdiff_plain;f=test%2Fcomm.cpp;h=7bd8b242a2ea86d79ffc19ca3ea73765f32d16cc;hp=169c1839741dd72a0860d7f40f3fdf0607ae0244;hb=393e7b700efffc748e593661b365ead414a341c1;hpb=58b327c6c65474fdfde7d0d99d66d3986400f208

diff --git a/test/comm.cpp b/test/comm.cpp
index 169c183..7bd8b24 100644
--- a/test/comm.cpp
+++ b/test/comm.cpp
@@ -9,6 +9,7 @@
 #include <errno.h>
 #include <signal.h>
 #include <stdio.h>
+#include <time.h>
 
 #include <iostream>
 #include <string>
@@ -26,6 +27,7 @@ using namespace std;
 using namespace libt2n;
 using namespace CppUnit;
 
+
 class test_comm : public TestFixture
 {
     CPPUNIT_TEST_SUITE(test_comm);
@@ -35,23 +37,29 @@ class test_comm : public TestFixture
     CPPUNIT_TEST(UnixCommToServerAndBackBig);
     CPPUNIT_TEST(IPCommToServer);
     CPPUNIT_TEST(IPCommToServerAndBack);
+    CPPUNIT_TEST(IPCommToServerAndBackBig);
 
     CPPUNIT_TEST_SUITE_END();
 
+    pid_t child_pid;
+
     public:
 
     void setUp()
     { }
 
     void tearDown()
-    { }
+    {
+        // make sure the server-child is dead before the next test runs
+        kill(child_pid,SIGKILL);
+        sleep(1);
+    }
 
     void UnixCommToServer()
     {
-        pid_t pid;
         string data;
 
-        switch(pid=fork())
+        switch(child_pid=fork())
         {
             case -1:
             {
@@ -74,8 +82,10 @@ class test_comm : public TestFixture
             {
                 socket_server ss("./socket");
 
+                time_t t0 = time(NULL);
+
                 // max 10 sec
-                for (int i=0; i < 10; i++)
+                while (time(NULL) < t0 + 10 )
                 {
                     ss.fill_buffer(1000000);
 
@@ -89,9 +99,7 @@ class test_comm : public TestFixture
 
     void UnixCommToServerAndBack()
     {
-        pid_t pid;
-
-        switch(pid=fork())
+        switch(child_pid=fork())
         {
             case -1:
             {
@@ -104,8 +112,10 @@ class test_comm : public TestFixture
                 socket_server ss("./socket");
                 ss.set_logging(&cerr,debug);
 
+                time_t t0 = time(NULL);
+
                 // max 10 sec
-                for (int i=0; i < 10; i++)
+                while (time(NULL) < t0 + 10 )
                 {
                     ss.fill_buffer(1000000);
 
@@ -159,9 +169,7 @@ class test_comm : public TestFixture
 
     void UnixCommToServerAndBackBig()
     {
-        pid_t pid;
-
-        switch(pid=fork())
+        switch(child_pid=fork())
         {
             case -1:
             {
@@ -174,8 +182,10 @@ class test_comm : public TestFixture
                 socket_server ss("./socket");
                 ss.set_logging(&cerr,debug);
 
+                time_t t0 = time(NULL);
+
                 // max 10 sec
-                for (int i=0; i < 10; i++)
+                while (time(NULL) < t0 + 10 )
                 {
                     ss.fill_buffer(1000000);
 
@@ -192,6 +202,7 @@ class test_comm : public TestFixture
                         con->write(string().insert(0,100*1024,'y'));
                     }
                 }
+                std::cerr << "child: OVER" << std::endl;
                 // don't call atexit and stuff
                 _exit(0);
             }
@@ -219,10 +230,9 @@ class test_comm : public TestFixture
 
     void IPCommToServer()
     {
-        pid_t pid;
         string data;
 
-        switch(pid=fork())
+        switch(child_pid=fork())
         {
             case -1:
             {
@@ -245,8 +255,10 @@ class test_comm : public TestFixture
             {
                 socket_server ss(6666);
 
+                time_t t0 = time(NULL);
+
                 // max 10 sec
-                for (int i=0; i < 10; i++)
+                while (time(NULL) < t0 + 10 )
                 {
                     ss.fill_buffer(1000000);
 
@@ -260,9 +272,7 @@ class test_comm : public TestFixture
 
     void IPCommToServerAndBack()
     {
-        pid_t pid;
-
-        switch(pid=fork())
+        switch(child_pid=fork())
         {
             case -1:
             {
@@ -275,8 +285,10 @@ class test_comm : public TestFixture
                 socket_server ss(6666);
                 ss.set_logging(&cerr,debug);
 
+                time_t t0 = time(NULL);
+
                 // max 10 sec
-                for (int i=0; i < 10; i++)
+                while (time(NULL) < t0 + 10 )
                 {
                     ss.fill_buffer(1000000);
 
@@ -327,6 +339,69 @@ class test_comm : public TestFixture
         }
     }
 
+
+    void IPCommToServerAndBackBig()
+    {
+        switch(child_pid=fork())
+        {
+            case -1:
+            {
+                CPPUNIT_FAIL("fork error");
+                break;
+            }
+            case 0:
+            // child
+            {
+                socket_server ss(6666);
+                ss.set_logging(&cerr,debug);
+
+                time_t t0 = time(NULL);
+
+                // max 10 sec
+                while (time(NULL) < t0 + 10 )
+                {
+                    ss.fill_buffer(1000000);
+
+                    string data;
+                    unsigned int cid;
+
+                    if(ss.get_packet(data,cid))
+                    {
+                        server_connection* con=ss.get_connection(cid);
+
+                        socket_handler* alias= dynamic_cast< socket_handler* >(con);
+
+                        if (data=="QUIT")
+                            break;
+
+                        alias->set_write_block_size( 4093 );
+                        con->write(string().insert(0,2048*1024,'y'));
+                    }
+                }
+                // don't call atexit and stuff
+                _exit(0);
+            }
+
+            default:
+            // parent
+            {
+                string data;
+
+                // wait till server is up
+                sleep(1);
+                socket_client_connection sc(6666);
+
+                sc.write(string().insert(0,100*1024,'x'));
+
+                while (!sc.get_packet(data))
+                    sc.fill_buffer(1000000);
+
+                CPPUNIT_ASSERT_EQUAL(string().insert(0,2048*1024,'y'),data);
+
+                sc.write("QUIT");
+            }
+        }
+    } // eo IPCommToServerAndBackBig()
 };
 
 CPPUNIT_TEST_SUITE_REGISTRATION(test_comm);