Changeset 110

Timestamp:

Jan 7, 2006 11:01:13 PM (19 years ago)

Author:

bennylp

Message:

Added prev_state in tsx_state event

Location:

pjproject/trunk/pjsip/src/pjsip

Files:

• sip_transaction.c (modified) (3 diffs)
• sip_transport_loop.c (modified) (6 diffs)

pjproject/trunk/pjsip/src/pjsip/sip_transaction.c

@@ -893 +893 @@
                            void *event_src )
 {
+    pjsip_tsx_state_e prev_state = tsx->state;
+
     PJ_LOG(5, (tsx->obj_name, "State changed from %s to %s, event=%s",
                state_str[tsx->state], state_str[state], 
@@ -910 +912 @@
     if (tsx->tsx_user && tsx->tsx_user->on_tsx_state) {
         pjsip_event e;
-        PJSIP_EVENT_INIT_TSX_STATE(e, tsx, event_src_type, event_src);
+        PJSIP_EVENT_INIT_TSX_STATE(e, tsx, event_src_type, event_src,
+                                   prev_state);
         (*tsx->tsx_user->on_tsx_state)(tsx, &e);
     }
@@ -2107 +2110 @@
         pjsip_endpt_schedule_timer( tsx->endpt, &tsx->timeout_timer, &timeout);
 
-        /* Inform TU. */
+        /* Inform TU. 
+         * blp: You might be tempted to move this notification before
+         *      sending ACK, but I think you shouldn't. Better set-up
+         *      everything before calling tsx_user's callback to avoid
+         *      mess up.
+         */
         tsx_set_state( tsx, PJSIP_TSX_STATE_COMPLETED, 
                        PJSIP_EVENT_RX_MSG, event->body.rx_msg.rdata );

pjproject/trunk/pjsip/src/pjsip/sip_transport_loop.c

@@ -254 +254 @@
 {
     struct loop_transport *loop = arg;
+    struct recv_list r;
+    struct send_list s;
+
+    pj_list_init(&r);
+    pj_list_init(&s);
 
     while (!loop->thread_quit_flag) {
@@ -263 +268 @@
         pj_lock_acquire(loop->base.lock);
 
-        /* Process pending send notification. */
+        /* Move expired send notification to local list. */
         while (!pj_list_empty(&loop->send_list)) {
             struct send_list *node = loop->send_list.next;
@@ -270 +275 @@
             if (PJ_TIME_VAL_GTE(node->sent_time, now))
                 break;
+
+            /* Delete this from the list. */
+            pj_list_erase(node);
+
+            /* Add to local list. */
+            pj_list_push_back(&s, node);
+        }
+
+        /* Move expired "incoming" packet to local list. */
+        while (!pj_list_empty(&loop->recv_list)) {
+            struct recv_list *node = loop->recv_list.next;
+
+            /* Break when next node time is greater than now. */
+            if (PJ_TIME_VAL_GTE(node->rdata.pkt_info.timestamp, now))
+                break;
+
+            /* Delete this from the list. */
+            pj_list_erase(node);
+
+            /* Add to local list. */
+            pj_list_push_back(&r, node);
+
+        }
+
+        pj_lock_release(loop->base.lock);
+
+        /* Process send notification and incoming packet notification
+         * without holding down the loop's mutex.
+         */
+        while (!pj_list_empty(&s)) {
+            struct send_list *node = s.next;
+
+            pj_list_erase(node);
 
             /* Notify callback. */
@@ -276 +314 @@
             }
 
-            /* Delete this from the list. */
-            pj_list_erase(node);
-
             /* Decrement tdata reference counter. */
             pjsip_tx_data_dec_ref(node->tdata);
         }
 
-        /* Process "incoming" packets. */
-        while (!pj_list_empty(&loop->recv_list)) {
-            struct recv_list *node = loop->recv_list.next;
+        /* Process "incoming" packet. */
+        while (!pj_list_empty(&r)) {
+            struct recv_list *node = r.next;
             pj_ssize_t size_eaten;
 
-            /* Break when next node time is greater than now. */
-            if (PJ_TIME_VAL_GTE(node->rdata.pkt_info.timestamp, now))
-                break;
+            pj_list_erase(node);
 
             /* Notify transport manager about the "incoming packet" */
@@ -298 +331 @@
             /* Must "eat" all the packets. */
             pj_assert(size_eaten == node->rdata.pkt_info.len);
-
-            /* Delete this from the list. */
-            pj_list_erase(node);
 
             /* Done. */
@@ -306 +336 @@
                                      node->rdata.tp_info.pool);
         }
-
-        pj_lock_release(loop->base.lock);
     }