aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--manifest46
-rw-r--r--manifest.uuid2
-rw-r--r--src/btree.c6
-rw-r--r--src/func.c5
-rw-r--r--src/loadext.c1
-rw-r--r--src/mem2.c58
-rw-r--r--src/os_unix.c6
-rw-r--r--src/sqlite.h.in19
-rw-r--r--src/sqliteInt.h4
-rw-r--r--src/test1.c14
-rw-r--r--src/test6.c11
-rw-r--r--src/test8.c4
-rw-r--r--src/test_malloc.c56
-rw-r--r--src/vdbeaux.c6
-rw-r--r--src/vtab.c6
-rw-r--r--test/all.test4
-rw-r--r--test/malloc4.test26
-rw-r--r--test/quick.test3
-rw-r--r--test/shared2.test5
-rw-r--r--test/tester.tcl38
20 files changed, 212 insertions, 108 deletions
diff --git a/manifest b/manifest
index 582546d66..0a69f4402 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C All\sof\sthe\smalloc\stest\scases\srun.\s\sStill\sseeing\sfailures\sin\smalloc4.test.\s(CVS\s4272)
-D 2007-08-22T22:04:37
+C Improvements\sto\smemory\sleak\sdetection.\s\sThe\s--backtrace=NNN\soption\sis\snow\nrecognized\sby\stester.tcl.\s\sMemory\sleak\ssummaries\sare\sautomatically\swritten\nto\sthe\sfile\s./memleak.txt\sand\seach\sleak\sis\stagged\swith\sthe\stest\sin\swhich\nit\soccurred.\s\sThe\squick.test\sscript\sruns\son\sLinux\swith\sno\serrors\sand\nno\sleaks.\s(CVS\s4273)
+D 2007-08-23T02:47:53
F Makefile.in 0c0e53720f658c7a551046442dd7afba0b72bfbe
F Makefile.linux-gcc 65241babba6faf1152bf86574477baab19190499
F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -80,7 +80,7 @@ F src/alter.c f0aac0060ae8102e58f210b44d35b53438d53173
F src/analyze.c a14237d869c6bea0846493b59317e4097e81a0b6
F src/attach.c a52225c75b107be8c5bc144a2b6d20201be3f8f8
F src/auth.c 083c1205b45e3f52291ec539d396b4fc557856b3
-F src/btree.c 1e189c3a7ea8e34434b214a8d6b69727c3ed525c
+F src/btree.c 8fa6341b74ab70a28001e4ed4bc5ba14ce1401a6
F src/btree.h 76c89673981cb77575300c0b78a76eaa00a28743
F src/btreeInt.h 7fc6e51dc3d4bbed15639a8ea1aae737631d6670
F src/build.c bc7406e2ea5bfa8276ee1abeae1db27a98fd0b33
@@ -90,19 +90,19 @@ F src/date.c a80b33f6e70d619978622547d2c78ab8b036b31a
F src/delete.c 849846d06d29851dde0d9f424a5de5817eb140d1
F src/experimental.c 1b2d1a6cd62ecc39610e97670332ca073c50792b
F src/expr.c 978afdceb2693ef58ec0040a43fe57afc6e4236c
-F src/func.c 36440cb02589fd4697cbbf0b351eeedc160d1f4b
+F src/func.c aa8a3a8db571c46e5197664ddbc2784006ee5525
F src/hash.c 2f322979071dd2bdba7503b5276d66f028744382
F src/hash.h 3ad3da76bfb954978d227bf495568b0e6da2c19e
F src/insert.c 633322aef1799f6604fa805e12488bc628570b0c
F src/journal.c 5ba2a1443b181741d3f2984d9d49e730073d74d1
F src/legacy.c 7e1b1c57694e49cbadf561e2a7d9cd984dc743b5
F src/limits.h 71ab25f17e35e0a9f3f6f234b8ed49cc56731d35
-F src/loadext.c dd803303fd06ef0b13913faaa4a7fc7d8c8c4e77
+F src/loadext.c 8b31e2e0e961918fa045515459aee1c122d8c266
F src/main.c 527f27c74d22d83713abbd1550fd5a4ecce89aca
F src/malloc.c 8078d4c3f9217c0bb018e432d8655c14996bb107
F src/md5.c c5fdfa5c2593eaee2e32a5ce6c6927c986eaf217
F src/mem1.c 7b023d45dd71944414db469c742457239e24d74d
-F src/mem2.c 28a0d9306378f97e5cddb7863cb3893d40d1f885
+F src/mem2.c 48919353f72b8f6e957a0021eb9deaf863998189
F src/mutex.c 9cf641f556a4119ef90ed41b82f2d5647f81686e
F src/os.c d8f029317c95dcd2887b9f0f154281cdfbd303ad
F src/os.h 399c89cafa93b9ef35c3dc70f77644d10936b535
@@ -111,7 +111,7 @@ F src/os_os2.c 8769301bff502de642ad2634cedcb77d967ce199
F src/os_os2.h c3f7d0af7e3453d1d7aa81b06c0a56f5a226530b
F src/os_test.c 49833426101f99aee4bb5f6a44b7c4b2029fda1c
F src/os_test.h 903c93554c23d88f34f667f1979e4a1cee792af3
-F src/os_unix.c 3e1ce27aa8364f92881a285820ffa414539a6b1b
+F src/os_unix.c 3ff776e03535b64df12dcc272a913a52d69f3e4a
F src/os_unix.h 5768d56d28240d3fe4537fac08cc85e4fb52279e
F src/os_win.c 29c0e19c1072679a4c7818c49fab2f35d2ad7747
F src/os_win.h 41a946bea10f61c158ce8645e7646b29d44f122b
@@ -125,20 +125,20 @@ F src/random.c 4a22746501bf36b0a088c66e38dde5daba6a35da
F src/select.c 98c367bce3f38c5adfcc97de9ab5c79b0e5dc2b2
F src/server.c 087b92a39d883e3fa113cae259d64e4c7438bc96
F src/shell.c ac29402b538515fa4697282387be9c1205e6e9eb
-F src/sqlite.h.in ab5c1bde4c253efabbd815c9df796656a95f16d3
+F src/sqlite.h.in a1a5bc9e7e63bf73c2bb68be3749dec2bbd8cc44
F src/sqlite3ext.h 9a26028378c288af500d8b94ed079666fed5806b
-F src/sqliteInt.h 67b6ed04a2b0c28957bc2cf064ce713d298022b3
+F src/sqliteInt.h 951229c727f14f12f1c5555d2ed079bd2201415c
F src/sqliteLimit.h f14609c27636ebc217c9603ade26dbdd7d0f6afa
F src/table.c c725e47f6f3092b9a7b569fc58e408e2173ee008
F src/tclsqlite.c d76af53f45c9e9f7f7d39531fa4c7bee7d0adad6
-F src/test1.c 95a5db021760d074d5028dd16366aca289a441bf
+F src/test1.c 8b20d1f05777ac480d3caf8d5f79ab7a543513fc
F src/test2.c 4f742e99ed1bea5c14692f627bdb59a146f30504
F src/test3.c a7d011c51d6b2e2a73c43983d5c2b731d69c74d7
F src/test4.c c2c0f5dc907f1346f5d4b65eb5799f11eb9e4071
F src/test5.c 3a6a5717a149d7ca2e6d14f5be72cf7555d54dc4
-F src/test6.c da83a0e49c03e8a25f4ce6e25c537c6617c14fc0
+F src/test6.c 1191c2305c85aa192f04186b59b05a4fb40018cc
F src/test7.c a9d509d0e9ad214b4772696f49f6e61be26213d1
-F src/test8.c 4bf571b82e502094846ae06e30fe028f190aaaae
+F src/test8.c e6a543c8b248efe120ae33a6859fcd55dcf46a96
F src/test9.c b46c8fe02ac7cca1a7316436d8d38d50c66f4b2f
F src/test_async.c 9f3ab66e848930d1c3a7bc2dde77b9b643f6e4ba
F src/test_autoext.c 855157d97aa28cf84233847548bfacda21807436
@@ -146,7 +146,7 @@ F src/test_btree.c c1308ba0b88ab577fa56c9e493a09829dfcded9c
F src/test_config.c f0b911bb615d93a192647e76910dce65cbbcf3ad
F src/test_hexio.c 82916f918687502658f02533b519c38cb180db6d
F src/test_loadext.c 22065d601a18878e5542191001f0eaa5d77c0ed8
-F src/test_malloc.c 1e24e6bf8dfff1886b57b353911493e7025c2158
+F src/test_malloc.c 9d5fb38bc0647ba9376d8d954be5b5aa01e12c80
F src/test_md5.c 34599caee5b1c73dcf86ca31f55846fab8c19ef7
F src/test_schema.c 12c9de7661d6294eec2d57afbb52e2af1128084f
F src/test_server.c 319f6b1a99bab5f7149387442243d6e65a8ab4eb
@@ -161,15 +161,15 @@ F src/vdbe.c 9d4d00589c174aad9a616f1615464ddddebba0ec
F src/vdbe.h 001c5b257567c1d3de7feb2203aac71d0d7b16a3
F src/vdbeInt.h 39fb069ce04137545ca0bc790f80ddc64a8c99d9
F src/vdbeapi.c 81cb7f018e56c20b40365f005ff69e1af9ea9494
-F src/vdbeaux.c b0aeed4ff33352904b392ee6c7408bae5b141b9b
+F src/vdbeaux.c 8b41802973560274c15acdc1ac1d4147c110e8d7
F src/vdbeblob.c d12ed95dac0992e1e372d079d76af047cc42f7c7
F src/vdbefifo.c 334c838c8f42d61a94813d136019ee566b5dc2f6
F src/vdbemem.c 896fa3f8df9d2661eb15c7ce361857741b447268
-F src/vtab.c 8f80924af48fc2295d36f6fe360d3c99ae968f9d
+F src/vtab.c 6a7ce44edf7ad824d7e9307394121fe943bb419c
F src/where.c 2776a0caf8cbbfd6ec79cfb1cd9bc25074055e5e
F tclinstaller.tcl 4356d9d94d2b5ed5e68f9f0c80c4df3048dd7617
F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
-F test/all.test f25ae05da7bf15edfc456f7d002f3b34f60abd49
+F test/all.test 0b2117b4ccbb3dc88a5259d1735a04d20584b92b
F test/alter.test c2a9402e17a731e5294ef370214bd9f88351d18d
F test/alter2.test 50c3f554b8236d179d72511c0a4f23c5eb7f2af3
F test/alter3.test a6eec8f454be9b6ce73d8d7dc711453675a10ce7
@@ -341,7 +341,7 @@ F test/main.test e7212ce1023957c7209778cc87fa932bd79ba89a
F test/malloc.test dbfaedfca734283182db18a64416cf037c33648f
F test/malloc2.test 96dfa6318d3b7bcd41d4fe7e24d35196d465bf58
F test/malloc3.test 65d323508c7c4e1fb5569d03a11070b0259ad2fe
-F test/malloc4.test 3f4857ca83168c00900221681fc76de04394968a
+F test/malloc4.test cf1e856fbc8ebde562838cb47adce0ebc2d4f7d2
F test/malloc5.test 6f7b96f1bea181d789a7140fd3fabfb0e333d8f5
F test/malloc6.test 3733b9bd4e039c3239f869c40edbb88172025e2e
F test/malloc7.test dd66d8f82916becf1d29b6640e4f4855485570f8
@@ -376,7 +376,7 @@ F test/pragma2.test bb5aa7be00dae2c381fcc782358048a33c955793
F test/printf.test 69d8cb0771a1a5e4d9d5dece12fc2c16179ac5e5
F test/progress.test 5b075c3c790c7b2a61419bc199db87aaf48b8301 x
F test/ptrchng.test 1c712dd6516e1377471744fa765e41c79a357da6
-F test/quick.test 38a6643edebfbe8f80127a66a6ba60021438cd2f
+F test/quick.test 1284e8b506596ccaa25e69963e87b58dc09f5a68
F test/quote.test 215897dbe8de1a6f701265836d6601cc6ed103e6
F test/rdonly.test b34db316525440d3b42c32e83942c02c37d28ef0
F test/reindex.test 38b138abe36bf9a08c791ed44d9f76cd6b97b78b
@@ -394,7 +394,7 @@ F test/select6.test 399f14b9ba37b768afe5d2cd8c12e4f340a69db8
F test/select7.test 45606f9afbe2056058c7d75fc33e5092e65ec770
F test/server1.test e328b8e641ba8fe9273132cfef497383185dc1f5
F test/shared.test 08b30d5f1939efff0517e7ff8ec7b74ad31c151b
-F test/shared2.test 8b48f8d33494413ef4cf250110d89403e2bf6b23
+F test/shared2.test 0ee9de8964d70e451936a48c41cb161d9134ccf4
F test/shared3.test 01e3e124dbb3859788aabc7cfb82f7ea04421749
F test/shared_err.test cc528f6e78665787e93d9ce3a782a2ce5179d821
F test/soak.test 64f9b27fbcdec43335a88c546ce1983e6ba40d7b
@@ -412,7 +412,7 @@ F test/table.test dbdfd06aef054ad5aed8e57a782137d57d5c5528
F test/tableapi.test 036575a98dcce7c92e9f39056839bbad8a715412
F test/tclsqlite.test 593f3b30221e85786965d9e5670ae4f96b4e4159
F test/temptable.test c36f3e5a94507abb64f7ba23deeb4e1a8a8c3821
-F test/tester.tcl c9cd05b488392bde9e7e8044d988943a4a52f1fe
+F test/tester.tcl c50fd942fe3c8fc36c45be161fcd9b60603f033c
F test/thread1.test 776c9e459b75ba905193b351926ac4019b049f35
F test/thread2.test 6d7b30102d600f51b4055ee3a5a19228799049fb
F test/threadtest1.c 6029d9c5567db28e6dc908a0c63099c3ba6c383b
@@ -559,7 +559,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130
F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
-P db818430e9ea4ef4a4af575784009d5acae785a3
-R 5826e29b4eff86308f2e435b216e5a67
+P 205d0b881d541db65837ce6cf44d58d607635bc2
+R fd27d05e85257f20863930e99fdcd43b
U drh
-Z 50c7b8ba17910d7b90bf428d2ab32765
+Z e30b8575a2c30d279fba7b1e44399c46
diff --git a/manifest.uuid b/manifest.uuid
index 7131fcb4f..50d1ff772 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-205d0b881d541db65837ce6cf44d58d607635bc2 \ No newline at end of file
+21f6b31097692171c6493e6ca6de6acbd62dc595 \ No newline at end of file
diff --git a/src/btree.c b/src/btree.c
index f92e32cc5..bb740a74f 100644
--- a/src/btree.c
+++ b/src/btree.c
@@ -9,7 +9,7 @@
** May you share freely, never taking more than you give.
**
*************************************************************************
-** $Id: btree.c,v 1.409 2007/08/22 11:41:18 drh Exp $
+** $Id: btree.c,v 1.410 2007/08/23 02:47:53 drh Exp $
**
** This file implements a external (disk-based) database using BTrees.
** See the header comment on "btreeInt.h" for additional information.
@@ -1136,12 +1136,16 @@ int sqlite3BtreeOpen(
*/
if( (flags & BTREE_PRIVATE)==0
&& isMemdb==0
+ && (pSqlite==0 || (pSqlite->flags &SQLITE_Vtab)==0)
&& zFilename && zFilename[0]
&& sqlite3SharedCacheEnabled
){
char *zFullPathname = (char *)sqlite3_malloc(pVfs->mxPathname);
sqlite3_mutex *mutexShared;
p->sharable = 1;
+ if( pSqlite ){
+ pSqlite->flags |= SQLITE_SharedCache;
+ }
if( !zFullPathname ){
sqlite3_free(p);
return SQLITE_NOMEM;
diff --git a/src/func.c b/src/func.c
index 224f88f08..7b981df30 100644
--- a/src/func.c
+++ b/src/func.c
@@ -16,7 +16,7 @@
** sqliteRegisterBuildinFunctions() found at the bottom of the file.
** All other code has file scope.
**
-** $Id: func.c,v 1.168 2007/08/21 19:33:56 drh Exp $
+** $Id: func.c,v 1.169 2007/08/23 02:47:53 drh Exp $
*/
#include "sqliteInt.h"
#include <ctype.h>
@@ -807,14 +807,17 @@ static void replaceFunc(
if( zStr[i]!=zPattern[0] || memcmp(&zStr[i], zPattern, nPattern) ){
zOut[j++] = zStr[i];
}else{
+ u8 *zOld;
nOut += nRep - nPattern;
if( nOut>=SQLITE_MAX_LENGTH ){
sqlite3_result_error_toobig(context);
sqlite3_free(zOut);
return;
}
+ zOld = zOut;
zOut = sqlite3_realloc(zOut, (int)nOut);
if( zOut==0 ){
+ sqlite3_free(zOld);
return;
}
memcpy(&zOut[j], zRep, nRep);
diff --git a/src/loadext.c b/src/loadext.c
index a4c57c2c6..7d2340cf7 100644
--- a/src/loadext.c
+++ b/src/loadext.c
@@ -454,6 +454,7 @@ int sqlite3AutoLoadExtensions(sqlite3 *db){
"automatic extension loading failed: %s", zErrmsg);
go = 0;
rc = SQLITE_ERROR;
+ sqlite3_free(zErrmsg);
}
}
return rc;
diff --git a/src/mem2.c b/src/mem2.c
index d9653ee81..4b3c4f58f 100644
--- a/src/mem2.c
+++ b/src/mem2.c
@@ -12,7 +12,7 @@
** This file contains the C functions that implement a memory
** allocation subsystem for use by SQLite.
**
-** $Id: mem2.c,v 1.7 2007/08/22 22:04:37 drh Exp $
+** $Id: mem2.c,v 1.8 2007/08/23 02:47:53 drh Exp $
*/
/*
@@ -59,9 +59,9 @@
/*
** Each memory allocation looks like this:
**
-** ----------------------------------------------------------------
-** | backtrace pointers | MemBlockHdr | allocation | EndGuard |
-** ----------------------------------------------------------------
+** ------------------------------------------------------------------------
+** | Title | backtrace pointers | MemBlockHdr | allocation | EndGuard |
+** ------------------------------------------------------------------------
**
** The application code sees only a pointer to the allocation. We have
** to back up from the allocation pointer to find the MemBlockHdr. The
@@ -72,8 +72,9 @@
struct MemBlockHdr {
struct MemBlockHdr *pNext, *pPrev; /* Linked list of all unfreed memory */
unsigned int iSize; /* Size of this allocation */
- unsigned short nBacktrace; /* Number of backtraces on this alloc */
- unsigned short nBacktraceSlots; /* Available backtrace slots */
+ unsigned char nBacktrace; /* Number of backtraces on this alloc */
+ unsigned char nBacktraceSlots; /* Available backtrace slots */
+ unsigned short nTitle; /* Bytes of title; includes '\0' */
unsigned int iForeGuard; /* Guard word for sanity */
};
@@ -125,6 +126,12 @@ static struct {
int nBacktrace;
/*
+ ** Title text to insert in front of each block
+ */
+ int nTitle; /* Bytes of zTitle to save. Includes '\0' and padding */
+ char zTitle[100]; /* The title text */
+
+ /*
** These values are used to simulate malloc failures. When
** iFail is 1, simulate a malloc failures and reset the value
** to iReset.
@@ -252,6 +259,7 @@ static void sqlite3MemsysFailed(void){
void *sqlite3_malloc(int nByte){
struct MemBlockHdr *pHdr;
void **pBt;
+ char *z;
unsigned int *pInt;
void *p;
unsigned int totalSize;
@@ -269,7 +277,7 @@ void *sqlite3_malloc(int nByte){
}
nByte = (nByte+3)&~3;
totalSize = nByte + sizeof(*pHdr) + sizeof(unsigned int) +
- mem.nBacktrace*sizeof(void*);
+ mem.nBacktrace*sizeof(void*) + mem.nTitle;
if( mem.iFail>0 ){
if( mem.iFail==1 ){
p = 0;
@@ -290,7 +298,8 @@ void *sqlite3_malloc(int nByte){
}
}
if( p ){
- pBt = p;
+ z = p;
+ pBt = (void**)&z[mem.nTitle];
pHdr = (struct MemBlockHdr*)&pBt[mem.nBacktrace];
pHdr->pNext = 0;
pHdr->pPrev = mem.pLast;
@@ -302,6 +311,7 @@ void *sqlite3_malloc(int nByte){
mem.pLast = pHdr;
pHdr->iForeGuard = FOREGUARD;
pHdr->nBacktraceSlots = mem.nBacktrace;
+ pHdr->nTitle = mem.nTitle;
if( mem.nBacktrace ){
void *aAddr[40];
pHdr->nBacktrace = backtrace(aAddr, mem.nBacktrace+1)-1;
@@ -309,6 +319,9 @@ void *sqlite3_malloc(int nByte){
}else{
pHdr->nBacktrace = 0;
}
+ if( mem.nTitle ){
+ memcpy(z, mem.zTitle, mem.nTitle);
+ }
pHdr->iSize = nByte;
pInt = (unsigned int *)&pHdr[1];
pInt[nByte/sizeof(unsigned int)] = REARGUARD;
@@ -329,6 +342,7 @@ void *sqlite3_malloc(int nByte){
void sqlite3_free(void *pPrior){
struct MemBlockHdr *pHdr;
void **pBt;
+ char *z;
if( pPrior==0 ){
return;
}
@@ -352,9 +366,11 @@ void sqlite3_free(void *pPrior){
assert( mem.pLast==pHdr );
mem.pLast = pHdr->pPrev;
}
- memset(pBt, 0x2b, sizeof(void*)*pHdr->nBacktrace + sizeof(*pHdr) +
- pHdr->iSize + sizeof(unsigned int));
- free(pBt);
+ z = (char*)pBt;
+ z -= pHdr->nTitle;
+ memset(z, 0x2b, sizeof(void*)*pHdr->nBacktraceSlots + sizeof(*pHdr) +
+ pHdr->iSize + sizeof(unsigned int) + pHdr->nTitle);
+ free(z);
sqlite3_mutex_leave(mem.mutex);
}
@@ -403,6 +419,22 @@ void sqlite3_memdebug_backtrace(int depth){
}
/*
+** Set the title string for subsequent allocations.
+*/
+void sqlite3_memdebug_settitle(const char *zTitle){
+ int n = strlen(zTitle) + 1;
+ if( mem.mutex==0 ){
+ mem.mutex = sqlite3_mutex_alloc(SQLITE_MUTEX_STATIC_MEM);
+ }
+ sqlite3_mutex_enter(mem.mutex);
+ if( n>=sizeof(mem.zTitle) ) n = sizeof(mem.zTitle)-1;
+ memcpy(mem.zTitle, zTitle, n);
+ mem.zTitle[n] = 0;
+ mem.nTitle = (n+3)&~3;
+ sqlite3_mutex_leave(mem.mutex);
+}
+
+/*
** Open the file indicated and write a log of all unfreed memory
** allocations into that log.
*/
@@ -417,7 +449,9 @@ void sqlite3_memdebug_dump(const char *zFilename){
return;
}
for(pHdr=mem.pFirst; pHdr; pHdr=pHdr->pNext){
- fprintf(out, "**** %d bytes at %p ****\n", pHdr->iSize, &pHdr[1]);
+ char *z = (char*)pHdr;
+ z -= pHdr->nBacktraceSlots*sizeof(void*) + pHdr->nTitle;
+ fprintf(out, "**** %d bytes at %p from %s ****\n", pHdr->iSize,&pHdr[1],z);
if( pHdr->nBacktrace ){
fflush(out);
pBt = (void**)pHdr;
diff --git a/src/os_unix.c b/src/os_unix.c
index 75cf36e8d..eb7a66b64 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -2657,6 +2657,10 @@ static int unixRandomness(void *pNotUsed, int nBuf, char *zBuf){
/*
** Sleep for a little while. Return the amount of time slept.
** The argument is the number of microseconds we want to sleep.
+** The return value is the number of microseconds of sleep actually
+** requested from the underlying operating system, a number which
+** might be greater than or equal to the argument, but not less
+** than the argument.
*/
static int unixSleep(void *pNotUsed, int microseconds){
#if defined(HAVE_USLEEP) && HAVE_USLEEP
@@ -2665,7 +2669,7 @@ static int unixSleep(void *pNotUsed, int microseconds){
#else
int seconds = (microseconds+999999)/1000000;
sleep(seconds);
- return seconds;
+ return seconds*1000000;
#endif
}
diff --git a/src/sqlite.h.in b/src/sqlite.h.in
index 6465245ca..b6b56686e 100644
--- a/src/sqlite.h.in
+++ b/src/sqlite.h.in
@@ -30,7 +30,7 @@
** the version number) and changes its name to "sqlite3.h" as
** part of the build process.
**
-** @(#) $Id: sqlite.h.in,v 1.237 2007/08/22 20:18:22 drh Exp $
+** @(#) $Id: sqlite.h.in,v 1.238 2007/08/23 02:47:53 drh Exp $
*/
#ifndef _SQLITE3_H_
#define _SQLITE3_H_
@@ -1389,8 +1389,11 @@ int sqlite3_open_v2(
** (overwriting the previous values). Note that calls to [sqlite3_errcode()],
** [sqlite3_errmsg()], and [sqlite3_errmsg16()] themselves do not affect the
** results of future invocations. Calls to API routines that do not return
-** an error code (examples: [sqlite3_data_count()] or [sqlite3_mprintf()]) do
-** not change the error code returned by this routine.
+** an error code (example: [sqlite3_data_count()]) do not
+** change the error code returned by this routine. Interfaces that are
+** not associated with a specific database connection (examples:
+** [sqlite3_mprintf()] or [sqlite3_enable_shared_cache()] do not change
+** the return code.
**
** Assuming no other intervening sqlite3_* API calls are made, the error
** code returned by this function is associated with the same error as
@@ -1708,6 +1711,10 @@ int sqlite3_column_count(sqlite3_stmt *pStmt);
** [sqlite3_stmt | prepared statement] is destroyed by [sqlite3_finalize()]
** or until the next call sqlite3_column_name() or sqlite3_column_name16()
** on the same column.
+**
+** If sqlite3_malloc() fails during the processing of either routine
+** (for example during a conversion from UTF-8 to UTF-16) then a
+** NULL pointer is returned.
*/
const char *sqlite3_column_name(sqlite3_stmt*, int N);
const void *sqlite3_column_name16(sqlite3_stmt*, int N);
@@ -2040,6 +2047,12 @@ int sqlite3_data_count(sqlite3_stmt *pStmt);
** and blobs is freed automatically. Do <b>not</b> pass the pointers returned
** [sqlite3_column_blob()], [sqlite_column_text()], etc. into
** [sqlite3_free()].
+**
+** If a memory allocation error occurs during the evaluation of any
+** of these routines, a default value is returned. The default value
+** is either the integer 0, the floating point number 0.0, or a NULL
+** pointer. Subsequent calls to [sqlite3_errcode()] will return
+** [SQLITE_NOMEM].
*/
const void *sqlite3_column_blob(sqlite3_stmt*, int iCol);
int sqlite3_column_bytes(sqlite3_stmt*, int iCol);
diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index 4b6e01dec..29da21f5a 100644
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -11,7 +11,7 @@
*************************************************************************
** Internal interface definitions for SQLite.
**
-** @(#) $Id: sqliteInt.h,v 1.597 2007/08/22 11:41:18 drh Exp $
+** @(#) $Id: sqliteInt.h,v 1.598 2007/08/23 02:47:53 drh Exp $
*/
#ifndef _SQLITEINT_H_
#define _SQLITEINT_H_
@@ -493,6 +493,8 @@ struct sqlite3 {
#define SQLITE_LoadExtension 0x00020000 /* Enable load_extension */
#define SQLITE_RecoveryMode 0x00040000 /* Ignore schema errors */
+#define SQLITE_SharedCache 0x00080000 /* Cache sharing is enabled */
+#define SQLITE_Vtab 0x00100000 /* There exists a virtual table */
/*
** Possible values for the sqlite.magic field.
diff --git a/src/test1.c b/src/test1.c
index 11ffb1e23..198744c2b 100644
--- a/src/test1.c
+++ b/src/test1.c
@@ -13,7 +13,7 @@
** is not included in the SQLite library. It is used for automated
** testing of the SQLite library.
**
-** $Id: test1.c,v 1.270 2007/08/22 20:18:22 drh Exp $
+** $Id: test1.c,v 1.271 2007/08/23 02:47:53 drh Exp $
*/
#include "sqliteInt.h"
#include "tcl.h"
@@ -186,18 +186,6 @@ static int getStmtPointer(
}
/*
-** Decode a pointer to an sqlite3_stmt object.
-*/
-static int getFilePointer(
- Tcl_Interp *interp,
- const char *zArg,
- sqlite3_file **ppFile
-){
- *ppFile = (sqlite3_file*)sqlite3TextToPtr(zArg);
- return TCL_OK;
-}
-
-/*
** Generate a text representation of a pointer that can be understood
** by the getDbPointer and getVmPointer routines above.
**
diff --git a/src/test6.c b/src/test6.c
index 0abf2353a..93befb881 100644
--- a/src/test6.c
+++ b/src/test6.c
@@ -320,8 +320,6 @@ static int cfRead(
sqlite_int64 iOfst
){
CrashFile *pCrash = (CrashFile *)pFile;
- sqlite3_int64 iSize;
- WriteBuffer *pWrite;
/* Check the file-size to see if this is a short-read */
if( pCrash->iSize<(iOfst+iAmt) ){
@@ -346,9 +344,9 @@ static int cfWrite(
pCrash->iSize = iAmt+iOfst;
}
while( pCrash->iSize>pCrash->nData ){
- char *zNew;
+ u8 *zNew;
int nNew = (pCrash->nData*2) + 4096;
- zNew = (char *)sqlite3_realloc(pCrash->zData, nNew);
+ zNew = sqlite3_realloc(pCrash->zData, nNew);
if( !zNew ){
return SQLITE_NOMEM;
}
@@ -480,7 +478,7 @@ static int cfOpen(
sqlite3_vfs *pVfs = (sqlite3_vfs *)pAppData;
int rc;
CrashFile *pWrapper = (CrashFile *)pFile;
- sqlite3_file *pReal = &pWrapper[1];
+ sqlite3_file *pReal = (sqlite3_file*)&pWrapper[1];
memset(pWrapper, 0, sizeof(CrashFile));
rc = sqlite3OsOpen(pVfs, zName, pReal, flags, pOutFlags);
@@ -495,7 +493,7 @@ static int cfOpen(
}
if( rc==SQLITE_OK ){
pWrapper->nData = (4096 + pWrapper->iSize);
- pWrapper->zData = (char *)sqlite3_malloc(pWrapper->nData);
+ pWrapper->zData = sqlite3_malloc(pWrapper->nData);
if( pWrapper->zData ){
memset(pWrapper->zData, 0, pWrapper->nData);
rc = sqlite3OsRead(pReal, pWrapper->zData, pWrapper->iSize, 0);
@@ -570,7 +568,6 @@ static int crashParamsObjCmd(
int iDelay;
const char *zCrashFile;
int nCrashFile;
- static struct crashAppData appData;
static sqlite3_vfs crashVfs = {
1, /* iVersion */
diff --git a/src/test8.c b/src/test8.c
index 28a49a75f..8e7d50d54 100644
--- a/src/test8.c
+++ b/src/test8.c
@@ -13,7 +13,7 @@
** is not included in the SQLite library. It is used for automated
** testing of the SQLite library.
**
-** $Id: test8.c,v 1.52 2007/08/21 10:44:16 drh Exp $
+** $Id: test8.c,v 1.53 2007/08/23 02:47:53 drh Exp $
*/
#include "sqliteInt.h"
#include "tcl.h"
@@ -852,7 +852,7 @@ int echoUpdate(
"%s %Q=?%d", zSep, pVtab->aCol[i-2], i), 1);
zSep = ",";
}
- string_concat(&z, sqlite3_mprintf(" WHERE rowid=?%d", nData), 0);
+ string_concat(&z, sqlite3_mprintf(" WHERE rowid=?%d", nData), 1);
}
/* If apData[0] is an integer and nData==1 then do a DELETE */
diff --git a/src/test_malloc.c b/src/test_malloc.c
index 478c6c5f8..395288229 100644
--- a/src/test_malloc.c
+++ b/src/test_malloc.c
@@ -13,7 +13,7 @@
** This file contains code used to implement test interfaces to the
** memory allocation subsystem.
**
-** $Id: test_malloc.c,v 1.3 2007/08/22 22:04:37 drh Exp $
+** $Id: test_malloc.c,v 1.4 2007/08/23 02:47:53 drh Exp $
*/
#include "sqliteInt.h"
#include "tcl.h"
@@ -27,7 +27,16 @@
static void pointerToText(void *p, char *z){
static const char zHex[] = "0123456789abcdef";
int i, k;
- sqlite3_uint64 n = (sqlite3_uint64)p;
+ unsigned int u;
+ sqlite3_uint64 n;
+ if( sizeof(n)==sizeof(p) ){
+ memcpy(&n, &p, sizeof(p));
+ }else if( sizeof(u)==sizeof(p) ){
+ memcpy(&u, &p, sizeof(u));
+ n = u;
+ }else{
+ assert( 0 );
+ }
for(i=0, k=sizeof(p)*2-1; i<sizeof(p)*2; i++, k--){
z[k] = zHex[n&0xf];
n >>= 4;
@@ -46,6 +55,7 @@ static int hexToInt(int h){
static int textToPointer(const char *z, void **pp){
sqlite3_uint64 n = 0;
int i;
+ unsigned int u;
for(i=0; i<sizeof(void*)*2 && z[0]; i++){
int v;
v = hexToInt(*z++);
@@ -53,7 +63,14 @@ static int textToPointer(const char *z, void **pp){
n = n*16 + v;
}
if( *z!=0 ) return TCL_ERROR;
- *pp = (void*)n;
+ if( sizeof(n)==sizeof(*pp) ){
+ memcpy(pp, &n, sizeof(n));
+ }else if( sizeof(u)==sizeof(*pp) ){
+ u = (unsigned int)n;
+ memcpy(pp, &u, sizeof(u));
+ }else{
+ assert( 0 );
+ }
return TCL_OK;
}
@@ -290,6 +307,38 @@ static int test_memdebug_pending(
/*
+** Usage: sqlite3_memdebug_settitle TITLE
+**
+** Set a title string stored with each allocation. The TITLE is
+** typically the name of the test that was running when the
+** allocation occurred. The TITLE is stored with the allocation
+** and can be used to figure out which tests are leaking memory.
+**
+** Each title overwrite the previous.
+*/
+static int test_memdebug_settitle(
+ void * clientData,
+ Tcl_Interp *interp,
+ int objc,
+ Tcl_Obj *CONST objv[]
+){
+ const char *zTitle;
+ if( objc!=2 ){
+ Tcl_WrongNumArgs(interp, 1, objv, "TITLE");
+ return TCL_ERROR;
+ }
+ zTitle = Tcl_GetString(objv[1]);
+#ifdef SQLITE_MEMDEBUG
+ {
+ extern int sqlite3_memdebug_settitle(const char*);
+ sqlite3_memdebug_settitle(zTitle);
+ }
+#endif
+ return TCL_OK;
+}
+
+
+/*
** Register commands with the TCL interpreter.
*/
int Sqlitetest_malloc_Init(Tcl_Interp *interp){
@@ -306,6 +355,7 @@ int Sqlitetest_malloc_Init(Tcl_Interp *interp){
{ "sqlite3_memdebug_dump", test_memdebug_dump },
{ "sqlite3_memdebug_fail", test_memdebug_fail },
{ "sqlite3_memdebug_pending", test_memdebug_pending },
+ { "sqlite3_memdebug_settitle", test_memdebug_settitle },
};
int i;
for(i=0; i<sizeof(aObjCmd)/sizeof(aObjCmd[0]); i++){
diff --git a/src/vdbeaux.c b/src/vdbeaux.c
index 85edcba11..ff93ac529 100644
--- a/src/vdbeaux.c
+++ b/src/vdbeaux.c
@@ -1007,6 +1007,8 @@ static void Cleanup(Vdbe *p){
void sqlite3VdbeSetNumCols(Vdbe *p, int nResColumn){
Mem *pColName;
int n;
+ sqlite3 *db = p->db;
+
releaseMemArray(p->aColName, p->nResColumn*COLNAME_N);
sqlite3_free(p->aColName);
n = nResColumn*COLNAME_N;
@@ -1014,7 +1016,9 @@ void sqlite3VdbeSetNumCols(Vdbe *p, int nResColumn){
p->aColName = pColName = (Mem*)sqlite3DbMallocZero(p->db, sizeof(Mem)*n );
if( p->aColName==0 ) return;
while( n-- > 0 ){
- (pColName++)->flags = MEM_Null;
+ pColName->flags = MEM_Null;
+ pColName->db = db;
+ pColName++;
}
}
diff --git a/src/vtab.c b/src/vtab.c
index ac54516fd..09793aef7 100644
--- a/src/vtab.c
+++ b/src/vtab.c
@@ -11,7 +11,7 @@
*************************************************************************
** This file contains code used to help implement virtual tables.
**
-** $Id: vtab.c,v 1.52 2007/08/22 02:56:44 drh Exp $
+** $Id: vtab.c,v 1.53 2007/08/23 02:47:53 drh Exp $
*/
#ifndef SQLITE_OMIT_VIRTUALTABLE
#include "sqliteInt.h"
@@ -167,12 +167,10 @@ void sqlite3VtabBeginParse(
Table *pTable; /* The new virtual table */
sqlite3 *db; /* Database connection */
-#if 0 /* FIX ME */
- if( sqlite3ThreadDataReadOnly()->useSharedData ){
+ if( pParse->db->flags & SQLITE_SharedCache ){
sqlite3ErrorMsg(pParse, "Cannot use virtual tables in shared-cache mode");
return;
}
-#endif
sqlite3StartTable(pParse, pName1, pName2, 0, 0, 1, 0);
pTable = pParse->pNewTable;
diff --git a/test/all.test b/test/all.test
index ea8625061..96289a9e7 100644
--- a/test/all.test
+++ b/test/all.test
@@ -10,13 +10,13 @@
#***********************************************************************
# This file runs all tests.
#
-# $Id: all.test,v 1.45 2007/08/16 13:01:45 drh Exp $
+# $Id: all.test,v 1.46 2007/08/23 02:47:53 drh Exp $
set testdir [file dirname $argv0]
source $testdir/tester.tcl
rename finish_test really_finish_test
proc finish_test {} {
- memleak_check
+ # no-op
}
if {[file exists ./sqlite_test_count]} {
diff --git a/test/malloc4.test b/test/malloc4.test
index 1ce95b924..1d8ad0eb6 100644
--- a/test/malloc4.test
+++ b/test/malloc4.test
@@ -12,7 +12,7 @@
# This file contains tests to ensure that the library handles malloc() failures
# correctly. The emphasis in this file is on sqlite3_column_XXX() APIs.
#
-# $Id: malloc4.test,v 1.4 2007/08/22 22:04:37 drh Exp $
+# $Id: malloc4.test,v 1.5 2007/08/23 02:47:53 drh Exp $
#---------------------------------------------------------------------------
# NOTES ON EXPECTED BEHAVIOUR
@@ -69,26 +69,28 @@ proc do_stmt_test {id sql} {
# about explicitly testing them.
#
do_test ${testid}.2.1 {
- set mf1 [expr [sqlite3_memdebug_pending] <= 0]
+ set mf1 [expr [sqlite3_memdebug_pending] < 0]
set ::name8 [sqlite3_column_name $::STMT 0]
- set mf2 [expr [sqlite3_memdebug_pending] <= 0]
+ set mf2 [expr [sqlite3_memdebug_pending] < 0]
expr {$mf1 == $mf2 || $::name8 == ""}
} {1}
do_test ${testid}.2.2 {
- set mf1 [expr [sqlite3_memdebug_pending] <= 0]
+ set mf1 [expr [sqlite3_memdebug_pending] < 0]
+btree_breakpoint
set ::name16 [sqlite3_column_name16 $::STMT 0]
set ::name16 [encoding convertfrom unicode $::name16]
set ::name16 [string range $::name16 0 end-1]
- set mf2 [expr [sqlite3_memdebug_pending] <= 0]
+ set mf2 [expr [sqlite3_memdebug_pending] < 0]
+puts [list $mf1 $mf2 $::name16]
expr {$mf1 == $mf2 || $::name16 == ""}
} {1}
do_test ${testid}.2.3 {
- set mf1 [expr [sqlite3_memdebug_pending] <= 0]
+ set mf1 [expr [sqlite3_memdebug_pending] < 0]
set ::name8_2 [sqlite3_column_name $::STMT 0]
- set mf2 [expr [sqlite3_memdebug_pending] <= 0]
+ set mf2 [expr [sqlite3_memdebug_pending] < 0]
expr {$mf1 == $mf2 || $::name8_2 == ""}
} {1}
- set ::mallocFailed [expr [sqlite3_memdebug_pending] <= 0]
+ set ::mallocFailed [expr [sqlite3_memdebug_pending] < 0]
do_test ${testid}.2.4 {
expr {
$::name8 == $::name8_2 && $::name16 == $::name8 && !$::mallocFailed ||
@@ -113,19 +115,19 @@ proc do_stmt_test {id sql} {
#
do_test ${testid}.4.1 {
set ::text8 [sqlite3_column_text $::STMT 0]
- set mf [expr [sqlite3_memdebug_pending] <= 0 && !$::mallocFailed]
+ set mf [expr [sqlite3_memdebug_pending] < 0 && !$::mallocFailed]
expr {$mf==0 || $::text8 == ""}
} {1}
do_test ${testid}.4.2 {
set ::text16 [sqlite3_column_text16 $::STMT 0]
set ::text16 [encoding convertfrom unicode $::text16]
set ::text16 [string range $::text16 0 end-1]
- set mf [expr [sqlite3_memdebug_pending] <= 0 && !$::mallocFailed]
+ set mf [expr [sqlite3_memdebug_pending] < 0 && !$::mallocFailed]
expr {$mf==0 || $::text16 == ""}
} {1}
do_test ${testid}.4.3 {
set ::text8_2 [sqlite3_column_text $::STMT 0]
- set mf [expr [sqlite3_memdebug_pending] <= 0 && !$::mallocFailed]
+ set mf [expr [sqlite3_memdebug_pending] < 0 && !$::mallocFailed]
expr {$mf==0 || $::text8_2 == "" || ($::text16 == "" && $::text8 != "")}
} {1}
@@ -156,7 +158,7 @@ proc do_stmt_test {id sql} {
} {0.0}
set mallocFailedAfterStep [expr \
- [sqlite3_memdebug_pending] <= 0 && !$::mallocFailed
+ [sqlite3_memdebug_pending] < 0 && !$::mallocFailed
]
sqlite3_memdebug_fail -1
diff --git a/test/quick.test b/test/quick.test
index ffaeee09f..0ea4daea9 100644
--- a/test/quick.test
+++ b/test/quick.test
@@ -6,7 +6,7 @@
#***********************************************************************
# This file runs all tests.
#
-# $Id: quick.test,v 1.60 2007/08/16 13:01:45 drh Exp $
+# $Id: quick.test,v 1.61 2007/08/23 02:47:54 drh Exp $
proc lshift {lvar} {
upvar $lvar l
@@ -55,6 +55,7 @@ set EXCLUDE {
malloc.test
malloc2.test
malloc3.test
+ malloc4.test
memleak.test
misc7.test
misuse.test
diff --git a/test/shared2.test b/test/shared2.test
index 9af30de4f..5f18f8b72 100644
--- a/test/shared2.test
+++ b/test/shared2.test
@@ -9,7 +9,7 @@
#
#***********************************************************************
#
-# $Id: shared2.test,v 1.4 2006/01/26 13:11:37 danielk1977 Exp $
+# $Id: shared2.test,v 1.5 2007/08/23 02:47:54 drh Exp $
set testdir [file dirname $argv0]
source $testdir/tester.tcl
@@ -124,9 +124,8 @@ db1 close
db2 close
do_test shared2-3.2 {
- sqlite3_thread_cleanup
sqlite3_enable_shared_cache 1
-} {0}
+} {1}
sqlite3_enable_shared_cache $::enable_shared_cache
finish_test
diff --git a/test/tester.tcl b/test/tester.tcl
index 55c2a1c41..c99ecc5b0 100644
--- a/test/tester.tcl
+++ b/test/tester.tcl
@@ -11,7 +11,7 @@
# This file implements some common TCL routines used for regression
# testing the SQLite library
#
-# $Id: tester.tcl,v 1.86 2007/08/22 22:04:37 drh Exp $
+# $Id: tester.tcl,v 1.87 2007/08/23 02:47:54 drh Exp $
# Make sure tclsqlite3 was compiled correctly. Abort now with an
# error message if not.
@@ -63,6 +63,21 @@ if {![info exists soft_limit]} {
}
sqlite3_soft_heap_limit $soft_limit
+#
+# Check the command-line arguments to set the memory debugger
+# backtrace depth.
+#
+# See the sqlite3_memdebug_backtrace() function in mem2.c or
+# test_malloc.c for additional information.
+#
+for {set i 0} {$i<[llength $argv]} {incr i} {
+ if {[regexp {^--backtrace=(\d+)$} [lindex $argv $i] all value]} {
+ sqlite3_memdebug_backtrace $value
+ set argv [lreplace $argv $i $i]
+ }
+}
+
+
# Use the pager codec if it is available
#
if {[sqlite3 -has-codec] && [info command sqlite_orig]==""} {
@@ -106,7 +121,7 @@ if {![info exists speedTest]} {
#
proc do_test {name cmd expected} {
global argv nErr nTest skip_test maxErr
- set ::sqlite_malloc_id $name
+ sqlite3_memdebug_settitle $name
if {$skip_test} {
set skip_test 0
return
@@ -165,20 +180,6 @@ proc speed_trial_summary {name} {
puts [format {%-21.21s %12d uS TOTAL} $name $total_time]
}
-# The procedure uses the special "sqlite_malloc_stat" command
-# (which is only available if SQLite is compiled with -DSQLITE_DEBUG=1)
-# to see how many malloc()s have not been free()ed. The number
-# of surplus malloc()s is stored in the global variable $::Leak.
-# If the value in $::Leak grows, it may mean there is a memory leak
-# in the library.
-#
-proc memleak_check {} {
- if {[info command sqlite_malloc_stat]!=""} {
- set r [sqlite_malloc_stat]
- set ::Leak [expr {[lindex $r 0]-[lindex $r 1]}]
- }
-}
-
# Run this routine last
#
proc finish_test {} {
@@ -186,7 +187,6 @@ proc finish_test {} {
}
proc finalize_testing {} {
global nTest nErr sqlite_open_file_count
- if {$nErr==0} memleak_check
catch {db close}
catch {db2 close}
@@ -223,6 +223,10 @@ proc finalize_testing {} {
if {[sqlite3_memory_used]>0} {
puts "Unfreed memory: [sqlite3_memory_used] bytes"
incr nErr
+ ifcapable memdebug {
+ puts "Writing unfreed memory log to \"./memleak.txt\""
+ sqlite3_memdebug_dump ./memleak.txt
+ }
} else {
puts "All memory allocations freed - no leaks"
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-19 04:09:56 +0000