diff --git a/manifest b/manifest index eb0dda6375..0f1b99eea9 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Changes\sto\scrash-test\sio\sbackend\s(test6.c)\sso\sthat\sit\sworks\swith\sthe\ssqlite3_vfs\sinterface.\s(CVS\s4247) -D 2007-08-20T14:23:44 +C Call\ssqlite3OsSleep()\swith\san\sargument\sin\smicroseconds,\snot\smilliseconds.\s(CVS\s4248) +D 2007-08-20T16:07:01 F Makefile.in 0c0e53720f658c7a551046442dd7afba0b72bfbe F Makefile.linux-gcc 65241babba6faf1152bf86574477baab19190499 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028 @@ -85,7 +85,7 @@ F src/insert.c 633322aef1799f6604fa805e12488bc628570b0c F src/legacy.c 6013a7cb7da1b72550b3d35d4fc598b3c3e5b8c1 F src/limits.h 71ab25f17e35e0a9f3f6f234b8ed49cc56731d35 F src/loadext.c c0ccda3dbda109da087a8fd762deebe5fdf24a1d -F src/main.c 064bbb20e3614ed76410020cdba7f9c5c32eb040 +F src/main.c b597752b33dce7dec3940fa302b4130ebf4d1ba7 F src/malloc.c 613c65f12ff0ee4edd017aa458209ab7a23cd7b1 F src/md5.c c5fdfa5c2593eaee2e32a5ce6c6927c986eaf217 F src/mem1.c 30bf8be3846f92fdf88c490c5e5378512383bcbe @@ -98,11 +98,11 @@ F src/os_os2.c cba4e96fadb949076c717108fe0599d1a3c2e446 F src/os_os2.h e5f17dd69333632bbc3112881ea407c37d245eb3 F src/os_test.c 49833426101f99aee4bb5f6a44b7c4b2029fda1c F src/os_test.h 903c93554c23d88f34f667f1979e4a1cee792af3 -F src/os_unix.c 7ff8ad09e8e8b6b32e8b5441dc7b9b6b93126e2b +F src/os_unix.c 10fb60a8d9174dcb609d72f6b97211c58da25b47 F src/os_unix.h 5768d56d28240d3fe4537fac08cc85e4fb52279e F src/os_win.c d868d5f9e95ec9c1b9e2a30c54c996053db6dddd F src/os_win.h 41a946bea10f61c158ce8645e7646b29d44f122b -F src/pager.c 2771a39e242ec549906240196530f00073cfb741 +F src/pager.c 53af3942f97b077886e035ed15781d1f887713b6 F src/pager.h 53087c6fb9db01aed17c7fd044662a27507e89b8 F src/parse.y c03529c3b82702ada98ce405b390e3a9409708cf F src/pragma.c 8f5e37c3cf6dbdeb3645bb80cc58cfc3324c0178 @@ -529,7 +529,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5 -P 399d3e755253a7b4604a62b9f171e0f1154134e2 -R 11c9693db5cee2a6ec7dbd494d6d3816 +P 40f66ada815fa1043d24c9cd6d898e1797e7044a +R 5fb91f464358f45b9c4a3580891f684c U danielk1977 -Z caa76f353403fee76761d1f63fcb3a63 +Z f75586ca189e62660dd1185f4b909242 diff --git a/manifest.uuid b/manifest.uuid index cdeee9aa73..99223f97b6 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -40f66ada815fa1043d24c9cd6d898e1797e7044a \ No newline at end of file +917790413ced92266bf5c7cca6d130ed7ac6221b \ No newline at end of file diff --git a/src/main.c b/src/main.c index a0a7cc6273..5983e55192 100644 --- 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.386 2007/08/20 11:12:41 drh Exp $ +** $Id: main.c,v 1.387 2007/08/20 16:07:01 danielk1977 Exp $ */ #include "sqliteInt.h" #include "os.h" @@ -320,7 +320,7 @@ static int sqliteDefaultBusyCallback( delay = timeout - prior; if( delay<=0 ) return 0; } - sqlite3OsSleep(db->pVfs, delay); + sqlite3OsSleep(db->pVfs, delay*1000); return 1; #else sqlite3 *db = (sqlite3 *)ptr; diff --git a/src/os_unix.c b/src/os_unix.c index 828bbfd628..a67748f613 100644 --- a/src/os_unix.c +++ b/src/os_unix.c @@ -782,8 +782,8 @@ static int transferOwnership(unixFile *pFile){ #endif /* -** Seek to the offset in id->offset then read cnt bytes into pBuf. -** Return the number of bytes actually read. Update the offset. +** Seek to the offset passed as the second argument, then read cnt +** bytes into pBuf. Return the number of bytes actually read. */ static int seekAndRead(unixFile *id, sqlite3_int64 offset, void *pBuf, int cnt){ int got; diff --git a/src/pager.c b/src/pager.c index b3c245dc73..871023eb92 100644 --- a/src/pager.c +++ b/src/pager.c @@ -18,7 +18,7 @@ ** file simultaneously, or one process from reading the database while ** another is writing. ** -** @(#) $Id: pager.c,v 1.361 2007/08/20 05:36:51 danielk1977 Exp $ +** @(#) $Id: pager.c,v 1.362 2007/08/20 16:07:01 danielk1977 Exp $ */ #ifndef SQLITE_OMIT_DISKIO #include "sqliteInt.h" @@ -3031,7 +3031,7 @@ static int pagerAllocatePage(Pager *pPager, PgHdr **ppPg){ PgHdr *pPg; /* Create a new PgHdr if any of the four conditions defined - ** above is met: */ + ** above are met: */ if( pPager->nPagemxPage || pPager->pFirst==0 || MEMDB @@ -3376,10 +3376,6 @@ static int pager_open_journal(Pager *pPager){ } goto failed_to_open_journal; } -#if 0 - sqlite3OsSetFullSync(pPager->jfd, pPager->full_fsync); - sqlite3OsSetFullSync(pPager->fd, pPager->full_fsync); -#endif pPager->journalOpen = 1; pPager->journalStarted = 0; pPager->needSync = 0;