Add source code to the "showlocks" utility program in the tool/ subdirectory.

FossilOrigin-Name: 6868cc66d2be67b7f03776c982962ffa4b30de11

diff --git a/manifest b/manifest
index e116e655ac635792c2283ed22a09802664b665e9..73436f25dff2cfb1388c2bf8e97dab8e02e183ae 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Disable\se_walauto.test\son\sOpenBSD,\sas\sit\srequires\sa\scoherent\scache.
-D 2015-04-02T15:24:53.782
+C Add\ssource\scode\sto\sthe\s"showlocks"\sutility\sprogram\sin\sthe\stool/\ssubdirectory.
+D 2015-04-03T18:33:40.031
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 00d12636df7a5b08af09116bcd6c7bfd49b8b3b4
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -1227,6 +1227,7 @@ F tool/restore_jrnl.tcl 6957a34f8f1f0f8285e07536225ec3b292a9024a
 F tool/rollback-test.c 9fc98427d1e23e84429d7e6d07d9094fbdec65a5
 F tool/showdb.c 63cdef19e7fbca0c164b096ef8aef3bb9e9dd222
 F tool/showjournal.c 053eb1cc774710c6890b7dd6293300cc297b16a5
+F tool/showlocks.c 9920bcc64f58378ff1118caead34147201f48c68
 F tool/showstat4.c 9515faa8ec176599d4a8288293ba8ec61f7b728a
 F tool/showwal.c 85cb36d4fe3e93e2fbd63e786e0d1ce42d0c4fad
 F tool/soak1.tcl 8d407956e1a45b485a8e072470a3e629a27037fe
@@ -1248,7 +1249,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 30011ad2f55cfcacaf23a58ebcc17b17a7b9355e
-R 0b149500fabb905b0771216875924384
-U dan
-Z 259e8553f23f2ead0f4917d2e8d05aa6
+P 90701227085b8b8eb10a8eebe8d55f38b4778574
+R f70ddacff9e1db6211fe7e92067ecf89
+U drh
+Z 4cde991c3d8a79a805d8a208c5613c13

diff --git a/manifest.uuid b/manifest.uuid
index 67f1e1b12f6c12e7ca5962275eefd56aeacfd362..1722db95bec3e70f79edddea3bf74bdbbff7f220 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-90701227085b8b8eb10a8eebe8d55f38b4778574
\ No newline at end of file
+6868cc66d2be67b7f03776c982962ffa4b30de11
\ No newline at end of file

diff --git a/tool/showlocks.c b/tool/showlocks.c
new file mode 100644 (file)
index 0000000..752c535
--- /dev/null
+++ b/tool/showlocks.c
@@ -0,0 +1,64 @@
+/*
+** This file implements a simple command-line utility that shows all of the
+** Posix Advisory Locks on a file.
+**
+** Usage:
+**
+**     showlocks FILENAME
+**
+** To compile:  gcc -o showlocks showlocks.c
+*/
+#include <stdio.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <stdlib.h>
+#include <string.h>
+
+/* This utility only looks for locks in the first 2 billion bytes */
+#define MX_LCK 2147483647
+
+/*
+** Print all locks on the inode of "fd" that occur in between
+** lwr and upr, inclusive.
+*/
+static int showLocksInRange(int fd, off_t lwr, off_t upr){
+  int cnt = 0;
+  struct flock x;
+
+  x.l_type = F_WRLCK;
+  x.l_whence = SEEK_SET;
+  x.l_start = lwr;
+  x.l_len = upr-lwr;
+  fcntl(fd, F_GETLK, &x);
+  if( x.l_type==F_UNLCK ) return 0;
+  printf("start: %-12d len: %-5d pid: %-5d type: %s\n",
+       (int)x.l_start, (int)x.l_len,
+       x.l_pid, x.l_type==F_WRLCK ? "WRLCK" : "RDLCK");
+  cnt++;
+  if( x.l_start>lwr ){
+    cnt += showLocksInRange(fd, lwr, x.l_start-1);
+  }
+  if( x.l_start+x.l_len<upr ){
+    cnt += showLocksInRange(fd, x.l_start+x.l_len+1, upr);
+  }
+  return cnt;
+}
+
+int main(int argc, char **argv){
+  int fd;
+  int cnt;
+
+  if( argc!=2 ){
+    fprintf(stderr, "Usage: %s FILENAME\n", argv[0]);
+    return 1;
+  }
+  fd = open(argv[1], O_RDWR, 0);
+  if( fd<0 ){
+    fprintf(stderr, "%s: cannot open %s\n", argv[0], argv[1]);
+    return 1;
+  }
+  cnt = showLocksInRange(fd, 0, MX_LCK);
+  if( cnt==0 ) printf("no locks\n");  
+  close(fd);
+  return 0;
+}