Changeset 4359 for pjproject/trunk/pjlib/src/pj/activesock.c

Timestamp:

Feb 21, 2013 11:18:36 AM (11 years ago)

Author:

bennylp

Message:

Fixed #1616: Implementation of Group lock and other foundation in PJLIB for fixing synchronization issues

File:

• pjproject/trunk/pjlib/src/pj/activesock.c (modified) (14 diffs)

pjproject/trunk/pjlib/src/pj/activesock.c

@@ -44 +44 @@
 };
 
+enum shutdown_dir
+{
+    SHUT_NONE = 0,
+    SHUT_RX = 1,
+    SHUT_TX = 2
+};
+
 struct read_op
 {
@@ -78 +85 @@
     void                *user_data;
     unsigned             async_count;
+    unsigned             shutdown;
     unsigned             max_loop;
     pj_activesock_cb     cb;
@@ -210 +218 @@
 #endif
 
-    status = pj_ioqueue_register_sock(pool, ioqueue, sock, asock, 
-                                      &ioq_cb, &asock->key);
+    status = pj_ioqueue_register_sock2(pool, ioqueue, sock,
+                                       (opt? opt->grp_lock : NULL),
+                                       asock, &ioq_cb, &asock->key);
     if (status != PJ_SUCCESS) {
         pj_activesock_close(asock);
@@ -284 +293 @@
 }
 
-
 PJ_DEF(pj_status_t) pj_activesock_close(pj_activesock_t *asock)
 {
     PJ_ASSERT_RETURN(asock, PJ_EINVAL);
+    asock->shutdown = SHUT_RX | SHUT_TX;
     if (asock->key) {
 #if defined(PJ_IPHONE_OS_HAS_MULTITASKING_SUPPORT) && \
@@ -448 +457 @@
 
     asock = (pj_activesock_t*) pj_ioqueue_get_user_data(key);
+
+    /* Ignore if we've been shutdown */
+    if (asock->shutdown & SHUT_RX)
+        return;
 
     do {
@@ -570 +583 @@
                 return;
 
+            /* Also stop further read if we've been shutdown */
+            if (asock->shutdown & SHUT_RX)
+                return;
+
             /* Only stream oriented socket may leave data in the packet */
             if (asock->stream_oriented) {
@@ -649 +666 @@
     PJ_ASSERT_RETURN(asock && send_key && data && size, PJ_EINVAL);
 
+    if (asock->shutdown & SHUT_TX)
+        return PJ_EINVALIDOP;
+
     send_key->activesock_data = NULL;
 
@@ -699 +719 @@
                      PJ_EINVAL);
 
+    if (asock->shutdown & SHUT_TX)
+        return PJ_EINVALIDOP;
+
     return pj_ioqueue_sendto(asock->key, send_key, data, size, flags,
                              addr, addr_len);
@@ -711 +734 @@
 
     asock = (pj_activesock_t*) pj_ioqueue_get_user_data(key);
+
+    /* Ignore if we've been shutdown. This may cause data to be partially
+     * sent even when 'wholedata' was requested if the OS only sent partial
+     * buffer.
+     */
+    if (asock->shutdown & SHUT_TX)
+        return;
 
     if (bytes_sent > 0 && op_key->activesock_data) {
@@ -756 +786 @@
     PJ_ASSERT_RETURN(asock, PJ_EINVAL);
     PJ_ASSERT_RETURN(asock->accept_op==NULL, PJ_EINVALIDOP);
+
+    /* Ignore if we've been shutdown */
+    if (asock->shutdown)
+        return PJ_EINVALIDOP;
 
     asock->accept_op = (struct accept_op*)
@@ -798 +832 @@
 
     PJ_UNUSED_ARG(new_sock);
+
+    /* Ignore if we've been shutdown */
+    if (asock->shutdown)
+        return;
 
     do {
@@ -836 +874 @@
         }
 
+        /* Don't start another accept() if we've been shutdown */
+        if (asock->shutdown)
+            return;
+
         /* Prepare next accept() */
         accept_op->new_sock = PJ_INVALID_SOCKET;
@@ -854 +896 @@
 {
     PJ_UNUSED_ARG(pool);
+
+    if (asock->shutdown)
+        return PJ_EINVALIDOP;
+
     return pj_ioqueue_connect(asock->key, remaddr, addr_len);
 }
@@ -861 +907 @@
 {
     pj_activesock_t *asock = (pj_activesock_t*) pj_ioqueue_get_user_data(key);
+
+    /* Ignore if we've been shutdown */
+    if (asock->shutdown)
+        return;
 
     if (asock->cb.on_connect_complete) {