Implement xLock and xTestLock for lsm1 on Win32.

FossilOrigin-Name: 9112117dad8085c385aa614cd982b307f5822761607ba358f34df7848c549134

diff --git a/ext/lsm1/lsm_win32.c b/ext/lsm1/lsm_win32.c
index 8d9f7fd77dbaff10f181ff3b6416dfaedb36b568..50c5b67af63f1593fa1612d5331a114b8c5be5a5 100644 (file)
--- a/ext/lsm1/lsm_win32.c
+++ b/ext/lsm1/lsm_win32.c
@@ -459,11 +459,59 @@ static int lsmWin32OsUnlink(lsm_env *pEnv, const char *zFile){
 }
 
 int lsmWin32OsLock(lsm_file *pFile, int iLock, int eType){
-  return LSM_ERROR;
+  Win32File *pWin32File = (Win32File *)pFile;
+  OVERLAPPED ovlp;
+
+  assert( LSM_LOCK_UNLOCK==0 );
+  assert( LSM_LOCK_SHARED==1 );
+  assert( LSM_LOCK_EXCL==2 );
+  assert( eType>=LSM_LOCK_UNLOCK && eType<=LSM_LOCK_EXCL );
+  assert( iLock>0 && iLock<=32 );
+
+  memset(&ovlp, 0, sizeof(OVERLAPPED));
+  ovlp.Offset = (4096-iLock);
+  if( eType>LSM_LOCK_UNLOCK ){
+    DWORD flags = LOCKFILE_FAIL_IMMEDIATELY;
+    if( eType>=LSM_LOCK_EXCL ) flags |= LOCKFILE_EXCLUSIVE_LOCK;
+    if( !LockFileEx(pWin32File->hFile, flags, 0, 1, 0, &ovlp) ){
+      if( GetLastError()==ERROR_IO_PENDING ){
+        return LSM_BUSY;
+      }else{
+        return LSM_IOERR_BKPT;
+      }
+    }
+  }else{
+    if( !UnlockFileEx(pWin32File->hFile, 0, 1, 0, &ovlp) ){
+      return LSM_IOERR_BKPT;
+    }
+  }
+  return LSM_OK;
 }
 
 int lsmWin32OsTestLock(lsm_file *pFile, int iLock, int nLock, int eType){
-  return LSM_ERROR;
+  Win32File *pWin32File = (Win32File *)pFile;
+  DWORD flags = LOCKFILE_FAIL_IMMEDIATELY;
+  OVERLAPPED ovlp;
+
+  assert( LSM_LOCK_UNLOCK==0 );
+  assert( LSM_LOCK_SHARED==1 );
+  assert( LSM_LOCK_EXCL==2 );
+  assert( eType==LSM_LOCK_SHARED || eType==LSM_LOCK_EXCL );
+  assert( nLock>=0 );
+  assert( iLock>0 && iLock<=32 );
+
+  if( eType>=LSM_LOCK_EXCL ) flags |= LOCKFILE_EXCLUSIVE_LOCK;
+  memset(&ovlp, 0, sizeof(OVERLAPPED));
+  ovlp.Offset = (4096-iLock);
+  if( !LockFileEx(pWin32File->hFile, flags, 0, (DWORD)nLock, 0, &ovlp) ){
+    if( GetLastError()==ERROR_IO_PENDING ){
+      return LSM_BUSY;
+    }else{
+      return LSM_IOERR_BKPT;
+    }
+  }
+  UnlockFileEx(pWin32File->hFile, 0, (DWORD)nLock, 0, &ovlp);
+  return LSM_OK;
 }
 
 int lsmWin32OsShmMap(lsm_file *pFile, int iChunk, int sz, void **ppShm){

diff --git a/manifest b/manifest
index 0cd530a672e9273a27e03cdde68e898e067fe801..af213f157168e2c1a86754f0e58d6aecc402eabf 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Improve\sa\slocal\svariable\sname.
-D 2017-06-27T22:33:06.331
+C Implement\sxLock\sand\sxTestLock\sfor\slsm1\son\sWin32.
+D 2017-06-28T21:36:40.949
 F Makefile.in 1cc758ce3374a32425e4d130c2fe7b026b20de5b8843243de75f087c0a2661fb
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc d389c6fb3344ea6887b386d56784a6d8a5c85107294448aeda50ac404285a1ef
@@ -249,7 +249,7 @@ F ext/lsm1/lsm_tree.c 5d9fb2bc58a1a70c75126bd8d7198f7b627e165b
 F ext/lsm1/lsm_unix.c ee0201dff10ce2008ef13a65f52a6ea348f287e795270f651596f812fcfccdcc
 F ext/lsm1/lsm_varint.c b19ae9bd26b5a1e8402fb8a564b25d9542338a41
 F ext/lsm1/lsm_vtab.c fff303ce03168eca9e333add3c1429b3471674b0
-F ext/lsm1/lsm_win32.c fd1a47d851d1955846056df5644b6eea44912ffce56e02811e57d3daed9cdf38
+F ext/lsm1/lsm_win32.c a1a3d712f8112a93899a2964cb09dbedcea28e352d81048632c72cf6a14eb2c9
 F ext/misc/README.md 8e008c8d2b02e09096b31dfba033253ac27c6c06a18aa5826e299fa7601d90b2
 F ext/misc/amatch.c 6db4607cb17c54b853a2d7c7c36046d004853f65b9b733e6f019d543d5dfae87
 F ext/misc/anycollseq.c 5ffdfde9829eeac52219136ad6aa7cd9a4edb3b15f4f2532de52f4a22525eddb
@@ -1624,7 +1624,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 7e669d9bfab237ff7ece821cf95cfd3bb753b1882b9a86044b7d4579808aecf4
-R a194f4add86f8c2bf9581bbe931d15bb
+P d0f6973d93c36451bf64f47de9a88abec613a624603033bf6717f5071139b6d2
+R 21110d45751e806c992b04ef05ac7e74
 U mistachkin
-Z 6e9726878bd2ddfe288293450bc21311
+Z e53e89fbbfaae4a22bd4502cd00f0ba9

diff --git a/manifest.uuid b/manifest.uuid
index ca1617c16c57c6a9dabbe88febece7a84d9d0117..368f6f1ff20166d38f71e45922a770389d0e601b 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d0f6973d93c36451bf64f47de9a88abec613a624603033bf6717f5071139b6d2
\ No newline at end of file
+9112117dad8085c385aa614cd982b307f5822761607ba358f34df7848c549134
\ No newline at end of file