Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Always include the unixShm.id field, even when not debugging. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
07803476206b8cde60ccc320b9ccdc0d |
| User & Date: | drh 2011-08-31 18:35:34 |
Context
|
2011-08-31
| ||
| 19:40 | The server1.test script should only run if mutexes are functional. Fix to the #ifdef change of check-in [9e6a4c1473]. check-in: 64898485 user: drh tags: trunk | |
| 18:35 | Always include the unixShm.id field, even when not debugging. check-in: 07803476 user: drh tags: trunk | |
| 18:04 | Only create the sqlite3OSTrace global variable if compiling with SQLITE_TEST. check-in: 9e6a4c14 user: drh tags: trunk | |
Changes
Changes to src/os_unix.c.
3636 3636 ** All other fields are read/write. The unixShm.pFile->mutex must be held 3637 3637 ** while accessing any read/write fields. 3638 3638 */ 3639 3639 struct unixShm { 3640 3640 unixShmNode *pShmNode; /* The underlying unixShmNode object */ 3641 3641 unixShm *pNext; /* Next unixShm with the same unixShmNode */ 3642 3642 u8 hasMutex; /* True if holding the unixShmNode mutex */ 3643 + u8 id; /* Id of this connection within its unixShmNode */ 3643 3644 u16 sharedMask; /* Mask of shared locks held */ 3644 3645 u16 exclMask; /* Mask of exclusive locks held */ 3645 -#ifdef SQLITE_DEBUG 3646 - u8 id; /* Id of this connection within its unixShmNode */ 3647 -#endif 3648 3646 }; 3649 3647 3650 3648 /* 3651 3649 ** Constants used for locking 3652 3650 */ 3653 3651 #define UNIX_SHM_BASE ((22+SQLITE_SHM_NLOCK)*4) /* first lock byte */ 3654 3652 #define UNIX_SHM_DMS (UNIX_SHM_BASE+SQLITE_SHM_NLOCK) /* deadman switch */