Changeset 4420 for pjproject/trunk/pjsip/src/test/tsx_uac_test.c

Timestamp:

Mar 5, 2013 11:59:54 AM (12 years ago)

Author:

bennylp

Message:

Implementation of Re #1628: Modify SIP transaction to use group lock to avoid deadlock etc.

File:

• pjproject/trunk/pjsip/src/test/tsx_uac_test.c (modified) (3 diffs)

pjproject/trunk/pjsip/src/test/tsx_uac_test.c

@@ -221 +221 @@
 
             /* Test the status code. */
-            if (tsx->status_code != PJSIP_SC_TSX_TRANSPORT_ERROR) {
-                PJ_LOG(3,(THIS_FILE, 
-                          "    error: status code is %d instead of %d",
-                          tsx->status_code, PJSIP_SC_TSX_TRANSPORT_ERROR));
+            if (tsx->status_code != PJSIP_SC_TSX_TRANSPORT_ERROR &&
+                tsx->status_code != PJSIP_SC_BAD_GATEWAY)
+            {
+                PJ_LOG(3,(THIS_FILE, 
+                          "    error: status code is %d instead of %d or %d",
+                          tsx->status_code, PJSIP_SC_TSX_TRANSPORT_ERROR,
+                          PJSIP_SC_BAD_GATEWAY));
                 test_complete = -720;
             }
@@ -689 +692 @@
             if (tsx) {
                 pjsip_tsx_terminate(tsx, PJSIP_SC_REQUEST_TERMINATED);
-                pj_mutex_unlock(tsx->mutex);
+                pj_grp_lock_release(tsx->grp_lock);
             } else {
                 PJ_LOG(3,(THIS_FILE, "    error: uac transaction not found!"));
@@ -1028 +1031 @@
         if (tsx) {
             pjsip_tsx_terminate(tsx, PJSIP_SC_REQUEST_TERMINATED);
-            pj_mutex_unlock(tsx->mutex);
+            pj_grp_lock_release(tsx->grp_lock);
             flush_events(1000);
         }