Changeset 536 for pjproject/trunk

Timestamp:

Jun 22, 2006 6:41:28 PM (18 years ago)

Author:

bennylp

Message:

Fixed bug: ioqueue should return error when send()/sendto() is called while previous operation on the same op_key has not finished

File:

• pjproject/trunk/pjlib/src/pj/ioqueue_common_abs.c (modified) (11 diffs)

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

@@ -27 +27 @@
  * This file is NOT supposed to be compiled as stand-alone source.
  */
+
+#define PENDING_RETRY   2
 
 static void ioqueue_init( pj_ioqueue_t *ioqueue )
@@ -281 +283 @@
         sent = write_op->size - write_op->written;
         if (write_op->op == PJ_IOQUEUE_OP_SEND) {
-            write_op->op = 0;
             send_rc = pj_sock_send(h->fd, write_op->buf+write_op->written,
                                    &sent, write_op->flags);
+            /* Can't do this. We only clear "op" after we're finished sending
+             * the whole buffer.
+             */
+            //write_op->op = 0;
         } else if (write_op->op == PJ_IOQUEUE_OP_SEND_TO) {
-            write_op->op = 0;
             send_rc = pj_sock_sendto(h->fd, 
                                      write_op->buf+write_op->written,
@@ -291 +295 @@
                                      &write_op->rmt_addr, 
                                      write_op->rmt_addrlen);
+            /* Can't do this. We only clear "op" after we're finished sending
+             * the whole buffer.
+             */
+            //write_op->op = 0;
         } else {
             pj_assert(!"Invalid operation type!");
@@ -309 +317 @@
             h->fd_type == PJ_SOCK_DGRAM) 
         {
+
+            write_op->op = 0;
+
             if (h->fd_type != PJ_SOCK_DGRAM) {
                 /* Write completion of the whole stream. */
                 pj_list_erase(write_op);
-                write_op->op = 0;
 
                 /* Clear operation if there's no more data to send. */
@@ -663 +673 @@
     struct write_operation *write_op;
     pj_status_t status;
+    unsigned retry;
     pj_ssize_t sent;
 
@@ -671 +682 @@
     if (key->closing)
         return PJ_ECANCELLED;
-
-    write_op = (struct write_operation*)op_key;
-    write_op->op = 0;
 
     /* We can not use PJ_IOQUEUE_ALWAYS_ASYNC for socket write. */
@@ -715 +723 @@
      * Schedule asynchronous send.
      */
+    write_op = (struct write_operation*)op_key;
+
+    /* Spin if write_op has pending operation */
+    for (retry=0; write_op->op != 0 && retry<PENDING_RETRY; ++retry)
+        pj_thread_sleep(0);
+
+    /* Last chance */
+    if (write_op->op) {
+        /* Unable to send packet because there is already pending write in the
+         * write_op. We could not put the operation into the write_op
+         * because write_op already contains a pending operation! And
+         * we could not send the packet directly with send() either,
+         * because that will break the order of the packet. So we can
+         * only return error here.
+         *
+         * This could happen for example in multithreads program,
+         * where polling is done by one thread, while other threads are doing
+         * the sending only. If the polling thread runs on lower priority
+         * than the sending thread, then it's possible that the pending
+         * write flag is not cleared in-time because clearing is only done
+         * during polling. 
+         *
+         * Aplication should specify multiple write operation keys on
+         * situation like this.
+         */
+        //pj_assert(!"ioqueue: there is pending operation on this key!");
+        return PJ_EBUSY;
+    }
+
     write_op->op = PJ_IOQUEUE_OP_SEND;
     write_op->buf = (void*)data;
@@ -744 +781 @@
 {
     struct write_operation *write_op;
+    unsigned retry;
     pj_status_t status;
     pj_ssize_t sent;
@@ -753 +791 @@
     if (key->closing)
         return PJ_ECANCELLED;
-
-    write_op = (struct write_operation*)op_key;
-    write_op->op = 0;
 
     /* We can not use PJ_IOQUEUE_ALWAYS_ASYNC for socket write */
@@ -791 +826 @@
                 return status;
             }
+            status = status;
         }
     }
@@ -802 +838 @@
      * Schedule asynchronous send.
      */
+    write_op = (struct write_operation*)op_key;
+    
+    /* Spin if write_op has pending operation */
+    for (retry=0; write_op->op != 0 && retry<PENDING_RETRY; ++retry)
+        pj_thread_sleep(0);
+
+    /* Last chance */
+    if (write_op->op) {
+        /* Unable to send packet because there is already pending write on the
+         * write_op. We could not put the operation into the write_op
+         * because write_op already contains a pending operation! And
+         * we could not send the packet directly with sendto() either,
+         * because that will break the order of the packet. So we can
+         * only return error here.
+         *
+         * This could happen for example in multithreads program,
+         * where polling is done by one thread, while other threads are doing
+         * the sending only. If the polling thread runs on lower priority
+         * than the sending thread, then it's possible that the pending
+         * write flag is not cleared in-time because clearing is only done
+         * during polling. 
+         *
+         * Aplication should specify multiple write operation keys on
+         * situation like this.
+         */
+        //pj_assert(!"ioqueue: there is pending operation on this key!");
+        return PJ_EBUSY;
+    }
+
     write_op->op = PJ_IOQUEUE_OP_SEND_TO;
     write_op->buf = (void*)data;