Disable F_FULLSYNC if the sychronous pragma is not set to FULL. (CVS 2372)

FossilOrigin-Name: 58b8733b96165126ee8514f2ce0f88d249792847

diff --git a/manifest b/manifest
index dbe651eafb515fb5a9b9771d2a051cbdca3edc49..67956d2d98a231864d6d563207ecaeb6098fb157 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Disable\sthe\suse\sof\s./crashtest\sin\sbuilds\sthat\sinclude\sa\scodec.\s(CVS\s2371)
-D 2005-03-10T12:58:22
+C Disable\sF_FULLSYNC\sif\sthe\ssychronous\spragma\sis\snot\sset\sto\sFULL.\s(CVS\s2372)
+D 2005-03-10T14:11:13
 F Makefile.in 76443a83549d1539105e12d13bd0054a05ab2214
 F Makefile.linux-gcc a9e5a0d309fa7c38e7c14d3ecf7690879d3a5457
 F README a01693e454a00cc117967e3f9fdab2d4d52e9bc1
@@ -44,15 +44,15 @@ F src/insert.c 0456649d4d48396f918e7ea1fecbf3d66ed90816
 F src/legacy.c d58ea507bce885298a2c8c3cbb0f4bff5d47830b
 F src/main.c 90cb84bbb85aa89442af41ad4323b136af6527b7
 F src/md5.c 7ae1c39044b95de2f62e066f47bb1deb880a1070
-F src/os.h ae44064dc118b20d39450cb331409a775e8bb1c6
+F src/os.h 0c805df3df02b98eb78a7a86756c3cbd4e190939
 F src/os_common.h 0e7f428ba0a6c40a61bc56c4e96f493231301b73
 F src/os_test.c 91e5f22dd89491e5e1554820e715805f43fa4ece
 F src/os_test.h 6a26a4978492e4bbdbf385554958418ff02db162
-F src/os_unix.c 68d3d32937eee90fe1f50d500d1a4ee826cbe790
-F src/os_unix.h f3097815e041e82e24d92505e1ff61ba24172d13
+F src/os_unix.c 4fe368b6213f6734f767ca9aef65e873c810bf4e
+F src/os_unix.h 40b2fd1d02cfa45d6c3dea25316fd019cf9fcb0c
 F src/os_win.c bddeae1c3299be0fbe47077dd4e98b786a067f71
 F src/os_win.h 41a946bea10f61c158ce8645e7646b29d44f122b
-F src/pager.c b728c90bfa33994006a067a32971cabd0a852916
+F src/pager.c a789b0ffe7a42fd99f54f8c938fd9a866669e79d
 F src/pager.h 70d496f372163abb6340f474288c4bb9ea962cf7
 F src/parse.y 0b6135268a7a29db35335d5b71b5a8791e02f91e
 F src/pragma.c 4b20dbc0f4b97f412dc511853d3d0c2e0d4adedc
@@ -64,7 +64,7 @@ F src/sqlite.h.in c85f6bad9ca7de29f505fe886646cfff7df4c55e
 F src/sqliteInt.h b59243adc43f0326ca7d8ce0b7ebd3cc70bd670d
 F src/table.c 25b3ff2b39b7d87e8d4a5da0713d68dfc06cbee9
 F src/tclsqlite.c 29e56ecdb94c4066dbe6b088d12cc2404bc9597e
-F src/test1.c 7b11aafae2d2b5850799200f4b9f8465a69a0c9d
+F src/test1.c 3ef73fd9221086cf2990c23070767fae46e6d47d
 F src/test2.c 7f0ef466706ac01414e1136b96e5d8a65cb97545
 F src/test3.c 683e1e3819152ffd35da2f201e507228921148d0
 F src/test4.c 7c6b9fc33dd1f3f93c7f1ee6e5e6d016afa6c1df
@@ -195,7 +195,7 @@ F test/thread1.test 776c9e459b75ba905193b351926ac4019b049f35
 F test/threadtest1.c 6029d9c5567db28e6dc908a0c63099c3ba6c383b
 F test/threadtest2.c 97a830d53c24c42290501fdfba4a6e5bdd34748b
 F test/trace.test a54fa8df0d01cf827289a7659d78959e8fd2f955
-F test/trans.test 29645b344d2b9b6792793562b12340177ddd8f96
+F test/trans.test f32e3966f2d0045fb60866b569a788e703495f0b
 F test/trigger1.test 9db1a7c91930baa2dc60ce72c7e969900bf2ae8a
 F test/trigger2.test cbc8fe3775904d5b49ff26888aa39df7341fae7c
 F test/trigger3.test 9102fd3933db294dc654b5aee9edfe9e94f2b9e2
@@ -274,7 +274,7 @@ F www/tclsqlite.tcl e73f8f8e5f20e8277619433f7970060ab01088fc
 F www/vdbe.tcl 095f106d93875c94b47367384ebc870517431618
 F www/version3.tcl 092a01f5ef430d2c4acc0ae558d74c4bb89638a0
 F www/whentouse.tcl 3e522a06ad41992023c80ca29a048ae2331ca5bd
