diff options
| -rw-r--r-- | manifest | 18 | ||||
| -rw-r--r-- | manifest.uuid | 2 | ||||
| -rw-r--r-- | src/mem2.c | 11 | ||||
| -rw-r--r-- | src/test_malloc.c | 45 | ||||
| -rw-r--r-- | test/tester.tcl | 8 |
5 files changed, 57 insertions, 27 deletions
@@ -1,5 +1,5 @@ -C Allow\sthe\sxAccess\smethod\sin\sthe\sVFS\sto\sreturn\s-1\sto\ssignal\san\sI/O\nerror,\sand\sin\sparticular\san\sSQLITE_IOERR_NOMEM.\s(CVS\s4925) -D 2008-03-27T22:42:52 +C If\smemory\sis\sleaked\swhen\srunning\sa\stest\sscript\swith\sthe\s--malloctrace\soption,\swrite\sout\sa\sfile\scalled\sleaks.sql\sin\sthe\ssame\sformat\sas\smallocs.sql\scontaining\sth\se\sleaked\sapplications.\sThe\ssame\stools\scan\sthen\sbe\sused\sto\sexamine\sthe\sstack\straces\sassociated\swith\sleaked\sallocations.\s(CVS\s4926) +D 2008-03-28T07:42:54 F Makefile.arm-wince-mingw32ce-gcc ac5f7b2cef0cd850d6f755ba6ee4ab961b1fadf7 F Makefile.in cf434ce8ca902e69126ae0f94fc9f7dc7428a5fa F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654 @@ -108,7 +108,7 @@ F src/main.c 7d22155e35094bc5d368202c3db8a3fc429548af F src/malloc.c 12c1ae98ef1eff34b13c9eb526e0b7b479e1e820 F src/md5.c c5fdfa5c2593eaee2e32a5ce6c6927c986eaf217 F src/mem1.c fc716ff521b6dd3e43eaa211967383308800e70a -F src/mem2.c a4694eff7397de20a7e4b3d70c3faeaf63bf4647 +F src/mem2.c 37c410e289cc81e0ca3d76ba803f11973a02638a F src/mem3.c 52547678a2ae50c203d54be1a5bf51eb02438a3f F src/mem4.c 45c328ec6dcb7e8d319cb383615b5fe547ca5409 F src/mem5.c 11d98b76f77873aab86b543cbd1a8ddc4e680d58 @@ -161,7 +161,7 @@ F src/test_devsym.c cee1aecaa90c895030399ca4ae38f84a08038f8a F src/test_func.c 9e9b33ff083b65da91c389cece903bc32de06f01 F src/test_hexio.c 1a1cd8324d57585ea86b922f609fa1fbaaf9662d F src/test_loadext.c 22065d601a18878e5542191001f0eaa5d77c0ed8 -F src/test_malloc.c eedcc63c9f3111f2ebf6137b117e5644b3bb4c5d +F src/test_malloc.c dd79eafc4966d4637acbd9a28b82d2a38eae8aa8 F src/test_md5.c bca40b727c57462ddb415e57c5323445a1bb1a40 F src/test_onefile.c 2fea6d22f13f5f286356c80c77ffd41f995f2b7a F src/test_schema.c 12c9de7661d6294eec2d57afbb52e2af1128084f @@ -453,7 +453,7 @@ F test/table.test 13b1c2e2fb4727b35ee1fb7641fc469214fd2455 F test/tableapi.test 791f7e3891d9b70bdb43b311694bf5e9befcbc34 F test/tclsqlite.test 3fac87cb1059c46b8fa8a60b553f4f1adb0fb6d9 F test/temptable.test 19b851b9e3e64d91e9867619b2a3f5fffee6e125 -F test/tester.tcl e7cc5f340ebd9107773e8684f5d7e10af6e63e0b +F test/tester.tcl d967b34306776a7488c3cbaf22cc4410c144ccce F test/thread001.test 8fbd9559da0bbdc273e00318c7fd66c162020af7 F test/thread002.test 2c4ad2c386f60f6fe268cd91c769ee35b3c1fd0b F test/thread1.test 776c9e459b75ba905193b351926ac4019b049f35 @@ -619,7 +619,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5 -P 1a58a87023f7780aee813ac64dda1a80021002a7 -R 0cea7f2cddb629adbd6991774cd393e4 -U drh -Z 7ef7bd639117d54202866f59dc190953 +P 3cb704c4c439425781644b1b653b7e50f02fd91e +R d37bb7bf406d962e1027710a2ee372e9 +U danielk1977 +Z ad981f759d6865750c0365a2e743adfb diff --git a/manifest.uuid b/manifest.uuid index 9b4fcff5f..0c9cd9206 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -3cb704c4c439425781644b1b653b7e50f02fd91e
\ No newline at end of file +f1b97ed93183378ff56b4fe7ae8ea269c24092fc
\ No newline at end of file diff --git a/src/mem2.c b/src/mem2.c index 56da91462..bacc713f2 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.23 2008/03/21 14:22:44 danielk1977 Exp $ +** $Id: mem2.c,v 1.24 2008/03/28 07:42:54 danielk1977 Exp $ */ #include "sqliteInt.h" @@ -410,6 +410,15 @@ void sqlite3MemdebugSettitle(const char *zTitle){ sqlite3_mutex_leave(mem.mutex); } +void sqlite3MemdebugSync(){ + struct MemBlockHdr *pHdr; + for(pHdr=mem.pFirst; pHdr; pHdr=pHdr->pNext){ + void **pBt = (void**)pHdr; + pBt -= pHdr->nBacktraceSlots; + mem.xBacktrace(pHdr->iSize, pHdr->nBacktrace-1, &pBt[1]); + } +} + /* ** Open the file indicated and write a log of all unfreed memory ** allocations into that log. diff --git a/src/test_malloc.c b/src/test_malloc.c index 3595a0651..09b87fcaa 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.19 2008/03/25 09:47:35 danielk1977 Exp $ +** $Id: test_malloc.c,v 1.20 2008/03/28 07:42:54 danielk1977 Exp $ */ #include "sqliteInt.h" #include "tcl.h" @@ -546,6 +546,21 @@ static void test_memdebug_callback(int nByte, int nFrame, void **aFrame){ } } +static int test_memdebug_log_clear(){ + Tcl_HashSearch search; + Tcl_HashEntry *pEntry; + for( + pEntry=Tcl_FirstHashEntry(&aMallocLog, &search); + pEntry; + pEntry=Tcl_NextHashEntry(&search) + ){ + MallocLog *pLog = (MallocLog *)Tcl_GetHashValue(pEntry); + Tcl_Free((char *)pLog); + } + Tcl_DeleteHashTable(&aMallocLog); + Tcl_InitHashTable(&aMallocLog, MALLOC_LOG_FRAMES); +} + static int test_memdebug_log( void * clientData, Tcl_Interp *interp, @@ -555,8 +570,10 @@ static int test_memdebug_log( static int isInit = 0; int iSub; - enum MB_enum { MB_LOG_START, MB_LOG_STOP, MB_LOG_DUMP, MB_LOG_CLEAR }; - static const char *MB_strs[] = { "start", "stop", "dump", "clear" }; + static const char *MB_strs[] = { "start", "stop", "dump", "clear", "sync" }; + enum MB_enum { + MB_LOG_START, MB_LOG_STOP, MB_LOG_DUMP, MB_LOG_CLEAR, MB_LOG_SYNC + }; if( !isInit ){ #ifdef SQLITE_MEMDEBUG @@ -614,18 +631,16 @@ static int test_memdebug_log( break; } case MB_LOG_CLEAR: { - Tcl_HashSearch search; - Tcl_HashEntry *pEntry; - for( - pEntry=Tcl_FirstHashEntry(&aMallocLog, &search); - pEntry; - pEntry=Tcl_NextHashEntry(&search) - ){ - MallocLog *pLog = (MallocLog *)Tcl_GetHashValue(pEntry); - Tcl_Free((char *)pLog); - } - Tcl_DeleteHashTable(&aMallocLog); - Tcl_InitHashTable(&aMallocLog, MALLOC_LOG_FRAMES); + test_memdebug_log_clear(); + break; + } + + case MB_LOG_SYNC: { + extern void sqlite3MemdebugSync(); + test_memdebug_log_clear(); + mallocLogEnabled = 1; + sqlite3MemdebugSync(); + break; } } diff --git a/test/tester.tcl b/test/tester.tcl index f15f0cb28..09b86b00f 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.110 2008/03/22 01:08:01 drh Exp $ +# $Id: tester.tcl,v 1.111 2008/03/28 07:42:54 danielk1977 Exp $ set tcl_precision 15 @@ -260,6 +260,12 @@ proc finalize_testing {} { memdebug_log_sql sqlite3_memdebug_log stop sqlite3_memdebug_log clear + + if {[sqlite3_memory_used]>0} { + puts "Writing leaks.sql..." + sqlite3_memdebug_log sync + memdebug_log_sql leaks.sql + } } foreach f [glob -nocomplain test.db-*-journal] { file delete -force $f |