Update comments and only include the thread routine when required.

FossilOrigin-Name: a60c545f255f7da53e0ebcde8743532b54bafdb6

diff --git a/manifest b/manifest
index 299b6943cd839f391f83c894266b7cf4041d02b5..d7650b3c6e6c4670824138b9252bda86f1113856 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Experimental\schanges\sto\spre-cache\sa\sdatabase\sfile\sprior\sto\sit\sbeing\sfully\sopened.
-D 2014-05-08T22:01:26.332
+C Update\scomments\sand\sonly\sinclude\sthe\sthread\sroutine\swhen\srequired.
+D 2014-05-08T22:05:30.985
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in ad0921c4b2780d01868cf69b419a4f102308d125
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -205,7 +205,7 @@ F src/os.c 1b147e4cf7cc39e618115c14a086aed44bc91ace
 F src/os.h 4a46270a64e9193af4a0aaa3bc2c66dc07c29b3f
 F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
 F src/os_unix.c ae4b5240af4619d711301d7992396e182585269f
-F src/os_win.c 70e5fd4b931d9e4ed2395683503cc253be705192
+F src/os_win.c 59befa19fb087727c4817ad5f9db82c76bbd96c0
 F src/pager.c ab62a24218d87dda1be641f6c5ad291bff78fd94
 F src/pager.h ffd5607f7b3e4590b415b007a4382f693334d428
 F src/parse.y 22d6a074e5f5a7258947a1dc55a9bf946b765dd0
@@ -1171,10 +1171,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
 F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
-P a41d29691307067523c8637b486941c5f7c33775
-R deeebf5d0a3a3431a16dc9cbda6dc0e2
-T *branch * winPreCache
-T *sym-winPreCache *
-T -sym-threads *
+P 38cbcedbb6e57dc3c2d452a0eb573cabc7df0c75
+R 60f2ea98a5702c8ea1c862ad01804d2b
 U mistachkin
-Z 18b582a9491b79449552acaadfabfb63
+Z 0c7549836f40b93874f4f8a3e18828f8

diff --git a/manifest.uuid b/manifest.uuid
index 3e3fe47c08e8291e2ddba86634e6cad204dd059c..3ab97f35c7918d189a19d4a736b51eae256908b7 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-38cbcedbb6e57dc3c2d452a0eb573cabc7df0c75
\ No newline at end of file
+a60c545f255f7da53e0ebcde8743532b54bafdb6
\ No newline at end of file

diff --git a/src/os_win.c b/src/os_win.c
index 95eb7357a4b8909e24b6c392ffe33399555bf536..07a1b1937e0ef60f0eec8f709aa1a8d464fbce7f 100644 (file)
--- a/src/os_win.c
+++ b/src/os_win.c
@@ -3211,10 +3211,11 @@ static int winDeviceCharacteristics(sqlite3_file *id){
          ((p->ctrlFlags & WINFILE_PSOW)?SQLITE_IOCAP_POWERSAFE_OVERWRITE:0);
 }
 
+#if SQLITE_MAX_WORKER_THREADS>0
 /*
-** Thread routine that seeks to the end of an open file and reads one byte.
-** This is used to provide a hint to the operating system that the entire
-** file should be held in the cache.
+** Thread routine that attempts to read the entire file.  This is used to
+** provide a hint to the operating system that the entire file should be held
+** in the cache.
 */
 static void *winPreCacheThread(void *pCtx){
   winFile *pFile = (winFile*)pCtx;
@@ -3282,6 +3283,7 @@ static void *winPreCacheThread(void *pCtx){
   osCloseHandle(dupHandle);
   return SQLITE_OK;
 }
+#endif
 
 /* 
 ** Windows will only let you create file view mappings