1
0
mirror of https://github.com/sqlite/sqlite.git synced 2025-10-27 08:52:26 +03:00

Use the F_FULLFSYNC fctrl if it is available. Record the name of files

that are opened in the OsFile structure. (CVS 1799)

FossilOrigin-Name: 1d30d0dd46c2bd12ce3f7dc06492f3e27ab6bcee
This commit is contained in:
drh
2004-07-17 21:44:57 +00:00
parent 4ebfef14e3
commit dd809b087f
4 changed files with 28 additions and 10 deletions

View File

@@ -654,6 +654,22 @@ int sqlite3OsSeek(OsFile *id, off_t offset){
return SQLITE_OK;
}
/*
** The fsync() system call does not work as advertised on many
** unix systems. The following procedure is an attempt to make
** it work better.
*/
static int full_fsync(int fd){
int rc;
#ifdef F_FULLFSYNC
rc = fcntl(fd, F_FULLFSYNC, 0);
if( rc ) rc = fsync(fd);
#else
rc = fsync(fd);
#endif
return rc;
}
/*
** Make sure all writes to a particular file are committed to disk.
**
@@ -669,12 +685,12 @@ int sqlite3OsSync(OsFile *id){
assert( id->isOpen );
SimulateIOError(SQLITE_IOERR);
TRACE2("SYNC %-3d\n", id->h);
if( fsync(id->h) ){
if( full_fsync(id->h) ){
return SQLITE_IOERR;
}
if( id->dirfd>=0 ){
TRACE2("DIRSYNC %-3d\n", id->dirfd);
fsync(id->dirfd);
full_fsync(id->dirfd);
close(id->dirfd); /* Only need to sync once, so close the directory */
id->dirfd = -1; /* when we are done. */
}
@@ -1057,6 +1073,7 @@ int sqlite3OsUnlock(OsFile *id, int locktype){
*/
int sqlite3OsClose(OsFile *id){
if( !id->isOpen ) return SQLITE_OK;
id->zFilename = 0;
sqlite3OsUnlock(id, NO_LOCK);
if( id->dirfd>=0 ) close(id->dirfd);
id->dirfd = -1;