Minor enhancements to new OSTRACE messages.

FossilOrigin-Name: 3249a6a38d9c86d45d5d04b32d552f306d12fd4d3c94d2efed192104c0c3948a

diff --git a/manifest b/manifest
index ff54209df41d00f47d14dfe03962d94224c0c28a..1679c1a9a336bb185220e8e9ec1976310aae866a 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Initial\swork\son\sblocking\slocks\sfor\sthe\sWin32\sVFS.\s\sVarious\sother\ssmall\senhancements.
-D 2021-07-15T23:12:27.529
+C Minor\senhancements\sto\snew\sOSTRACE\smessages.
+D 2021-07-19T03:37:09.404
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -529,7 +529,7 @@ F src/os.h 26890f540b475598cd9881dcc68931377b8d429d3ea3e2eeb64470cde64199f8
 F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85
 F src/os_setup.h 0dbaea40a7d36bf311613d31342e0b99e2536586
 F src/os_unix.c b11e4610769922253dec27d7af4a07ff84f65169d19bda5e9b12a152a706f7f5
-F src/os_win.c 15c4dce3a03801a18d6de2f636373cbe6d3843b99932d1bfe16758336ada818a
+F src/os_win.c f1727066bfbf4c3a4308442a6b43699e2cb3fe8905e29c0f4cb73f402d04a184
 F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
 F src/pager.c 95c255256b13827caf038c8f963d334784073f38ab6ef9d70371d9d04f3c43e0
 F src/pager.h 4bf9b3213a4b2bebbced5eaa8b219cf25d4a82f385d093cd64b7e93e5285f66f
@@ -1920,7 +1920,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 954b5d61299d82312a9ca2764f904e2d8318c469f6749d84f8a6871d12a575a8
-R ce6cfd7eda001c4ee216459a1054a7c1
+P 584c24252a37ef050ced5926a93e52fc47a41d9017b291dc1c1c796712e391d7
+R ec8d709aae6243cae1e8538086c8738b
 U mistachkin
-Z b59d01fb46dfdd3d864282a4891b32ce
+Z 75f70c9db372d7b49e7d3c6bedb72509

diff --git a/manifest.uuid b/manifest.uuid
index 8b4119f50682789926606f05b2889aaad696a6e6..500488841cecb51c217ab3ecb9f842d83bc4b3f4 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-584c24252a37ef050ced5926a93e52fc47a41d9017b291dc1c1c796712e391d7
\ No newline at end of file
+3249a6a38d9c86d45d5d04b32d552f306d12fd4d3c94d2efed192104c0c3948a
\ No newline at end of file

diff --git a/src/os_win.c b/src/os_win.c
index e54708faffb27de5174609e681c9ce55bdfaf13f..2f8a098179664ff8c7f11295ac009f4cfa61ca27 100644 (file)
--- a/src/os_win.c
+++ b/src/os_win.c
@@ -3962,7 +3962,7 @@ static int winIsSameFile(
            && info1.nFileIndexHigh == info2.nFileIndexHigh
             && info1.nFileIndexLow == info2.nFileIndexLow ){
       OSTRACE(("SAME pid=%lu, pFile=%p, name1=%s, name2=%s, "
-               "YES, rc=SQLITE_OK\n", osGetCurrentProcessId(),
+               "YES (ID), rc=SQLITE_OK\n", osGetCurrentProcessId(),
                pFile, zFilename1, zFilename2));
       *pbSame = 1;
       return SQLITE_OK;
@@ -3995,9 +3995,10 @@ fallback:
 done:
     if( zFull2 ) sqlite3_free(zFull2);
     if( zFull1 ) sqlite3_free(zFull1);
-    OSTRACE(("SAME pid=%lu, pFile=%p, name1=%s, name2=%s, %s, rc=%s\n",
-             osGetCurrentProcessId(), pFile, zFilename1, zFilename2,
-             *pbSame?"YES":"NO", sqlite3ErrName(rc)));
+    OSTRACE(("SAME pid=%lu, pFile=%p, name1=%s, name2=%s, "
+             "%s (NAME), rc=%s\n", osGetCurrentProcessId(),
+             pFile, zFilename1, zFilename2, *pbSame?"YES":"NO",
+             sqlite3ErrName(rc)));
     return rc;
   }
 }