database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-11-12 13:01:09 +03:00
Code Activity

Always include the unixShm.id field, even when not debugging.

Browse Source 
FossilOrigin-Name: 07803476206b8cde60ccc320b9ccdc0d48a41d65
This commit is contained in:
drh
2011-08-31 18:35:34 +00:00
parent 7730c4457e
commit fd53231c85
3 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
manifest
View File

@@ -1,5 +1,5 @@
C Only\screate\sthe\ssqlite3OSTrace\sglobal\svariable\sif\scompiling\swith\s\nSQLITE_TEST. C Always\sinclude\sthe\sunixShm.id\sfield,\seven\swhen\snot\sdebugging.
D 2011-08-31T18:04:54.752 D 2011-08-31T18:35:34.234
F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
F Makefile.in d314143fa6be24828021d3f583ad37d9afdce505 F Makefile.in d314143fa6be24828021d3f583ad37d9afdce505
F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -165,7 +165,7 @@ F src/os.c fcc717427a80b2ed225373f07b642dc1aad7490b
F src/os.h 9dbed8c2b9c1f2f2ebabc09e49829d4777c26bf9 F src/os.h 9dbed8c2b9c1f2f2ebabc09e49829d4777c26bf9
F src/os_common.h b15945976976c80e9a29c2d331a9c6fb42d3efa5 F src/os_common.h b15945976976c80e9a29c2d331a9c6fb42d3efa5
F src/os_os2.c 4a75888ba3dfc820ad5e8177025972d74d7f2440 F src/os_os2.c 4a75888ba3dfc820ad5e8177025972d74d7f2440
F src/os_unix.c ae82cf32c497d9a3a0f147de1b7219b636db4f53 F src/os_unix.c 9e6e26b96b10e62a5dc678ea95bbb16d05fcca6e
F src/os_win.c 45de13c6c3501cfd6469b2b34149b823060e39f4 F src/os_win.c 45de13c6c3501cfd6469b2b34149b823060e39f4
F src/pager.c 817f7f7140c9fa2641f28e6330e924708ddd870d F src/pager.c 817f7f7140c9fa2641f28e6330e924708ddd870d
F src/pager.h 2bab1b2ea4eac58663b5833e3522e36b5ff63447 F src/pager.h 2bab1b2ea4eac58663b5833e3522e36b5ff63447
@@ -961,7 +961,7 @@ F tool/symbols.sh caaf6ccc7300fd43353318b44524853e222557d5
F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06 F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
F tool/warnings.sh b7fdb2cc525f5ef4fa43c80e771636dd3690f9d2 F tool/warnings.sh b7fdb2cc525f5ef4fa43c80e771636dd3690f9d2
P df550066657cb41bad34ac8e722b8148ab7eabfb P 9e6a4c1473a4cb061a88f6a437a2828368b3ddc8
R ba2041aae6bc957791be99b48d3a5d63 R 834dac199e1c9ebe831f91eccddde409
U drh U drh
Z 1de22a554319629ea944db035b2e3bd4 Z 761dac1f8bf1d111d08b2e615a88c98b

2
manifest.uuid
View File

@@ -1 +1 @@
9e6a4c1473a4cb061a88f6a437a2828368b3ddc8 07803476206b8cde60ccc320b9ccdc0d48a41d65

4
src/os_unix.c
View File

@@ -3640,11 +3640,9 @@ struct unixShm {
unixShmNode *pShmNode; /* The underlying unixShmNode object */ unixShmNode *pShmNode; /* The underlying unixShmNode object */
unixShm *pNext; /* Next unixShm with the same unixShmNode */ unixShm *pNext; /* Next unixShm with the same unixShmNode */
u8 hasMutex; /* True if holding the unixShmNode mutex */ u8 hasMutex; /* True if holding the unixShmNode mutex */
u8 id; /* Id of this connection within its unixShmNode */
u16 sharedMask; /* Mask of shared locks held */ u16 sharedMask; /* Mask of shared locks held */
u16 exclMask; /* Mask of exclusive locks held */ u16 exclMask; /* Mask of exclusive locks held */
#ifdef SQLITE_DEBUG
u8 id; /* Id of this connection within its unixShmNode */
#endif
}; };
/* /*