Add the "lock_status" pragma - only available when SQLITE_DEBUG is defined.

Used for testing only. (CVS 1547)

FossilOrigin-Name: 0ecbba78fcde8f7715cd74c674b5040ef4953f6e

diff --git a/manifest b/manifest
index d7d26b7f532286ef18f5379742da63e81a8acdaa..750fefe9bec582af4cfb70fdf83ab5d5296e4a9b 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Change\sthe\sMEMORY_DEBUG\smacro\sto\sSQLITE_DEBUG.\s(CVS\s1546)
-D 2004-06-09T14:01:51
+C Add\sthe\s"lock_status"\spragma\s-\sonly\savailable\swhen\sSQLITE_DEBUG\sis\sdefined.\nUsed\sfor\stesting\sonly.\s(CVS\s1547)
+D 2004-06-09T14:17:21
 F Makefile.in ab7b0d5118e2da97bac66be8684a1034e3500f5a
 F Makefile.linux-gcc a9e5a0d309fa7c38e7c14d3ecf7690879d3a5457
 F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd
@@ -47,10 +47,10 @@ F src/os_unix.c 3747274f2712e95f605c0ec66df5ad26e3711e82
 F src/os_unix.h 7999f2246c6347707e98f7078871ea8ca605df3f
 F src/os_win.c a13b85a0d4889e3d0b254ed2a61354acddc59fc4
 F src/os_win.h 004eec47b1780fcaf07420ddc2072294b698d48c
-F src/pager.c 3fddd1e5b3e449b19e4f762ab1f1d10786d56d28
-F src/pager.h 0c7b5ac45c69e690c45d160d03bdc8fbd2d4657b
+F src/pager.c c483bef234b89531f9fdf6067231d248260d762b
+F src/pager.h 3576e5f1a0719f74df3082df73f7b39890b06654
 F src/parse.y 097438674976355a10cf177bd97326c548820b86
-F src/pragma.c d63b011bf860cec032b7da90b56643d189602ee5
+F src/pragma.c 3251628662963f30a95133b19d59e4bc08226c76
 F src/printf.c 63b15f1ea9fe3daa066bb7430fd20d4a2d717dc8
 F src/random.c eff68e3f257e05e81eae6c4d50a51eb88beb4ff3
 F src/select.c 1f8355e702f109f6771f82a9bfe7aac4c82cbaf2
@@ -218,7 +218,7 @@ F www/support.tcl 1801397edd271cc39a2aadd54e701184b5181248
 F www/tclsqlite.tcl 19191cf2a1010eaeff74c51d83fd5f5a4d899075
 F www/vdbe.tcl 59288db1ac5c0616296b26dce071c36cb611dfe9
 F www/whentouse.tcl a8335bce47cc2fddb07f19052cb0cb4d9129a8e4
-P beab038c71eecbabb1351b0c98a71f32ea013285
-R 4fb29233149257f0d3747b745eb94817
+P 428b685b7174ef4589176def1028ad1c9461ff7e
+R b811ffa94f6a9084cf35549f784cc75b
 U drh
-Z 903dfd3a43373a03e2e446ce02ca114d
+Z 897e459988003c5f46676db9047d5c51

diff --git a/manifest.uuid b/manifest.uuid
index ea207393f802d18a43fa4e4dd496341b90274992..704888bcb060745bd96c869a94ea153b4477068d 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-428b685b7174ef4589176def1028ad1c9461ff7e
\ No newline at end of file
+0ecbba78fcde8f7715cd74c674b5040ef4953f6e
\ No newline at end of file

diff --git a/src/pager.c b/src/pager.c
index f6e297bd714af1f82d32193c2c8848252ed04eae..e8f94296ec7013ba607db2ad1133acd426cab382 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.113 2004/06/07 16:27:46 drh Exp $
+** @(#) $Id: pager.c,v 1.114 2004/06/09 14:17:21 drh Exp $
 */
 #include "os.h"         /* Must be first to enable large file support */
 #include "sqliteInt.h"
@@ -2705,6 +2705,17 @@ sync_exit:
   return rc;
 }
 
