Changeset 14 for pjproject/main/pjlib/src/pj/ioqueue_select.c

Timestamp:

Nov 6, 2005 4:50:38 PM (18 years ago)

Author:

bennylp

Message:

Tested new ioqueue framework on Linux with select and epoll

File:

• pjproject/main/pjlib/src/pj/ioqueue_select.c (modified) (4 diffs)

pjproject/main/pjlib/src/pj/ioqueue_select.c

@@ -206 +206 @@
     key = (pj_ioqueue_key_t*)pj_pool_zalloc(pool, sizeof(pj_ioqueue_key_t));
     rc = ioqueue_init_key(pool, ioqueue, key, sock, user_data, cb);
-    if (rc != PJ_SUCCESS)
-        return rc;
+    if (rc != PJ_SUCCESS) {
+        key = NULL;
+        goto on_return;
+    }
 
     /* Register */
@@ -381 +383 @@
     struct event
     {
-        pj_ioqueue_key_t    *key;
-        enum event_type      event_type;
+        pj_ioqueue_key_t        *key;
+        enum ioqueue_event_type  event_type;
     } event[PJ_IOQUEUE_MAX_EVENTS_IN_SINGLE_POLL];
 
@@ -453 +455 @@
             event[counter].key = h;
             event[counter].event_type = READABLE_EVENT;
-            ++counter;        }
+            ++counter;
+        }
 
 #if PJ_HAS_TCP
@@ -483 +486 @@
             break;
         case NO_EVENT:
-        default:
             pj_assert(!"Invalid event!");
             break;