Changeset 1717 for pjproject/trunk

Timestamp:

Jan 19, 2008 1:01:42 PM (17 years ago)

Author:

bennylp

Message:

Ticket #455: allocate pjsua call id in round robin fashion

Location:

pjproject/trunk/pjsip

Files:

• include/pjsua-lib/pjsua_internal.h (modified) (1 diff)
• src/pjsua-lib/pjsua_call.c (modified) (3 diffs)

pjproject/trunk/pjsip/include/pjsua-lib/pjsua_internal.h

@@ -216 +216 @@
     unsigned             call_cnt;              /**< Call counter.      */
     pjsua_call           calls[PJSUA_MAX_CALLS];/**< Calls array.       */
+    pjsua_call_id        next_call_id;          /**< Next call id to use*/
 
     /* Buddy; */

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_call.c

@@ -215 +215 @@
 #define LATE_SDP    0
 
+/* Allocate one call id */
+static pjsua_call_id alloc_call_id(void)
+{
+    pjsua_call_id cid;
+
+#if 1
+    /* New algorithm: round-robin */
+    if (pjsua_var.next_call_id >= (int)pjsua_var.ua_cfg.max_calls || 
+        pjsua_var.next_call_id < 0)
+    {
+        cid = 0;
+    }
+
+    for (cid=pjsua_var.next_call_id; 
+         cid<(int)pjsua_var.ua_cfg.max_calls; 
+         ++cid) 
+    {
+        if (pjsua_var.calls[cid].inv == NULL) {
+            ++pjsua_var.next_call_id;
+            return cid;
+        }
+    }
+
+    for (cid=0; cid < pjsua_var.next_call_id; ++cid) {
+        if (pjsua_var.calls[cid].inv == NULL) {
+            ++pjsua_var.next_call_id;
+            return cid;
+        }
+    }
+
+#else
+    /* Old algorithm */
+    for (cid=0; cid<(int)pjsua_var.ua_cfg.max_calls; ++cid) {
+        if (pjsua_var.calls[cid].inv == NULL)
+            return cid;
+    }
+#endif
+
+    return PJSUA_INVALID_ID;
+}
+
 /*
  * Make outgoing call to the specified URI using the specified account.
@@ -254 +295 @@
 
     /* Find free call slot. */
-    for (call_id=0; call_id<(int)pjsua_var.ua_cfg.max_calls; ++call_id) {
-        if (pjsua_var.calls[call_id].inv == NULL)
-            break;
-    }
-
-    if (call_id == (int)pjsua_var.ua_cfg.max_calls) {
+    call_id = alloc_call_id();
+
+    if (call_id == PJSUA_INVALID_ID) {
         pjsua_perror(THIS_FILE, "Error making file", PJ_ETOOMANY);
         PJSUA_UNLOCK();
@@ -498 +536 @@
 
     /* Find free call slot. */
-    for (call_id=0; call_id<(int)pjsua_var.ua_cfg.max_calls; ++call_id) {
-        if (pjsua_var.calls[call_id].inv == NULL)
-            break;
-    }
-
-    if (call_id == (int)pjsua_var.ua_cfg.max_calls) {
+    call_id = alloc_call_id();
+
+    if (call_id == PJSUA_INVALID_ID) {
         pjsip_endpt_respond_stateless(pjsua_var.endpt, rdata, 
                                       PJSIP_SC_BUSY_HERE, NULL,