Changeset 486

Timestamp:

Jun 1, 2006 11:41:38 AM (18 years ago)

Author:

bennylp

Message:

Added pjsip_endpt_handle_events2(), which has an additional argument to report how many events are caught in the poll

Location:

pjproject/trunk/pjsip

Files:

• include/pjsip/sip_endpoint.h (modified) (1 diff)
• src/pjsip/sip_endpoint.c (modified) (3 diffs)

pjproject/trunk/pjsip/include/pjsip/sip_endpoint.h

@@ -117 +117 @@
 
 /**
+ * Handle events with additional info about number of events that
+ * have been handled.
+ *
+ * @param endpt         The endpoint.
+ * @param max_timeout   Maximum time to wait for events, or NULL to wait forever
+ *                      until event is received.
+ * @param count         Optional argument to receive the number of events that
+ *                      have been handled by the function.
+ *
+ * @return              PJ_SUCCESS on success.
+ */
+PJ_DECL(pj_status_t) pjsip_endpt_handle_events2(pjsip_endpoint *endpt,
+                                                const pj_time_val *max_timeout,
+                                                unsigned *count);
+/**
  * Schedule timer to endpoint's timer heap. Application must poll the endpoint
  * periodically (by calling #pjsip_endpt_handle_events) to ensure that the

pjproject/trunk/pjsip/src/pjsip/sip_endpoint.c

@@ -583 +583 @@
 }
 
-/*
- * Handle events.
- */
-PJ_DEF(pj_status_t) pjsip_endpt_handle_events(pjsip_endpoint *endpt,
-                                              const pj_time_val *max_timeout)
+
+PJ_DEF(pj_status_t) pjsip_endpt_handle_events2(pjsip_endpoint *endpt,
+                                               const pj_time_val *max_timeout,
+                                               unsigned *p_count)
 {
     /* timeout is 'out' var. This just to make compiler happy. */
     pj_time_val timeout = { 0, 0};
+    unsigned count = 0;
+    int c;
 
     PJ_LOG(6, (THIS_FILE, "pjsip_endpt_handle_events()"));
@@ -598 +599 @@
      */
     timeout.sec = timeout.msec = 0;
-    pj_timer_heap_poll( endpt->timer_heap, &timeout );
+    c = pj_timer_heap_poll( endpt->timer_heap, &timeout );
+    if (c > 0)
+        count += c;
 
     /* timer_heap_poll should never ever returns negative value, or otherwise
@@ -613 +616 @@
 
     /* Poll ioqueue. */
-    if (pj_ioqueue_poll( endpt->ioqueue, &timeout) < 0) {
+    c = pj_ioqueue_poll( endpt->ioqueue, &timeout);
+    if (c < 0) {
         pj_thread_sleep(1);
+        if (p_count)
+            *p_count = count;
         return pj_get_netos_error();
     } else {
+        count += c;
+        if (p_count)
+            *p_count = count;
         return PJ_SUCCESS;
     }
+}
+
+/*
+ * Handle events.
+ */
+PJ_DEF(pj_status_t) pjsip_endpt_handle_events(pjsip_endpoint *endpt,
+                                              const pj_time_val *max_timeout)
+{
+    return pjsip_endpt_handle_events2(endpt, max_timeout, NULL);
 }