Changeset 3257

Timestamp:

Aug 6, 2010 8:40:55 AM (14 years ago)

Author:

bennylp

Message:

Misc (re #1068): fixed couple of problems with http client unit test:

• crash because server is let running
• SIGPIPE on Linux in the test server code

File:

• pjproject/trunk/pjlib-util/src/pjlib-util-test/http_client.c (modified) (9 diffs)

pjproject/trunk/pjlib-util/src/pjlib-util-test/http_client.c

@@ -65 +65 @@
 {
     struct server_t *srv = (struct server_t*)p;
+    char *pkt = (char*)pj_pool_alloc(pool, srv->buf_size);
     pj_sock_t newsock;
 
     while (!thread_quit) {
-        char *pkt = (char*)pj_pool_alloc(pool, srv->buf_size);
         pj_ssize_t pkt_len;
         int rc;
         pj_fd_set_t rset;
-        pj_time_val timeout = {0, 100};
-
-        rc = pj_sock_accept(srv->sock, &newsock, NULL, NULL);
-        if (rc != 0)
-            continue;
-
-        PJ_FD_ZERO(&rset);
-        PJ_FD_SET(newsock, &rset);
-        rc = pj_sock_select(newsock+1, &rset, NULL, NULL, &timeout);
-        if (rc != 1)
-            continue;
-
-        pkt_len = srv->buf_size;
-        do {
-            rc = pj_sock_recv(newsock, pkt, &pkt_len, 0);
-            if (rc != 0) {
-                app_perror("Server error receiving packet", rc);
+        pj_time_val timeout = {0, 500};
+
+        while (!thread_quit) {
+            PJ_FD_ZERO(&rset);
+            PJ_FD_SET(srv->sock, &rset);
+            rc = pj_sock_select(srv->sock+1, &rset, NULL, NULL, &timeout);
+            if (rc != 1) {
+                continue;
+            }
+
+            rc = pj_sock_accept(srv->sock, &newsock, NULL, NULL);
+            if (rc == PJ_SUCCESS) {
+                break;
+            }
+        }
+
+        if (thread_quit)
+            break;
+
+        while (!thread_quit) {
+            PJ_FD_ZERO(&rset);
+            PJ_FD_SET(newsock, &rset);
+            rc = pj_sock_select(newsock+1, &rset, NULL, NULL, &timeout);
+            if (rc != 1) {
+                PJ_LOG(3,("http test", "client timeout"));
                 continue;
             }
-            rc = pj_sock_select(newsock+1, &rset, NULL, NULL, &timeout);
-            if (rc < 1)
+
+            pkt_len = srv->buf_size;
+            rc = pj_sock_recv(newsock, pkt, &pkt_len, 0);
+            if (rc == PJ_SUCCESS) {
                 break;
-        } while(1);
+            }
+        }
+
+        if (thread_quit)
+            break;
 
         /* Simulate network RTT */
@@ -111 +125 @@
             pj_ansi_sprintf(pkt + pj_ansi_strlen(pkt), "\r\n");
             pkt_len = pj_ansi_strlen(pkt);
-            pj_sock_send(newsock, pkt, &pkt_len, 0);
+            rc = pj_sock_send(newsock, pkt, &pkt_len, 0);
+            if (rc != PJ_SUCCESS) {
+                pj_sock_close(newsock);
+                continue;
+            }
             while (send_size < srv->data_size) {
                 pkt_len = srv->data_size - send_size;
@@ -120 +138 @@
                 pj_ansi_sprintf(pkt, "\nPacket: %d", ++ctr);
                 pkt[pj_ansi_strlen(pkt)] = '\n';
-                pj_sock_send(newsock, pkt, &pkt_len, 0);
+                rc = pj_sock_send(newsock, pkt, &pkt_len, 0);
+                if (rc != PJ_SUCCESS)
+                    break;
             }
             pj_sock_close(newsock);
@@ -208 +228 @@
 
     if (test_cancel) {
+        /* Need to delay closing the client socket here, otherwise the
+         * server will get SIGPIPE when sending response.
+         */
+        pj_thread_sleep(100);
         pj_http_req_cancel(hreq, PJ_TRUE);
         test_cancel = PJ_FALSE;
@@ -356 +380 @@
 #ifdef USE_LOCAL_SERVER
     thread_quit = PJ_TRUE;
+    pj_thread_join(g_server.thread);
     pj_sock_close(g_server.sock);
 #endif
@@ -491 +516 @@
 #ifdef USE_LOCAL_SERVER
     thread_quit = PJ_TRUE;
+    pj_thread_join(g_server.thread);
     pj_sock_close(g_server.sock);
 #endif
@@ -593 +619 @@
 #ifdef USE_LOCAL_SERVER
     thread_quit = PJ_TRUE;
+    pj_thread_join(g_server.thread);
     pj_sock_close(g_server.sock);
 #endif
@@ -693 +720 @@
 #ifdef USE_LOCAL_SERVER
     thread_quit = PJ_TRUE;
+    pj_thread_join(g_server.thread);
     pj_sock_close(g_server.sock);
 #endif
@@ -783 +811 @@
 #ifdef USE_LOCAL_SERVER
     thread_quit = PJ_TRUE;
+    pj_thread_join(g_server.thread);
     pj_sock_close(g_server.sock);
 #endif