Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Experimental changes to avoid recusrively calling xMutexInit. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | mutexInitCmpSwap |
| Files: | files | file ages | folders |
| SHA1: |
c9400ff167d9520119081c9b92436794 |
| User & Date: | mistachkin 2015-09-13 18:45:50 |
Context
|
2015-09-23
| ||
| 15:54 | Merge updates from trunk. (Closed-Leaf check-in: 6b85f8cd user: mistachkin tags: mutexInitCmpSwap) | |
|
2015-09-13
| ||
| 18:45 | Experimental changes to avoid recusrively calling xMutexInit. (check-in: c9400ff1 user: mistachkin tags: mutexInitCmpSwap) | |
| 18:43 | Merge updates from trunk. (check-in: b42c2e20 user: mistachkin tags: mutexInitCmpSwap) | |
Changes
Changes to src/mutex.c.
71
72
73
74
75
76
77
78
79
80
81
82
83
84
..
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
|
pTo->xMutexAlloc = pFrom->xMutexAlloc;
}
/*
** Initialize the mutex system.
*/
int sqlite3MutexInit(void){
int rc;
if( sqlite3CompareAndSwap((void * volatile *)&sqlite3GlobalConfig.pMutex,
0, &sqlite3GlobalConfig.mutex)==0 || mutexIsInvalid() ){
/* If the mutex implementation pointer has not been set, then the user
** did not install a mutex implementation via sqlite3_config() prior to
** sqlite3_initialize() being called. This block copies the pointers
** for the default implementation into the sqlite3GlobalConfig structure.
................................................................................
pFrom = sqlite3DefaultMutex();
}else{
pFrom = sqlite3NoopMutex();
}
mutexCopy(&sqlite3GlobalConfig.mutex, pFrom);
sqlite3MemoryBarrier();
}
assert( sqlite3GlobalConfig.mutex.xMutexInit );
rc = sqlite3GlobalConfig.mutex.xMutexInit();
#ifdef SQLITE_DEBUG
GLOBAL(int, mutexIsInit) = 1;
#endif
return rc;
}
|
>
>
|
>
|
>
>
|
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
..
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
|
pTo->xMutexAlloc = pFrom->xMutexAlloc;
}
/*
** Initialize the mutex system.
*/
int sqlite3MutexInit(void){
static int initPending = 0;
int rc;
if( sqlite3CompareAndSwap((void * volatile *)&sqlite3GlobalConfig.pMutex,
0, &sqlite3GlobalConfig.mutex)==0 || mutexIsInvalid() ){
/* If the mutex implementation pointer has not been set, then the user
** did not install a mutex implementation via sqlite3_config() prior to
** sqlite3_initialize() being called. This block copies the pointers
** for the default implementation into the sqlite3GlobalConfig structure.
................................................................................
pFrom = sqlite3DefaultMutex();
}else{
pFrom = sqlite3NoopMutex();
}
mutexCopy(&sqlite3GlobalConfig.mutex, pFrom);
sqlite3MemoryBarrier();
}
if( !initPending ){
assert( sqlite3GlobalConfig.mutex.xMutexInit );
initPending = 1;
rc = sqlite3GlobalConfig.mutex.xMutexInit();
initPending = 0;
}
#ifdef SQLITE_DEBUG
GLOBAL(int, mutexIsInit) = 1;
#endif
return rc;
}
|