Remove the unixFile.isOpen variable (no longer in use). (CVS 4401)

FossilOrigin-Name: 1786e9c881a67fbf8bd014d643590534c8c601dc

diff --git a/manifest b/manifest
index 6c50a38ad94b32a9e19655efab65a4d166c16e5e..db833fb98b43bb6c472b6226717d397ff562d359 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sproblem\sin\sthe\stest\sscripts\sfor\sthe\sasynchronous\sbackend.\s(CVS\s4400)
-D 2007-09-05T11:34:54
+C Remove\sthe\sunixFile.isOpen\svariable\s(no\slonger\sin\suse).\s(CVS\s4401)
+D 2007-09-05T13:56:32
 F Makefile.in cbfb898945536a8f9ea8b897e1586dd1fdbcc5db
 F Makefile.linux-gcc 65241babba6faf1152bf86574477baab19190499
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -116,7 +116,7 @@ F src/os_os2.c 8769301bff502de642ad2634cedcb77d967ce199
 F src/os_os2.h c3f7d0af7e3453d1d7aa81b06c0a56f5a226530b
 F src/os_test.c 49833426101f99aee4bb5f6a44b7c4b2029fda1c
 F src/os_test.h 903c93554c23d88f34f667f1979e4a1cee792af3
-F src/os_unix.c 99bf97b31b29dd06c3833447ce03424e68b954f2
+F src/os_unix.c 522486e24d1a743efc366cb93a727fa9314797b4
 F src/os_unix.h 5768d56d28240d3fe4537fac08cc85e4fb52279e
 F src/os_win.c d8909c199a5195f8d21be98216241370bdf93cdd
 F src/os_win.h 41a946bea10f61c158ce8645e7646b29d44f122b
@@ -180,7 +180,7 @@ F test/alter2.test 50c3f554b8236d179d72511c0a4f23c5eb7f2af3
 F test/alter3.test a6eec8f454be9b6ce73d8d7dc711453675a10ce7
 F test/altermalloc.test 1f4d2d66750bea1a78cd9f0b7dba5bfb155dd6cf
 F test/analyze.test 2f55535aa335785db1a2f97d3f3831c16c09f8b0
-F test/async.test c52216f8bdebff26900a338b75ea6079944bf141
+F test/async.test eca5ea2646ea4adfbfa276fa710238e79eb1d477
 F test/async2.test 75f2d15f4c27189ec3296cf2565ec91834bbed76
 F test/attach.test b849e1baae863c3a6132ff8b9b1baf356ab6c178
 F test/attach2.test 78bc1a25ea8785c7571b44f5947ada2bd5d78127
@@ -343,7 +343,7 @@ F test/loadext2.test 95ca7e2cb03fd3e068de97c3a2fe58dbdfd769e1
 F test/lock.test 6825aea0b5885578b1b63a3b178803842c4ee9f1
 F test/lock2.test 5f9557b775662c2a5ee435378f39e10d64f65cb3
 F test/lock3.test 615111293cf32aa2ed16d01c6611737651c96fb9
-F test/lock4.test 49e22396b9be6e047b3d35469f233be79153c9d5
+F test/lock4.test c8e035ba9cf08985e4fc0f4600ffae241a435ab3
 F test/main.test 05f585bb70c05caac3e047903b517cbb319ed204
 F test/malloc.test 5b4ac16e0e11cca99a25574298eb5ac8e93236db
 F test/malloc2.test c1a74f46a3581b56df29ff46a4e1c99b41c44ad9
@@ -569,7 +569,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
-P bf3d67d1bd1c48fff45dc24818b8358f79c9fdef
-R 25fb668c32b81804b4ade4316a54624b
+P 630fc71f3df5ab6129ddff9d8184893ecc6cf3c5
+R 9a78b375d5424edc5f5d67c6a4158c36
 U danielk1977
-Z 8a09ee32bd86264ddd0da49c7bb5aaae
+Z 26fe5592b03efb24fd754f70db25a373

diff --git a/manifest.uuid b/manifest.uuid
index b4e2b0cc57e7cac8112b1c3364fccffc3b37fb2c..3a90dced790b43a53f37c19feae1ab27c4e2f0fa 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-630fc71f3df5ab6129ddff9d8184893ecc6cf3c5
\ No newline at end of file
+1786e9c881a67fbf8bd014d643590534c8c601dc
\ No newline at end of file