+#ifdef SQLITE_DEBUG
+/*
+** Return the current state of the file lock for the given pager.
+** The return value is one of NO_LOCK, SHARED_LOCK, RESERVED_LOCK,
+** PENDING_LOCK, or EXCLUSIVE_LOCK.
+*/
+int sqlite3pager_lockstate(Pager *pPager){
+  return pPager->fd.locktype;
+}
+#endif
+
 #ifdef SQLITE_TEST
 /*
 ** Print a listing of all referenced pages and their ref count.

diff --git a/src/pager.h b/src/pager.h
index 5ae27167e9a3c1f5525a5bf094f2c13704ab44d6..580b9f8844bac780cb960d507b5584339a38ee64 100644 (file)
--- a/src/pager.h
+++ b/src/pager.h
@@ -13,7 +13,7 @@
 ** subsystem.  The page cache subsystem reads and writes a file a page
 ** at a time and provides a journal for rollback.
 **
-** @(#) $Id: pager.h,v 1.31 2004/06/04 06:22:02 danielk1977 Exp $
+** @(#) $Id: pager.h,v 1.32 2004/06/09 14:17:21 drh Exp $
 */
 
 /*
@@ -101,6 +101,10 @@ const char *sqlite3pager_filename(Pager*);
 int sqlite3pager_rename(Pager*, const char *zNewName);
 void sqlite3pager_set_codec(Pager*,void(*)(void*,void*,Pgno,int),void*);
 
+#ifdef SQLITE_DEBUG
+int sqlite3pager_lockstate(Pager*);
+#endif
+
 #ifdef SQLITE_TEST
 void sqlite3pager_refdump(Pager*);
 int pager3_refinfo_enable;

diff --git a/src/pragma.c b/src/pragma.c
index 21b3e9a4f7b53c36ce25535ea55d557b1421797f..9a6eac16a08e3bce35bfb706165b65ab379b665e 100644 (file)
--- a/src/pragma.c
+++ b/src/pragma.c
@@ -11,11 +11,16 @@
 *************************************************************************
 ** This file contains code used to implement the PRAGMA command.
 **
-** $Id: pragma.c,v 1.39 2004/06/09 12:30:06 danielk1977 Exp $
+** $Id: pragma.c,v 1.40 2004/06/09 14:17:21 drh Exp $
 */
 #include "sqliteInt.h"
 #include <ctype.h>
 
+#ifdef SQLITE_DEBUG
+# include "pager.h"
+# include "btree.h"
+#endif
+
 /*
 ** Interpret the given string as a boolean value.
 */
@@ -808,6 +813,37 @@ void sqlite3Pragma(Parse *pParse, Token *pLeft, Token *pRight, int minusFlag){
     }
   }else
 
+#ifdef SQLITE_DEBUG
+  /*
+  ** Report the current state of file logs for all databases
+  */
+  if( sqlite3StrICmp(zLeft, "lock_status")==0 ){
+    static char *azLockName[] = {
+      "unlocked", "shared", "reserved", "pending", "exclusive"
+    };
+    int i;
+    Vdbe *v = sqlite3GetVdbe(pParse);
+    sqlite3VdbeSetNumCols(v, 2);
+    sqlite3VdbeSetColName(v, 0, "database", P3_STATIC);
+    sqlite3VdbeSetColName(v, 1, "status", P3_STATIC);
+    for(i=0; i<db->nDb; i++){
+      Btree *pBt;
+      Pager *pPager;
+      if( db->aDb[i].zName==0 ) continue;
+      sqlite3VdbeOp3(v, OP_String, 0, 0, db->aDb[i].zName, P3_STATIC);
+      pBt = db->aDb[i].pBt;
+      if( pBt==0 || (pPager = sqlite3BtreePager(pBt))==0 ){
+        sqlite3VdbeOp3(v, OP_String, 0, 0, "closed", P3_STATIC);
+      }else{
+        int j = sqlite3pager_lockstate(pPager);
+        sqlite3VdbeOp3(v, OP_String, 0, 0, 
+            (j>=0 && j<=4) ? azLockName[j] : "unknown", P3_STATIC);
+      }
+      sqlite3VdbeAddOp(v, OP_Callback, 2, 0);
+    }
+  }else
+#endif
+
   {}
   sqliteFree(zLeft);
   sqliteFree(zRight);