Changeset 1654 for pjproject/trunk/pjnath/src/pjnath/ice_session.c

Timestamp:

Jan 2, 2008 8:24:10 AM (16 years ago)

Author:

bennylp

Message:

Ticket #437: reduce stack and pool usage on pjnath to make it work better on Symbian

File:

• pjproject/trunk/pjnath/src/pjnath/ice_session.c (modified) (24 diffs)

pjproject/trunk/pjnath/src/pjnath/ice_session.c

@@ -18 +18 @@
  */
 #include <pjnath/ice_session.h>
-#include <pjnath/errno.h>
 #include <pj/addr_resolv.h>
 #include <pj/array.h>
@@ -262 +261 @@
         name = "ice%p";
 
-    pool = pj_pool_create(stun_cfg->pf, name, 4000, 4000, NULL);
+    pool = pj_pool_create(stun_cfg->pf, name, PJNATH_POOL_LEN_ICE_SESS, 
+                          PJNATH_POOL_INC_ICE_SESS, NULL);
     ice = PJ_POOL_ZALLOC_T(pool, pj_ice_sess);
     ice->pool = pool;
@@ -558 +558 @@
     pj_ice_sess_cand *lcand;
     pj_status_t status = PJ_SUCCESS;
-    char tmp[128];
 
     PJ_ASSERT_RETURN(ice && comp_id && 
@@ -585 +584 @@
 
 
-    pj_ansi_strcpy(tmp, pj_inet_ntoa(lcand->addr.ipv4.sin_addr));
+    pj_ansi_strcpy(ice->tmp.txt, pj_inet_ntoa(lcand->addr.ipv4.sin_addr));
     LOG4((ice->obj_name, 
          "Candidate %d added: comp_id=%d, type=%s, foundation=%.*s, "
@@ -594 +593 @@
          (int)lcand->foundation.slen,
          lcand->foundation.ptr,
-         tmp, 
+         ice->tmp.txt, 
          (int)pj_ntohs(lcand->addr.ipv4.sin_port),
          pj_inet_ntoa(lcand->base_addr.ipv4.sin_addr),
@@ -734 +733 @@
     const pj_ice_sess_cand *lcand = check->lcand;
     const pj_ice_sess_cand *rcand = check->rcand;
-    char laddr[CHECK_NAME_LEN];
+    char laddr[PJ_INET6_ADDRSTRLEN];
     int len;
+
+    PJ_CHECK_STACK();
 
     pj_ansi_strcpy(laddr, pj_inet_ntoa(lcand->addr.ipv4.sin_addr));
@@ -761 +762 @@
 }
 
-static void dump_checklist(const char *title, const pj_ice_sess *ice, 
+static void dump_checklist(const char *title, pj_ice_sess *ice, 
                            const pj_ice_sess_checklist *clist)
 {
     unsigned i;
-    char buffer[CHECK_NAME_LEN];
 
     LOG4((ice->obj_name, "%s", title));
@@ -771 +771 @@
         const pj_ice_sess_check *c = &clist->checks[i];
         LOG4((ice->obj_name, " %s (%s, state=%s)",
-             dump_check(buffer, sizeof(buffer), clist, c),
+             dump_check(ice->tmp.txt, sizeof(ice->tmp.txt), clist, c),
              (c->nominated ? "nominated" : "not nominated"), 
              check_state_name[c->state]));
@@ -785 +785 @@
                             pj_status_t err_code)
 {
-    char buf[CHECK_NAME_LEN];
-
     pj_assert(check->state < PJ_ICE_SESS_CHECK_STATE_SUCCEEDED);
 
     LOG5((ice->obj_name, "Check %s: state changed from %s to %s",
-         dump_check(buf, sizeof(buf), &ice->clist, check),
+         dump_check(ice->tmp.txt, sizeof(ice->tmp.txt), &ice->clist, check),
          check_state_name[check->state],
          check_state_name[st]));
@@ -938 +936 @@
             if (reason != NULL) {
                 /* Found duplicate, remove it */
-                char buf[CHECK_NAME_LEN];
-
                 LOG5((ice->obj_name, "Check %s pruned (%s)",
-                      dump_check(buf, sizeof(buf), &ice->clist, 
-                                 &clist->checks[j]),
+                      dump_check(ice->tmp.txt, sizeof(ice->tmp.txt), 
+                                 &ice->clist, &clist->checks[j]),
                       reason));
 
@@ -976 +972 @@
 {
     if (!ice->is_complete) {
-        char errmsg[PJ_ERR_MSG_SIZE];
-
         ice->is_complete = PJ_TRUE;
         ice->ice_status = status;
@@ -983 +977 @@
         /* Log message */
         LOG4((ice->obj_name, "ICE process complete, status=%s", 
-             pj_strerror(status, errmsg, sizeof(errmsg)).ptr));
+             pj_strerror(status, ice->tmp.errmsg, 
+                         sizeof(ice->tmp.errmsg)).ptr));
 
         dump_checklist("Valid list", ice, &ice->valid_list);
@@ -1057 +1052 @@
     if (check->err_code==PJ_SUCCESS && check->nominated) {
         pj_ice_sess_comp *comp;
-        char buf[CHECK_NAME_LEN];
 
         LOG5((ice->obj_name, "Check %d is successful and nominated",
@@ -1075 +1069 @@
                     LOG5((ice->obj_name, 
                          "Check %s to be failed because state is %s",
-                         dump_check(buf, sizeof(buf), &ice->clist, c), 
+                         dump_check(ice->tmp.txt, sizeof(ice->tmp.txt), 
+                                    &ice->clist, c), 
                          check_state_name[c->state]));
                     check_set_state(ice, c, PJ_ICE_SESS_CHECK_STATE_FAILED,
@@ -1088 +1083 @@
                         LOG5((ice->obj_name, 
                              "Cancelling check %s (In Progress)",
-                             dump_check(buf, sizeof(buf), &ice->clist, c)));
+                             dump_check(ice->tmp.txt, sizeof(ice->tmp.txt), 
+                                        &ice->clist, c)));
                         pj_stun_session_cancel_req(comp->stun_sess, 
                                                    c->tdata, PJ_FALSE, 0);
@@ -1369 +1365 @@
     const pj_ice_sess_cand *rcand;
     pj_uint32_t prio;
-    char buffer[128];
     pj_status_t status;
 
@@ -1379 +1374 @@
     LOG5((ice->obj_name, 
          "Sending connectivity check for check %s", 
-         dump_check(buffer, sizeof(buffer), clist, check)));
+         dump_check(ice->tmp.txt, sizeof(ice->tmp.txt), clist, check)));
 
     /* Create request */
@@ -1554 +1549 @@
     pj_ice_sess_checklist *clist;
     const pj_ice_sess_cand *cand0;
-    const pj_str_t *flist[PJ_ICE_MAX_CAND];
+    const pj_str_t *flist[PJ_ICE_MAX_CAND]; // XXX
     pj_ice_rx_check *rcheck;
     unsigned i, flist_cnt = 0;
+    pj_time_val delay;
+    pj_status_t status;
 
     PJ_ASSERT_RETURN(ice, PJ_EINVAL);
@@ -1625 +1622 @@
 
     /* Start periodic check */
-    return start_periodic_check(ice->stun_cfg.timer_heap, &clist->timer);
+    /* We could start it immediately like below, but lets schedule timer 
+     * instead to reduce stack usage:
+     * return start_periodic_check(ice->stun_cfg.timer_heap, &clist->timer);
+     */
+    clist->timer.id = PJ_TRUE;
+    delay.sec = delay.msec = 0;
+    status = pj_timer_heap_schedule(ice->stun_cfg.timer_heap, 
+                                    &clist->timer, &delay);
+    if (status != PJ_SUCCESS) {
+        clist->timer.id = PJ_FALSE;
+    }
+
+    return status;
 }
 
@@ -1662 +1671 @@
     pj_ice_sess_checklist *clist;
     pj_stun_xor_mapped_addr_attr *xaddr;
-    char buffer[CHECK_NAME_LEN];
     unsigned i;
 
@@ -1731 +1739 @@
         LOG4((ice->obj_name, 
              "Check %s%s: connectivity check FAILED: %s",
-             dump_check(buffer, sizeof(buffer), &ice->clist, check),
+             dump_check(ice->tmp.txt, sizeof(ice->tmp.txt), 
+                        &ice->clist, check),
              (check->nominated ? " (nominated)" : " (not nominated)"),
              errmsg));
@@ -1754 +1763 @@
         LOG4((ice->obj_name, 
              "Check %s%s: connectivity check FAILED: source address mismatch",
-             dump_check(buffer, sizeof(buffer), &ice->clist, check),
+             dump_check(ice->tmp.txt, sizeof(ice->tmp.txt), 
+                        &ice->clist, check),
              (check->nominated ? " (nominated)" : " (not nominated)")));
         check_set_state(ice, check, PJ_ICE_SESS_CHECK_STATE_FAILED, status);
@@ -1780 +1790 @@
     LOG4((ice->obj_name, 
          "Check %s%s: connectivity check SUCCESS",
-         dump_check(buffer, sizeof(buffer), &ice->clist, check),
+         dump_check(ice->tmp.txt, sizeof(ice->tmp.txt), 
+                    &ice->clist, check),
          (check->nominated ? " (nominated)" : " (not nominated)")));
 
@@ -2358 +2369 @@
                                            NULL, src_addr, src_addr_len);
         if (status != PJ_SUCCESS) {
-            char errmsg[PJ_ERR_MSG_SIZE];
-            pj_strerror(status, errmsg, sizeof(errmsg));
+            pj_strerror(status, ice->tmp.errmsg, sizeof(ice->tmp.errmsg));
             LOG4((ice->obj_name, "Error processing incoming message: %s",
-                  errmsg));
+                  ice->tmp.errmsg));
         }
     } else {