Make sure the default busy handler uses usleep() when available.

Ticket #1684. (CVS 3121)

FossilOrigin-Name: 43e5462608819e9c2c8bcb4860d4c2d6ecda600c

diff --git a/manifest b/manifest
index 4b497e5ae80161d1c571b440e7fddbb050236c26..999183e97c71c607a3d2e73c1bdfa0ac3a11f79c 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C The\s--enable-debug\soption\son\sconfigure\senables\sverbose\sexplain\sand\svdbe_trace.\nTicket\s#1680.\s(CVS\s3120)
-D 2006-03-03T20:37:52
+C Make\ssure\sthe\sdefault\sbusy\shandler\suses\susleep()\swhen\savailable.\nTicket\s#1684.\s(CVS\s3121)
+D 2006-03-03T20:54:41
 F Makefile.in 5d8dff443383918b700e495de42ec65bc1c8865b
 F Makefile.linux-gcc 74ba0eadf88748a9ce3fd03d2a3ede2e6715baec
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -48,7 +48,7 @@ F src/hash.c 449f3d6620193aa557f5d86cbc5cc6b87702b185
 F src/hash.h 1b3f7e2609141fd571f62199fc38687d262e9564
 F src/insert.c ae51e360d1e710870471fb72d00f84c3d98292a0
 F src/legacy.c 86b669707b3cefd570e34154e2f6457547d1df4f
-F src/main.c f520c65fb1478e1db1c20387c60a4e5765b0d7aa
+F src/main.c b2fae87237011250f0d553fbcdf80b65a98701fb
 F src/md5.c c5fdfa5c2593eaee2e32a5ce6c6927c986eaf217
 F src/os.c 59f05de8c5777c34876607114a2fbe55ae578235
 F src/os.h 93035a0e3b9dd05cdd0aaef32ea28ca28e02fe78
@@ -355,7 +355,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl a99cf5f6d8bd4d5537584a2b342f0fb9fa601d8b
 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
-P da0e843c05fc708d48e396aaab00fb6247180b51
-R 25495443f5aa0048df74abe783779554
+P ee2f706800849a95cc74a08ba0f25d3728dbe3ec
+R 0e0e8d1eeda9280f1bebcc3e3851741f
 U drh
-Z 022c8ead1b8d79a556e21e2c2e0fd4b7
+Z 26aa9e7456c043f7b46ba0abf72546cb

diff --git a/manifest.uuid b/manifest.uuid
index 279c3ae4e3bcde7e4d41070d4e0d43e9adc86d94..2fac11bb305c683b3b429b5504291bb0f10c531d 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ee2f706800849a95cc74a08ba0f25d3728dbe3ec
\ No newline at end of file
+43e5462608819e9c2c8bcb4860d4c2d6ecda600c
\ No newline at end of file

diff --git a/src/main.c b/src/main.c
index 91c827839596f81dbeca6670680cb0d202c66108..471bd9fd95ed9453c2d9ef19b3529b96f6eff13b 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -14,7 +14,7 @@
 ** other files are for internal use by SQLite and should not be
 ** accessed by users of the library.
 **
-** $Id: main.c,v 1.335 2006/02/16 18:16:37 drh Exp $
+** $Id: main.c,v 1.336 2006/03/03 20:54:41 drh Exp $
 */
 #include "sqliteInt.h"
 #include "os.h"
@@ -250,7 +250,7 @@ static int sqliteDefaultBusyCallback(
  void *ptr,               /* Database connection */
  int count                /* Number of times table has been busy */
 ){
-#if SQLITE_MIN_SLEEP_MS==1
+#if OS_WIN || (defined(HAVE_USLEEP) && HAVE_USLEEP)
   static const u8 delays[] =
      { 1, 2, 5, 10, 15, 20, 25, 25,  25,  50,  50, 100 };
   static const u8 totals[] =