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

Arrange for ThreadData to be automatically deallocated even if SQLITE_MEMDEBUG is defined. Fix for #1623. (CVS 2965)

Browse Source 
FossilOrigin-Name: 9e2e40845d30cc150abe23ee318a721b4fe9613c
This commit is contained in:
danielk1977
2006-01-17 16:10:13 +00:00
parent 08659fee65
commit cbb8496c5e
7 changed files with 41 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/os_unix.c
+2 -2
View File
@@ -1769,7 +1769,7 @@ ThreadData *sqlite3UnixThreadSpecificData(int allocateFlag){
}
}
}else if( pTsd!=0 && allocateFlag<0
&& memcmp(pTsd, &zeroData, sizeof(zeroData))==0 ){
&& memcmp(pTsd, &zeroData, THREADDATASIZE)==0 ){
sqlite3OsFree(pTsd);
pthread_setspecific(key, 0);
TSD_COUNTER(-1);
@@ -1787,7 +1787,7 @@ ThreadData *sqlite3UnixThreadSpecificData(int allocateFlag){
}
}
}else if( pTsd!=0 && allocateFlag<0
&& memcmp(pTsd, &zeroData, sizeof(zeroData))==0 ){
&& memcmp(pTsd, &zeroData, THREADDATASIZE)==0 ){
sqlite3OsFree(pTsd);
TSD_COUNTER(-1);
pTsd = 0;
src/os_win.c
+1 -1
View File
@@ -1207,7 +1207,7 @@ ThreadData *sqlite3WinThreadSpecificData(int allocateFlag){
}
}
}else if( pTsd!=0 && allocateFlag<0
&& memcmp(pTsd, &zeroData, sizeof(zeroData))==0 ){
&& memcmp(pTsd, &zeroData, THREADDATASIZE)==0 ){
sqlite3OsFree(pTsd);
TlsSetValue(key, 0);
TSD_COUNTER_DECR;
src/sqliteInt.h
+18 -2
View File
@@ -11,7 +11,7 @@
*************************************************************************
** Internal interface definitions for SQLite.
**
** @(#) $Id: sqliteInt.h,v 1.471 2006/01/17 15:36:32 danielk1977 Exp $
** @(#) $Id: sqliteInt.h,v 1.472 2006/01/17 16:10:14 danielk1977 Exp $
*/
#ifndef _SQLITEINT_H_
#define _SQLITEINT_H_
@@ -310,15 +310,31 @@ struct ThreadData {
#endif
#ifdef SQLITE_MEMDEBUG
void *pFirst; /* Pointer to linked list of allocations */
int nMaxAlloc; /* High water mark of ThreadData.nAlloc */
int mallocDisallowed; /* assert() in sqlite3Malloc() if set */
int isFail; /* True if all malloc() calls should fail */
const char *zFile; /* Filename to associate debugging info with */
int iLine; /* Line number to associate debugging info with */
void *pFirst; /* Pointer to linked list of allocations */
#endif
};
/*
** The THREADDATASIZE macro is used by the system that automatically
** deallocates ThreadData structures. If the first THREADDATASIZE bytes
** of a ThreadData structure are all zero, then the structure is eligible
** for deallocation.
**
** Usually, THREADDATASIZE is set to the size of the structure. However
** if SQLITE_MEMDEBUG is defined, all variables declared after the
** ThreadData.pFirst variable are excluded.
*/
#ifdef SQLITE_MEMDEBUG
#define THREADDATASIZE (int)(&(((ThreadData *)0)->nMaxAlloc))
#else
#define THREADDATASIZE sizeof(ThreadData)
#endif
/*
** Name of the master database table. The master database table
** is a special table that holds the names and attributes of all