-P 06a48da67b142e92624cdfd46947bd4ccc6842b7
-R 8d17b42d8bdc15b1a43c1cdc2214004d
+P 7e4af62238bf8fa3d3cbc79e2c8951e621a0c0b4
+R 365c81273dfabb7e12708718466b11d2
 U drh
-Z fef84291e48ee74066a31f01ad017fa8
+Z 180431ad527de9a764ef13a7e79aee4d

diff --git a/manifest.uuid b/manifest.uuid
index 741d10247ed7656c1d48ad8a862fa3e0935906c9..c079d58ea1f54a16da65b4449fb752d28b474136 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-7e4af62238bf8fa3d3cbc79e2c8951e621a0c0b4
\ No newline at end of file
+58b8733b96165126ee8514f2ce0f88d249792847
\ No newline at end of file

diff --git a/src/os.h b/src/os.h
index d39d62d80998a7e2a07e09b306ae4224a24e81f5..1f82a1fbf15708d4fd006ca2fe79bc278b357a56 100644 (file)
--- a/src/os.h
+++ b/src/os.h
@@ -54,6 +54,13 @@
 # include "os_win.h"
 #endif
 
+/* If the SET_FULLSYNC macro is not defined above, then make it
+** a no-op
+*/
+#ifndef SET_FULLSYNC
+# define SET_FULLSYNC(x,y)
+#endif
+
 /*
 ** Temporary files are named starting with this prefix followed by 16 random
 ** alphanumeric characters, and no file extension. They are stored in the

diff --git a/src/os_unix.c b/src/os_unix.c
index 0e270c0bb6e71f3e474d3a28bac309ae00868a69..946cebc0c365feafa2198950680a2fbefc865160 100644 (file)
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -688,6 +688,16 @@ int sqlite3OsSeek(OsFile *id, i64 offset){
   return SQLITE_OK;
 }
 
+#ifdef SQLITE_TEST
+/*
+** Count the number of fullsyncs and normal syncs.  This is used to test
+** that syncs and fullsyncs are occuring at the right times.
+*/
+int sqlite3_sync_count = 0;
+int sqlite3_fullsync_count = 0;
+#endif
+
+
 /*
 ** The fsync() system call does not work as advertised on many
 ** unix systems.  The following procedure is an attempt to make
@@ -699,19 +709,40 @@ int sqlite3OsSeek(OsFile *id, i64 offset){
 ** enabled, however, since with SQLITE_NO_SYNC enabled, an OS crash
 ** or power failure will likely corrupt the database file.
 */
-static int full_fsync(int fd){
+static int full_fsync(int fd, int fullSync){
+  int rc;
+
+  /* Record the number of times that we do a normal fsync() and 
+  ** FULLSYNC.  This is used during testing to verify that this procedure
+  ** gets called with the correct arguments.
+  */
+#ifdef SQLITE_TEST
+  if( fullSync ) sqlite3_fullsync_count++;
+  sqlite3_sync_count++;
+#endif
+
+  /* If we compiled with the SQLITE_NO_SYNC flag, then syncing is a
+  ** no-op
+  */
 #ifdef SQLITE_NO_SYNC
-  return SQLITE_OK;
+  rc = SQLITE_OK;
 #else
-  int rc;
+
 #ifdef F_FULLFSYNC
-  rc = fcntl(fd, F_FULLFSYNC, 0);
+  if( fullSync ){
+    rc = fcntl(fd, F_FULLSYNC, 0);
+  }else{
+    rc = 1;
+  }
+  /* If the FULLSYNC failed, try to do a normal fsync() */
   if( rc ) rc = fsync(fd);
+
 #else
   rc = fsync(fd);
-#endif
+#endif /* defined(F_FULLSYNC) */
+#endif /* defined(SQLITE_NO_SYNC) */
+
   return rc;
-#endif
 }
 
 /*
@@ -729,12 +760,12 @@ int sqlite3OsSync(OsFile *id){
   assert( id->isOpen );
   SimulateIOError(SQLITE_IOERR);
   TRACE2("SYNC    %-3d\n", id->h);
-  if( full_fsync(id->h) ){
+  if( full_fsync(id->h, id->fullSync) ){
     return SQLITE_IOERR;
   }
   if( id->dirfd>=0 ){
     TRACE2("DIRSYNC %-3d\n", id->dirfd);
-    full_fsync(id->dirfd);
+    full_fsync(id->dirfd, id->fullSync);
     close(id->dirfd);  /* Only need to sync once, so close the directory */
     id->dirfd = -1;    /* when we are done. */
   }