diff --git a/src/os_unix.c b/src/os_unix.c
index 4cdde299a62de8e45a7f60c737e93bb3d3b0e037..498b119655d93581cefa10cbf069272cf21ea9ff 100644 (file)
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -96,7 +96,6 @@ struct unixFile {
 #endif /* SQLITE_ENABLE_LOCKING_STYLE */
   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 */
   int dirfd;                /* File descriptor for the directory */
 #if SQLITE_THREADSAFE
   pthread_t tid;            /* The thread that "owns" this unixFile */
@@ -1434,7 +1433,6 @@ static int unixClose(sqlite3_file *id){
   releaseOpenCnt(pFile->pOpen);
 
   leaveMutex();
-  pFile->isOpen = 0;
   OSTRACE2("CLOSE   %-3d\n", pFile->h);
   OpenCounter(-1);
   memset(pFile, 0, sizeof(unixFile));
@@ -1755,7 +1753,6 @@ static int afpUnixClose(sqlite3_file *id) {
   if( pFile->dirfd>=0 ) close(pFile->dirfd);
   pFile->dirfd = -1;
   close(pFile->h);
-  pFile->isOpen = 0;
   OSTRACE2("CLOSE   %-3d\n", pFile->h);
   OpenCounter(-1);
   return SQLITE_OK;
@@ -1849,7 +1846,6 @@ static int flockUnixClose(sqlite3_file *pId) {
   
   close(pFile->h);  
   leaveMutex();
-  pFile->isOpen = 0;
   OSTRACE2("CLOSE   %-3d\n", pFile->h);
   OpenCounter(-1);
   return SQLITE_OK;
@@ -1966,7 +1962,6 @@ static int dotlockUnixClose(sqlite3_file *id) {
   close(pFile->h);
   
   leaveMutex();
-  pFile->isOpen = 0;
   OSTRACE2("CLOSE   %-3d\n", pFile->h);
   OpenCounter(-1);
   return SQLITE_OK;
@@ -2006,7 +2001,6 @@ static int nolockUnixClose(sqlite3_file *id) {
   close(pFile->h);
   
   leaveMutex();
-  pFile->isOpen = 0;
   OSTRACE2("CLOSE   %-3d\n", pFile->h);
   OpenCounter(-1);
   return SQLITE_OK;

diff --git a/test/async.test b/test/async.test
index ed2325e3444badc982a56f28edd16b108bd7e7b3..1dd359da7a388c8141e16271157d67bcccdc9c9c 100644 (file)
--- a/test/async.test
+++ b/test/async.test
@@ -6,7 +6,7 @@
 #***********************************************************************
 # This file runs all tests.
 #
-# $Id: async.test,v 1.10 2007/09/05 11:34:54 danielk1977 Exp $
+# $Id: async.test,v 1.11 2007/09/05 13:56:32 danielk1977 Exp $
 
 
 if {[catch {sqlite3async_enable}]} {
@@ -26,17 +26,17 @@ proc finish_test {} {
 set ISQUICK 1
 
 set INCLUDE {
-  select1.test
-  select2.test
-  select3.test
-  select4.test
   insert.test
   insert2.test
   insert3.test
-  trans.test
   lock.test
-  lock3.test
   lock2.test
+  lock3.test
+  select1.test
+  select2.test
+  select3.test
+  select4.test
+  trans.test
 }
 
 # Enable asynchronous IO.
@@ -45,8 +45,8 @@ sqlite3async_enable 1
 rename do_test really_do_test
 proc do_test {name args} {
   uplevel really_do_test async_io-$name $args
-  sqlite3async_halt idle
   sqlite3async_start
+  sqlite3async_halt idle
   sqlite3async_wait
 }
 

diff --git a/test/lock4.test b/test/lock4.test
index dee16b9e440e784c6636caf4e91a01daddf85604..4138d2107848fa2f14b51bb4523f345350c66103 100644 (file)
--- a/test/lock4.test
+++ b/test/lock4.test
@@ -11,7 +11,7 @@
 # This file implements regression tests for SQLite library.  The
 # focus of this script is database locks.
 #
-# $Id: lock4.test,v 1.4 2007/04/06 21:42:22 drh Exp $
+# $Id: lock4.test,v 1.5 2007/09/05 13:56:32 danielk1977 Exp $
 
 
 set testdir [file dirname $argv0]
@@ -83,6 +83,7 @@ do_test lock4-1.3 {
   db eval {
      COMMIT;
   }
+breakpoint
   while {[file exists test2.db-journal]} {
     after 10
   }