Optimize sqlite3_get/set_clientdata() for the presumably common case of a static...

FossilOrigin-Name: 84e38341aeab4fd51690e8536d0101d00e3fb11cc50ebcff05ed219c98328872

diff --git a/manifest b/manifest
index 0b380a8a0e4a10368858e31f24a2d507a2e7b37a..9d593d485e015f6618c1b979ee32d23398404ac2 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Use\smutexes\sto\smake\ssqlite3_set_clientdata()\sand\ssqlite3_get_clientdata()\nthreadsafe.
-D 2023-08-30T18:51:26.770
+C Optimize\ssqlite3_get/set_clientdata()\sfor\sthe\spresumably\scommon\scase\sof\sa\sstatic\sstring\spointer.
+D 2023-09-02T08:04:56.497
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -668,7 +668,7 @@ F src/insert.c 3f0a94082d978bbdd33c38fefea15346c6c6bffb70bc645a71dc0f1f87dd3276
 F src/json.c ae840f87b418f039f5d336b488933d09396bd31e6b31e855b93055ccaee4e255
 F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
 F src/loadext.c 98cfba10989b3da6f1807ad42444017742db7f100a54f1032af7a8b1295912c0
-F src/main.c 2adfb1973ee495977f8c75d6590aae9882161d5f8749b46621299656a2df0cc6
+F src/main.c 42a55d977879a6968d4b1609424b318f991bd0375e48ac42d8f742f41e243468
 F src/malloc.c 47b82c5daad557d9b963e3873e99c22570fb470719082c6658bf64e3012f7d23
 F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
 F src/mem1.c 3bb59158c38e05f6270e761a9f435bf19827a264c13d1631c58b84bdc96d73b2
@@ -2115,8 +2115,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P e7c11d34ee2eebdca4d9db1496bbb4152e4c62745c083ad5e0337733e8d1254e
-R 3f04e2f3da46f99baea85816871f54e6
-U drh
-Z 4a72dec53887e83eac398e1a9fd59cf2
+P 443ea20ddb0f3bf5d77ef59cd4678f0e32d7da328002bb44d6fc080a53a37e29
+R 296f08550097c4b7507cdcac1545a235
+U stephan
+Z 18c0164302708bbf7ef418d7eac59c3e
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 14a82559d31e55eb190ae4fbf778ce4db580e418..9e693a411aaf9be67022dfa1f84b35b6a1d4ea8d 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-443ea20ddb0f3bf5d77ef59cd4678f0e32d7da328002bb44d6fc080a53a37e29
\ No newline at end of file
+84e38341aeab4fd51690e8536d0101d00e3fb11cc50ebcff05ed219c98328872
\ No newline at end of file

diff --git a/src/main.c b/src/main.c
index 6525fc0d71a272895fbbf6a791665ddbedf2f31b..7cc15869be6a910bc5f0196d61c5686dc14ab98f 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -3725,7 +3725,7 @@ void *sqlite3_get_clientdata(sqlite3 *db, const char *zName){
   DbClientData *p;
   sqlite3_mutex_enter(db->mutex);
   for(p=db->pDbData; p; p=p->pNext){
-    if( strcmp(p->zName, zName)==0 ){
+    if( zName==p->zName || strcmp(p->zName, zName)==0 ){
       void *pResult = p->pData;
       sqlite3_mutex_leave(db->mutex);
       return pResult;
@@ -3747,7 +3747,9 @@ int sqlite3_set_clientdata(
   DbClientData *p, **pp;
   sqlite3_mutex_enter(db->mutex);
   pp = &db->pDbData;
-  for(p=db->pDbData; p && strcmp(p->zName,zName); p=p->pNext){
+  for(p=db->pDbData;
+      p && (zName!=p->zName && strcmp(p->zName,zName));
+      p=p->pNext){
     pp = &p->pNext;
   }
   if( p ){