mirrors/sqlite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve clarity in the Win32 VFS for lsm1.

Browse Source 
FossilOrigin-Name: 9c7a9e805d95d3d4a3f7e2d608280b7ca0dda01114e32cd366b1deb14e6e6839
This commit is contained in:
mistachkin 2017-07-07 16:46:08 +00:00
parent baebf3cc4b
commit e60092b90c
3 changed files with 28 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
ext/lsm1/lsm_win32.c
View File

@ -47,12 +47,12 @@ struct Win32File {
LPVOID *apShm; /* Array of 32K shared memory segments */ LPVOID *apShm; /* Array of 32K shared memory segments */
}; };
static char *win32ShmFile(Win32File *p){ static char *win32ShmFile(Win32File *pWin32File){
char *zShm; char *zShm;
int nName = strlen(p->zName); int nName = strlen(pWin32File->zName);
zShm = (char *)lsmMallocZero(p->pEnv, nName+4+1); zShm = (char *)lsmMallocZero(pWin32File->pEnv, nName+4+1);
if( zShm ){ if( zShm ){
memcpy(zShm, p->zName, nName); memcpy(zShm, pWin32File->zName, nName);
memcpy(&zShm[nName], "-shm", 5); memcpy(&zShm[nName], "-shm", 5);
} }
return zShm; return zShm;
@ -380,6 +380,18 @@ static int lsmWin32OsSectorSize(lsm_file *pFile){
return 512; return 512;
} }
static void win32Unmap(Win32File *pWin32File){
if( pWin32File->pMap!=NULL ){
UnmapViewOfFile(pWin32File->pMap);
pWin32File->pMap = NULL;
pWin32File->nMap = 0;
}
if( pWin32File->hMap!=NULL ){
CloseHandle(pWin32File->hMap);
pWin32File->hMap = NULL;
}
}
static int lsmWin32OsRemap( static int lsmWin32OsRemap(
lsm_file *pFile, lsm_file *pFile,
lsm_i64 iMin, lsm_i64 iMin,
@ -393,15 +405,10 @@ static int lsmWin32OsRemap(
const int aIncrSz[] = {256*1024, 1024*1024}; const int aIncrSz[] = {256*1024, 1024*1024};
int nIncrSz = aIncrSz[iMin>(2*1024*1024)]; int nIncrSz = aIncrSz[iMin>(2*1024*1024)];
if( pWin32File->pMap!=NULL ){ *ppOut = NULL;
UnmapViewOfFile(pWin32File->pMap); *pnOut = 0;
*ppOut = pWin32File->pMap = NULL;
*pnOut = pWin32File->nMap = 0; win32Unmap(pWin32File);
}
if( pWin32File->hMap!=NULL ){
CloseHandle(pWin32File->hMap);
pWin32File->hMap = NULL;
}
if( iMin>=0 ){ if( iMin>=0 ){
LARGE_INTEGER fileSize; LARGE_INTEGER fileSize;
DWORD dwSizeHigh; DWORD dwSizeHigh;
@ -759,15 +766,7 @@ static int lsmWin32OsClose(lsm_file *pFile){
int nRetry = 0; int nRetry = 0;
Win32File *pWin32File = (Win32File *)pFile; Win32File *pWin32File = (Win32File *)pFile;
lsmWin32OsShmUnmap(pFile, 0); lsmWin32OsShmUnmap(pFile, 0);
if( pWin32File->pMap!=NULL ){ win32Unmap(pWin32File);
UnmapViewOfFile(pWin32File->pMap);
pWin32File->pMap = NULL;
pWin32File->nMap = 0;
}
if( pWin32File->hMap!=NULL ){
CloseHandle(pWin32File->hMap);
pWin32File->hMap = NULL;
}
do{ do{
if( pWin32File->hFile==NULL ){ if( pWin32File->hFile==NULL ){
rc = LSM_IOERR_BKPT; rc = LSM_IOERR_BKPT;

12
manifest
View File

@ -1,5 +1,5 @@
C Add\ssupport\sfor\sLSM_DEBUG_MEM\sto\sthe\sMSVC\smakefile\sfor\slsm1. C Improve\sclarity\sin\sthe\sWin32\sVFS\sfor\slsm1.
D 2017-07-07T16:29:37.591 D 2017-07-07T16:46:08.188
F Makefile.in 081e48dfe7f995d57ce1a88ddf4d2917b4349158648a6cd45b42beae30de3a12 F Makefile.in 081e48dfe7f995d57ce1a88ddf4d2917b4349158648a6cd45b42beae30de3a12
F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
F Makefile.msc 4ebb1d257cac7fb1bcb4ba59278416d410ff1c4bf59447a9c37a415f3516056a F Makefile.msc 4ebb1d257cac7fb1bcb4ba59278416d410ff1c4bf59447a9c37a415f3516056a
@ -250,7 +250,7 @@ F ext/lsm1/lsm_tree.c 53b657439e0fcb1117b0559ad3567ac417f81f2ed0fff9bab79948a00e
F ext/lsm1/lsm_unix.c 57361bcf5b1a1a028f5d66571ee490e9064d2cfb145a2cc9e5ddade467bb551b F ext/lsm1/lsm_unix.c 57361bcf5b1a1a028f5d66571ee490e9064d2cfb145a2cc9e5ddade467bb551b
F ext/lsm1/lsm_varint.c b19ae9bd26b5a1e8402fb8a564b25d9542338a41 F ext/lsm1/lsm_varint.c b19ae9bd26b5a1e8402fb8a564b25d9542338a41
F ext/lsm1/lsm_vtab.c 812b74a9a7539e8cab49761591ffddc1b3580735fac5d638826c8d2be95ff38b F ext/lsm1/lsm_vtab.c 812b74a9a7539e8cab49761591ffddc1b3580735fac5d638826c8d2be95ff38b
F ext/lsm1/lsm_win32.c 9745cebaf03c6e04f0017d0dda8dc1db447a372b9ae4e32e1119ded10e1b54bc F ext/lsm1/lsm_win32.c 24757d71673d20634afb681f59af8da8cbe84733be82b86b133d79bd9ff335de
F ext/misc/README.md 8e008c8d2b02e09096b31dfba033253ac27c6c06a18aa5826e299fa7601d90b2 F ext/misc/README.md 8e008c8d2b02e09096b31dfba033253ac27c6c06a18aa5826e299fa7601d90b2
F ext/misc/amatch.c 6db4607cb17c54b853a2d7c7c36046d004853f65b9b733e6f019d543d5dfae87 F ext/misc/amatch.c 6db4607cb17c54b853a2d7c7c36046d004853f65b9b733e6f019d543d5dfae87
F ext/misc/anycollseq.c 5ffdfde9829eeac52219136ad6aa7cd9a4edb3b15f4f2532de52f4a22525eddb F ext/misc/anycollseq.c 5ffdfde9829eeac52219136ad6aa7cd9a4edb3b15f4f2532de52f4a22525eddb
@ -1628,7 +1628,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
P 5f726f2830dcf91f5e5c010b10761757f746d39b9dd2b8c9770452ce65bb1652 P 3340de83df8c4fb19f729e6ff0838a9a03a1e701cdb40cb830e76f294198024a
R 10f4aefb9087225386886b178c9318d9 R 441b83e8fe7c6e7ee9052521ffcfa22a
U mistachkin U mistachkin
Z 30c8506981cfdd14daac87f535153316 Z 05a5043cc6c8a10020a4334d65b17df2

2
manifest.uuid
View File

@ -1 +1 @@
3340de83df8c4fb19f729e6ff0838a9a03a1e701cdb40cb830e76f294198024a 9c7a9e805d95d3d4a3f7e2d608280b7ca0dda01114e32cd366b1deb14e6e6839