Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Re-check sqlite3GlobalConfig.isInit after the mutex subsystem has been initialized. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | mutexInitIsInitReCheck |
| Files: | files | file ages | folders |
| SHA1: |
fea8c0b281b374f2e0b82bec8788275e |
| User & Date: | mistachkin 2015-09-14 22:52:37 |
Context
|
2015-09-14
| ||
| 22:53 | Merge updates from trunk. (check-in: 25c15771 user: mistachkin tags: mutexInitIsInitReCheck) | |
| 22:52 | Re-check sqlite3GlobalConfig.isInit after the mutex subsystem has been initialized. (check-in: fea8c0b2 user: mistachkin tags: mutexInitIsInitReCheck) | |
|
2015-09-13
| ||
| 20:15 | Add static VFS mutexes to the primary header file comments. (check-in: 9a867d9f user: mistachkin tags: trunk) | |
Changes
Changes to src/main.c.
167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 |
** This operation is protected by the STATIC_MASTER mutex. Note that
** MutexAlloc() is called for a static mutex prior to initializing the
** malloc subsystem - this implies that the allocation of a static
** mutex must not require support from the malloc subsystem.
*/
MUTEX_LOGIC( pMaster = sqlite3MutexAlloc(SQLITE_MUTEX_STATIC_MASTER); )
sqlite3_mutex_enter(pMaster);
sqlite3GlobalConfig.isMutexInit = 1;
if( !sqlite3GlobalConfig.isMallocInit ){
rc = sqlite3MallocInit();
}
if( rc==SQLITE_OK ){
sqlite3GlobalConfig.isMallocInit = 1;
if( !sqlite3GlobalConfig.pInitMutex ){
sqlite3GlobalConfig.pInitMutex =
|
> | > > > > > |
167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 |
** This operation is protected by the STATIC_MASTER mutex. Note that ** MutexAlloc() is called for a static mutex prior to initializing the ** malloc subsystem - this implies that the allocation of a static ** mutex must not require support from the malloc subsystem. */ MUTEX_LOGIC( pMaster = sqlite3MutexAlloc(SQLITE_MUTEX_STATIC_MASTER); ) sqlite3_mutex_enter(pMaster); if( sqlite3GlobalConfig.isInit ){ assert( sqlite3GlobalConfig.isMutexInit ); assert( sqlite3GlobalConfig.isMallocInit ); sqlite3_mutex_leave(pMaster); return SQLITE_OK; } sqlite3GlobalConfig.isMutexInit = 1; /* possibly redundant */ if( !sqlite3GlobalConfig.isMallocInit ){ rc = sqlite3MallocInit(); } if( rc==SQLITE_OK ){ sqlite3GlobalConfig.isMallocInit = 1; if( !sqlite3GlobalConfig.pInitMutex ){ sqlite3GlobalConfig.pInitMutex = |