Changeset 55 for pjproject/trunk/pjlib/src/pj/ioqueue_common_abs.c

Timestamp:

Nov 19, 2005 1:19:28 PM (18 years ago)

Author:

bennylp

Message:

Added PJ_IOQUEUE_ALWAYS_ASYNC flag

File:

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

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

@@ -492 +492 @@
                                       unsigned flags )
 {
-    pj_status_t status;
-    pj_ssize_t size;
     struct read_operation *read_op;
 
@@ -504 +502 @@
     /* Try to see if there's data immediately available. 
      */
-    size = *length;
-    status = pj_sock_recv(key->fd, buffer, &size, flags);
-    if (status == PJ_SUCCESS) {
-        /* Yes! Data is available! */
-        *length = size;
-        return PJ_SUCCESS;
-    } else {
-        /* If error is not EWOULDBLOCK (or EAGAIN on Linux), report
-         * the error to caller.
-         */
-        if (status != PJ_STATUS_FROM_OS(PJ_BLOCKING_ERROR_VAL))
-            return status;
-    }
+    if ((flags & PJ_IOQUEUE_ALWAYS_ASYNC) == 0) {
+        pj_status_t status;
+        pj_ssize_t size;
+
+        size = *length;
+        status = pj_sock_recv(key->fd, buffer, &size, flags);
+        if (status == PJ_SUCCESS) {
+            /* Yes! Data is available! */
+            *length = size;
+            return PJ_SUCCESS;
+        } else {
+            /* If error is not EWOULDBLOCK (or EAGAIN on Linux), report
+             * the error to caller.
+             */
+            if (status != PJ_STATUS_FROM_OS(PJ_BLOCKING_ERROR_VAL))
+                return status;
+        }
+    }
+
+    flags &= ~(PJ_IOQUEUE_ALWAYS_ASYNC);
 
     /*
@@ -548 +553 @@
                                          int *addrlen)
 {
-    pj_status_t status;
-    pj_ssize_t size;
     struct read_operation *read_op;
 
@@ -560 +563 @@
     /* Try to see if there's data immediately available. 
      */
-    size = *length;
-    status = pj_sock_recvfrom(key->fd, buffer, &size, flags,
-                              addr, addrlen);
-    if (status == PJ_SUCCESS) {
-        /* Yes! Data is available! */
-        *length = size;
-        return PJ_SUCCESS;
-    } else {
-        /* If error is not EWOULDBLOCK (or EAGAIN on Linux), report
-         * the error to caller.
-         */
-        if (status != PJ_STATUS_FROM_OS(PJ_BLOCKING_ERROR_VAL))
-            return status;
-    }
+    if ((flags & PJ_IOQUEUE_ALWAYS_ASYNC) == 0) {
+        pj_status_t status;
+        pj_ssize_t size;
+
+        size = *length;
+        status = pj_sock_recvfrom(key->fd, buffer, &size, flags,
+                                  addr, addrlen);
+        if (status == PJ_SUCCESS) {
+            /* Yes! Data is available! */
+            *length = size;
+            return PJ_SUCCESS;
+        } else {
+            /* If error is not EWOULDBLOCK (or EAGAIN on Linux), report
+             * the error to caller.
+             */
+            if (status != PJ_STATUS_FROM_OS(PJ_BLOCKING_ERROR_VAL))
+                return status;
+        }
+    }
+
+    flags &= ~(PJ_IOQUEUE_ALWAYS_ASYNC);
 
     /*
@@ -614 +624 @@
     write_op = (struct write_operation*)op_key;
     write_op->op = 0;
+
+    /* We can not use PJ_IOQUEUE_ALWAYS_ASYNC for socket write. */
+    flags &= ~(PJ_IOQUEUE_ALWAYS_ASYNC);
 
     /* Fast track:
@@ -676 +689 @@
                                        const void *data,
                                        pj_ssize_t *length,
-                                       unsigned flags,
+                                       pj_uint32_t flags,
                                        const pj_sockaddr_t *addr,
                                        int addrlen)
@@ -689 +702 @@
     write_op = (struct write_operation*)op_key;
     write_op->op = 0;
+
+    /* We can not use PJ_IOQUEUE_ALWAYS_ASYNC for socket write */
+    flags &= ~(PJ_IOQUEUE_ALWAYS_ASYNC);
 
     /* Fast track: