Changeset 139 for pjproject/trunk/pjsip/src/pjsip/sip_transaction.c

Timestamp:

Feb 7, 2006 12:34:11 PM (18 years ago)

Author:

bennylp

Message:

Initial implementation of invite session abstraction, and updated pjsua for the new framework

File:

• pjproject/trunk/pjsip/src/pjsip/sip_transaction.c (modified) (11 diffs)

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

@@ -32 +32 @@
 
 #define THIS_FILE   "sip_transaction.c"
+
+#if 0
+#define TSX_TRACE_(expr)    PJ_LOG(3,expr)
+#else
+#define TSX_TRACE_(expr)
+#endif
+
 
 /*****************************************************************************
@@ -505 +512 @@
     pj_mutex_lock(mod_tsx_layer.mutex);
 
-    /* Check if no transaction with the same key exists. */
-    PJ_ASSERT_ON_FAIL(pj_hash_get( mod_tsx_layer.htable, 
-                                   &tsx->transaction_key.ptr,
-                                   tsx->transaction_key.slen, 
-                                   &tsx->hashed_key) == NULL,
-                        {
-                            pj_mutex_unlock(mod_tsx_layer.mutex);
-                            return PJ_EEXISTS;
-                        }
-                      );
+    /* Check if no transaction with the same key exists. 
+     * Do not use PJ_ASSERT_RETURN since it evaluates the expression
+     * twice!
+     */
+    pj_assert(pj_hash_get( mod_tsx_layer.htable, 
+                           &tsx->transaction_key.ptr,
+                           tsx->transaction_key.slen, 
+                           NULL) == NULL);
+
+    TSX_TRACE_((THIS_FILE, 
+                "Transaction %p registered with hkey=0x%p and key=%.*s",
+                tsx, tsx->hashed_key, tsx->transaction_key.slen,
+                tsx->transaction_key.ptr));
 
     /* Register the transaction to the hash table. */
+    //pj_hash_set( tsx->pool, mod_tsx_layer.htable, tsx->transaction_key.ptr,
+    //           tsx->transaction_key.slen, tsx->hashed_key, tsx);
+    PJ_TODO(USE_PRECALCULATED_HASHED_VALUE);
     pj_hash_set( tsx->pool, mod_tsx_layer.htable, tsx->transaction_key.ptr,
-                 tsx->transaction_key.slen, tsx->hashed_key, tsx);
+                 tsx->transaction_key.slen, 0, tsx);
 
     /* Unlock mutex. */
@@ -539 +552 @@
 
     /* Register the transaction to the hash table. */
+    //pj_hash_set( NULL, mod_tsx_layer.htable, tsx->transaction_key.ptr,
+    //           tsx->transaction_key.slen, tsx->hashed_key, NULL);
+    PJ_TODO(USE_PRECALCULATED_HASHED_VALUE);
     pj_hash_set( NULL, mod_tsx_layer.htable, tsx->transaction_key.ptr,
-                 tsx->transaction_key.slen, tsx->hashed_key, NULL);
+                 tsx->transaction_key.slen, 0, NULL);
+
+    TSX_TRACE_((THIS_FILE, 
+                "Transaction %p unregistered, hkey=0x%p and key=%.*s",
+                tsx, tsx->hashed_key, tsx->transaction_key.slen,
+                tsx->transaction_key.ptr));
 
     /* Unlock mutex. */
@@ -554 +575 @@
 {
     pjsip_transaction *tsx;
+    pj_uint32_t hval = 0;
 
     pj_mutex_lock(mod_tsx_layer.mutex);
-    tsx = pj_hash_get( mod_tsx_layer.htable, key->ptr, key->slen, NULL );
+    tsx = pj_hash_get( mod_tsx_layer.htable, key->ptr, key->slen, &hval );
     pj_mutex_unlock(mod_tsx_layer.mutex);
 
+    TSX_TRACE_((THIS_FILE, 
+                "Finding tsx with hkey=0x%p and key=%.*s: found %p",
+                hval, key->slen, key->ptr, tsx));
 
     /* Race condition!
@@ -642 +667 @@
 {
     pj_str_t key;
+    pj_uint32_t hval = 0;
     pjsip_transaction *tsx;
 
@@ -650 +676 @@
     pj_mutex_lock( mod_tsx_layer.mutex );
 
-    tsx = pj_hash_get( mod_tsx_layer.htable, key.ptr, key.slen, NULL );
+    tsx = pj_hash_get( mod_tsx_layer.htable, key.ptr, key.slen, &hval );
+
+
+    TSX_TRACE_((THIS_FILE, 
+                "Finding tsx for request, hkey=0x%p and key=%.*s, found %p",
+                hval, key.slen, key.ptr, tsx));
+
 
     if (tsx == NULL || tsx->state == PJSIP_TSX_STATE_TERMINATED) {
@@ -683 +715 @@
 {
     pj_str_t key;
+    pj_uint32_t hval = 0;
     pjsip_transaction *tsx;
 
@@ -691 +724 @@
     pj_mutex_lock( mod_tsx_layer.mutex );
 
-    tsx = pj_hash_get( mod_tsx_layer.htable, key.ptr, key.slen, NULL );
+    tsx = pj_hash_get( mod_tsx_layer.htable, key.ptr, key.slen, &hval );
+
+
+    TSX_TRACE_((THIS_FILE, 
+                "Finding tsx for response, hkey=0x%p and key=%.*s, found %p",
+                hval, key.slen, key.ptr, tsx));
+
 
     if (tsx == NULL || tsx->state == PJSIP_TSX_STATE_TERMINATED) {
@@ -919 +958 @@
     }
 
-    /* Inform TU */
+    /* Before informing TU about state changed, inform TU about
+     * rx event.
+     */
+    if (event_src_type==PJSIP_EVENT_RX_MSG && tsx->tsx_user) {
+        pjsip_rx_data *rdata = event_src;
+
+        pj_assert(rdata != NULL);
+
+        if (rdata->msg_info.msg->type == PJSIP_REQUEST_MSG &&
+            tsx->tsx_user->on_rx_request)
+        {
+            (*tsx->tsx_user->on_rx_request)(rdata);
+
+        } else if (rdata->msg_info.msg->type == PJSIP_RESPONSE_MSG &&
+                   tsx->tsx_user->on_rx_response)
+        {
+            (*tsx->tsx_user->on_rx_response)(rdata);
+        }
+
+    }
+
+    /* Inform TU about state changed. */
     if (tsx->tsx_user && tsx->tsx_user->on_tsx_state) {
         pjsip_event e;
@@ -1045 +1105 @@
 
     /* Calculate hashed key value. */
+    PJ_TODO(OPTIMIZE_TSX_BY_PRECALCULATING_HASHED_KEY_VALUE);
+    /*
+     blp: somehow this yields different hashed value!!
+
     tsx->hashed_key = pj_hash_calc(0, tsx->transaction_key.ptr,
                                    tsx->transaction_key.slen);
+     */
 
     PJ_LOG(6, (tsx->obj_name, "tsx_key=%.*s", tsx->transaction_key.slen,
@@ -1159 +1224 @@
 
     /* Calculate hashed key value. */
+    PJ_TODO(OPTIMIZE_TSX_BY_PRECALCULATING_HASHED_KEY_VALUE);
+    /*
+     blp: somehow this yields different hashed value!!
+
     tsx->hashed_key = pj_hash_calc(0, tsx->transaction_key.ptr,
                                    tsx->transaction_key.slen);
+     */
 
     /* Duplicate branch parameter for transaction. */