Changeset 623

Timestamp:

Jul 23, 2006 10:10:35 AM (18 years ago)

Author:

bennylp

Message:

Improvement/bug fix in hash table lookup to allow user to specify the hash value, and modify transaction to take advantage of this feature

Location:

pjproject/trunk

Files:

• pjlib/src/pj/hash.c (modified) (1 diff)
• pjsip-apps/build/pjsip_apps.dsw (modified) (1 diff)
• pjsip/src/pjsip/sip_transaction.c (modified) (5 diffs)

pjproject/trunk/pjlib/src/pj/hash.c

@@ -205 +205 @@
 {
     pj_hash_entry *entry;
-
-    if (hval) *hval = 0;
     entry = *find_entry( NULL, ht, key, keylen, NULL, hval, NULL);
     return entry ? entry->value : NULL;

pjproject/trunk/pjsip-apps/build/pjsip_apps.dsw

@@ -208 +208 @@
 ###############################################################################
 
+Project: "test_pjsip"="..\..\pjsip\build\test_pjsip.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name pjlib
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name pjlib_util
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name pjmedia
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name pjsip_core
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name pjsip_simple
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name pjsip_ua
+    End Project Dependency
+}}}
+
+###############################################################################
+
 Global:
 

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

@@ -38 +38 @@
 #define TSX_TRACE_(expr)
 #endif
+
+/* When this macro is set, transaction will keep the hashed value
+ * so that future lookup (to unregister transaction) does not need
+ * to recalculate the hash again. It should gains a little bit of
+ * performance, so generally we'd want this.
+ */
+#define PRECALC_HASH
 
 
@@ -530 +537 @@
 
     /* 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);
+#ifdef PRECALC_HASH
+    pj_hash_set( tsx->pool, mod_tsx_layer.htable, tsx->transaction_key.ptr,
+                 tsx->transaction_key.slen, tsx->hashed_key, tsx);
+#else
     pj_hash_set( tsx->pool, mod_tsx_layer.htable, tsx->transaction_key.ptr,
                  tsx->transaction_key.slen, 0, tsx);
+#endif
 
     /* Unlock mutex. */
@@ -555 +564 @@
 
     /* 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);
+#ifdef PRECALC_HASH
     pj_hash_set( NULL, mod_tsx_layer.htable, tsx->transaction_key.ptr,
-                 tsx->transaction_key.slen, 0, NULL);
+                 tsx->transaction_key.slen, tsx->hashed_key, NULL);
+#else
+    pj_hash_set( NULL, mod_tsx_layer.htable, tsx->transaction_key.ptr,
+                 tsx->transaction_key.slen, 0, NULL);
+#endif
 
     TSX_TRACE_((THIS_FILE, 
@@ -1154 +1165 @@
 
     /* Calculate hashed key value. */
-    PJ_TODO(OPTIMIZE_TSX_BY_PRECALCULATING_HASHED_KEY_VALUE);
-    /*
-     blp: somehow this yields different hashed value!!
-
+#ifdef PRECALC_HASH
     tsx->hashed_key = pj_hash_calc(0, tsx->transaction_key.ptr,
                                    tsx->transaction_key.slen);
-     */
+#endif
 
     PJ_LOG(6, (tsx->obj_name, "tsx_key=%.*s", tsx->transaction_key.slen,
@@ -1283 +1291 @@
 
     /* Calculate hashed key value. */
-    PJ_TODO(OPTIMIZE_TSX_BY_PRECALCULATING_HASHED_KEY_VALUE);
-    /*
-     blp: somehow this yields different hashed value!!
-
+#ifdef PRECALC_HASH
     tsx->hashed_key = pj_hash_calc(0, tsx->transaction_key.ptr,
                                    tsx->transaction_key.slen);
-     */
+#endif
 
     /* Duplicate branch parameter for transaction. */