Changeset 3316 for pjproject

Timestamp:

Sep 22, 2010 1:11:11 PM (14 years ago)

Author:

ming

Message:

Fixed #1130
Since the problem may not be iOS4 specific, a general approach is adopted to fix the problem.

Location:

pjproject/trunk/pjlib

Files:

• include/pj/config.h (modified) (1 diff)
• src/pj/activesock.c (modified) (2 diffs)

pjproject/trunk/pjlib/include/pj/config.h

@@ -505 +505 @@
 #ifndef PJ_MAX_HOSTNAME
 #  define PJ_MAX_HOSTNAME           (128)
+#endif
+
+/**
+ * Maximum consecutive identical error for accept() operation before
+ * activesock stops calling the next ioqueue accept.
+ *
+ * Default: 50
+ */
+#ifndef PJ_ACTIVESOCK_MAX_CONSECUTIVE_ACCEPT_ERROR
+#   define PJ_ACTIVESOCK_MAX_CONSECUTIVE_ACCEPT_ERROR 50
 #endif
 

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

@@ -85 +85 @@
 #endif
     
+    unsigned             err_counter;
+    pj_status_t          last_err;
+
     struct send_data     send_data;
 
@@ -791 +794 @@
 
     do {
+        if (status == asock->last_err && status != PJ_SUCCESS) {
+            asock->err_counter++;
+            if (asock->err_counter >= PJ_ACTIVESOCK_MAX_CONSECUTIVE_ACCEPT_ERROR) {
+                PJ_LOG(3, ("", "Received %d consecutive errors: %d for the accept()"
+                               " operation, stopping further ioqueue accepts.",
+                               asock->err_counter, asock->last_err));
+                return;
+            }
+        } else {
+            asock->err_counter = 0;
+            asock->last_err = status;
+        }
+
         if (status==PJ_SUCCESS && asock->cb.on_accept_complete) {
             pj_bool_t ret;