@@ -744,6 +775,10 @@ int sqlite3OsSync(OsFile *id){
 /*
 ** Sync the directory zDirname. This is a no-op on operating systems other
 ** than UNIX.
+**
+** This is used to make sure the master journal file has truely been deleted
+** before making changes to individual journals on a multi-database commit.
+** The F_FULLSYNC option is not needed here.
 */
 int sqlite3OsSyncDirectory(const char *zDirname){
   int fd;

diff --git a/src/os_unix.h b/src/os_unix.h
index 72f818befeec1165a4254ae7ddd410649c22701d..72089625553708bd53500b2df1f5383949e5dfd7 100644 (file)
--- a/src/os_unix.h
+++ b/src/os_unix.h
@@ -68,9 +68,15 @@ struct OsFile {
   int h;                    /* The file descriptor */
   unsigned char locktype;   /* The type of lock held on this fd */
   unsigned char isOpen;     /* True if needs to be closed */
+  unsigned char fullSync;   /* Use F_FULLSYNC if available */
   int dirfd;                /* File descriptor for the directory */
 };
 
+/*
+** A macro to set the OsFile.fullSync flag, if it exists.
+*/
+#define SET_FULLSYNC(x,y)  ((x).fullSync = (y))
+
 /*
 ** Maximum number of characters in a temporary file name
 */

diff --git a/src/pager.c b/src/pager.c
index c26d7176d2fb8e37d76557e4bd145a9cf2a17817..185aa4248c48e825406ed374d46e1addc55be343 100644 (file)
--- 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.191 2005/03/09 13:09:45 danielk1977 Exp $
+** @(#) $Id: pager.c,v 1.192 2005/03/10 14:11:13 drh Exp $
 */
 #include "sqliteInt.h"
 #include "os.h"
@@ -2559,6 +2559,8 @@ static int pager_open_journal(Pager *pPager){
   if( rc!=SQLITE_OK ){
     goto failed_to_open_journal;
   }
+  SET_FULLSYNC(pPager->jfd, pPager->fullSync);
+  SET_FULLSYNC(pPager->fd, pPager->fullSync);
   sqlite3OsOpenDirectory(pPager->zDirectory, &pPager->jfd);
   pPager->journalOpen = 1;
   pPager->journalStarted = 0;

diff --git a/src/test1.c b/src/test1.c
index b1caccad00bd1c91d2c7e8ccf84d6d44c6e4bbdd..04425786857364df04c48624402192a849be2dbe 100644 (file)
--- a/src/test1.c
+++ b/src/test1.c
@@ -13,7 +13,7 @@
 ** is not included in the SQLite library.  It is used for automated
 ** testing of the SQLite library.
 **
-** $Id: test1.c,v 1.132 2005/02/26 18:10:44 drh Exp $
+** $Id: test1.c,v 1.133 2005/03/10 14:11:13 drh Exp $
 */
 #include "sqliteInt.h"
 #include "tcl.h"
@@ -2973,6 +2973,7 @@ int Sqlitetest1_Init(Tcl_Interp *interp){
   static int bitmask_size = sizeof(Bitmask)*8;
   int i;
   extern int sqlite3_os_trace;
+  extern int sqlite3_sync_count, sqlite3_fullsync_count;
  
 
   for(i=0; i<sizeof(aCmd)/sizeof(aCmd[0]); i++){
@@ -3000,6 +3001,10 @@ int Sqlitetest1_Init(Tcl_Interp *interp){
       (char*)&sqlite3_temp_directory, TCL_LINK_STRING);
   Tcl_LinkVar(interp, "bitmask_size",
       (char*)&bitmask_size, TCL_LINK_INT|TCL_LINK_READ_ONLY);
+  Tcl_LinkVar(interp, "sqlite_sync_count",
+      (char*)&sqlite3_sync_count, TCL_LINK_INT);
+  Tcl_LinkVar(interp, "sqlite_fullsync_count",
+      (char*)&sqlite3_fullsync_count, TCL_LINK_INT);
   set_options(interp);
   return TCL_OK;
 }

diff --git a/test/trans.test b/test/trans.test
index 5862c73a20aaa27cbb043460ed873b95ef46089f..5227183e34daa2c611e9044ea77f5a61c0a3967d 100644 (file)
--- a/test/trans.test
+++ b/test/trans.test
@@ -11,7 +11,7 @@
 # This file implements regression tests for SQLite library.  The
 # focus of this script is database locks.
 #
-# $Id: trans.test,v 1.23 2004/06/19 00:16:31 drh Exp $
+# $Id: trans.test,v 1.24 2005/03/10 14:11:13 drh Exp $
 
 
 set testdir [file dirname $argv0]
@@ -855,6 +855,8 @@ for {set i 2} {$i<=$limit} {incr i} {
   } else {
     execsql {PRAGMA synchronous=NORMAL}
   }
+  set sqlite_sync_count 0
+  set sqlite_fullsync_count 0
   do_test trans-9.$i.1-$cnt {
      execsql {
        BEGIN;
@@ -877,11 +879,17 @@ for {set i 2} {$i<=$limit} {incr i} {
      signature
   } $sig
   if {$i<$limit} {
-    do_test trans-9.$i.9-$cnt {
+    do_test trans-9.$i.3-$cnt {
        execsql {
          INSERT INTO t3 SELECT randstr(10,400) FROM t3 WHERE random()%10==0;
        }
     } {}
+    do_test trans-9.$i.4-$cnt {
+       expr {$sqlite_sync_count>0}
+    } 1
+    do_test trans-9.$i.5-$cnt {
+       expr {$sqlite_fullsync_count>0}
+    } [expr {$i%2==0}]
   }
   set ::pager_old_format 0
 }