From 63da089314cf0439d6467685d0c3d51c6205ad01 Mon Sep 17 00:00:00 2001 From: drh Date: Wed, 10 Mar 2010 21:42:07 +0000 Subject: [PATCH] Add the SQLITE_DBSTATUS_CACHE_SIZE verb for sqlite3_db_status(). The highwater mark does not yet work on this verb. FossilOrigin-Name: 418c6d8113bc337556b0d47acfd6a7d865d1121f --- manifest | 27 ++++++++++++++------------- manifest.uuid | 2 +- src/pager.c | 10 ++++++++++ src/pager.h | 1 + src/sqlite.h.in | 16 +++++++++++++--- src/status.c | 20 ++++++++++++++++++++ src/test_malloc.c | 1 + test/dbstatus.test | 45 +++++++++++++++++++++++++++++++++++++++++++++ 8 files changed, 105 insertions(+), 17 deletions(-) create mode 100644 test/dbstatus.test diff --git a/manifest b/manifest index a2592cfe5b..acb0e389d1 100644 --- a/manifest +++ b/manifest @@ -1,8 +1,8 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -C Remove\sthe\s"experimental"\smarkings\son\smost\sinterfaces\sthat\shave\sbeen\saround\nfor\smultiple\sreleases. -D 2010-03-10T20:06:38 +C Add\sthe\sSQLITE_DBSTATUS_CACHE_SIZE\sverb\sfor\ssqlite3_db_status().\s\sThe\s\nhighwater\smark\sdoes\snot\syet\swork\son\sthis\sverb. +D 2010-03-10T21:42:07 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0 F Makefile.in 4f2f967b7e58a35bb74fb7ec8ae90e0f4ca7868b F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654 @@ -155,8 +155,8 @@ F src/os_common.h 240c88b163b02c21a9f21f87d49678a0aa21ff30 F src/os_os2.c 75a8c7b9a00a2cf1a65f9fa4afbc27d46634bb2f F src/os_unix.c 148d2f625db3727250c0b880481ae7630b6d0eb0 F src/os_win.c 1c7453c2df4dab26d90ff6f91272aea18bcf7053 -F src/pager.c 80688c6fee918b7d9aa1c4911a0094d0ebbde31e -F src/pager.h 1b32faf2e578ac3e7bcf9c9d11217128261c5c54 +F src/pager.c 59af09650f2ed505c818319af6d9c8a2d831fc67 +F src/pager.h ef8a2cf10084f60ab45ee2dfded8bf8b0c655ddf F src/parse.y ace5c7a125d9f2a410e431ee3209034105045f7e F src/pcache.c 4956b41d6ba913f7a8a56fbf32be78caed0e45c2 F src/pcache.h c683390d50f856d4cd8e24342ae62027d1bb6050 @@ -169,11 +169,11 @@ F src/resolve.c a1648d98e869937b29f4f697461fe4d60f220a7b F src/rowset.c 69afa95a97c524ba6faf3805e717b5b7ae85a697 F src/select.c 4113ef360430ed4e7533690ef46d06c20204adce F src/shell.c c40427c7245535a04a9cb4a417b6cc05c022e6a4 -F src/sqlite.h.in bd3c4c7e37dbf3e2211b2fb39dcced56ce6368d5 +F src/sqlite.h.in 30ff19c3a52f14cb0bd7c598f674068bccc22ccc F src/sqlite3ext.h 69dfb8116af51b84a029cddb3b35062354270c89 F src/sqliteInt.h 4e411c08ff8d776272948abb861be32e4786eff8 F src/sqliteLimit.h 3afab2291762b5d09ae20c18feb8e9fa935a60a6 -F src/status.c d329385a2cba3ea49d9d68af0ad84b22d46b4f40 +F src/status.c 4df6fe7dce2d256130b905847c6c60055882bdbe F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e F src/tclsqlite.c bad6570a005b234ea670b9f7b48256da19a032d3 F src/test1.c aa9b1e10e834330e7759afb639420117e2422ded @@ -198,7 +198,7 @@ F src/test_intarray.c d879bbf8e4ce085ab966d1f3c896a7c8b4f5fc99 F src/test_intarray.h 489edb9068bb926583445cb02589344961054207 F src/test_journal.c adc0ce3840ed19b49feb1d583b2212f560ef7866 F src/test_loadext.c df586c27176e3c2cb2e099c78da67bf14379a56e -F src/test_malloc.c f777d15df756bea0e98271932464ac5d882e66fe +F src/test_malloc.c 2842c922b8e8d992aba722214952204ca025b411 F src/test_mutex.c ce06b59aca168cd8c520b77159a24352a7469bd3 F src/test_onefile.c 06da7e085dce42924cf062b91763dd4bb84c6101 F src/test_osinst.c 90fb03d396f39956897dfb4bd0e62c6711db1cca @@ -323,6 +323,7 @@ F test/createtab.test 199cf68f44e5d9e87a0b8afc7130fdeb4def3272 F test/cse.test 277350a26264495e86b1785f34d2d0c8600e021c F test/ctime.test f5040beef89c1b2bdb6a9edb7358a519213ff80c F test/date.test 0b8473ed9ab6fd4283b4a01f035e1067762ba734 +F test/dbstatus.test 838447a0ecca1232675b025c0a518a9ef0f8057e F test/default.test 6faf23ccb300114924353007795aa9a8ec0aa9dc F test/delete.test f7629d9eb245dfca170169cc5c7a735dec34aeb4 F test/delete2.test 3a03f2cca1f9a67ec469915cb8babd6485db43fa @@ -795,14 +796,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f -P 1716821ddb992fd6d1330604d4f59586bf056b00 -R 1c62bc3d27caa0c0c877fc9afaab358c +P d670e8bd51c794e2d7ea365ca553c2b74cf5a3a3 +R 326703426b5762cb1b1b4e921668b426 U drh -Z 3479e693a88536f0897ca173834b4269 +Z d9e46a05490936dfb28aef36eac5829e -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) -iD8DBQFLl/vQoxKgR168RlERAu3mAJ0YzH48UWDzkPn5cc+b92m8ryXo9gCggwzg -2rtlJuxqZVOCftl2Ed46piU= -=OcjI +iD8DBQFLmBIyoxKgR168RlERAs2fAJ9UH6kL0H4mcl0Kk+NEMSARDnhf5wCghHZo +zkVH6ZsaevJkndO4chI7aCA= +=W5iC -----END PGP SIGNATURE----- diff --git a/manifest.uuid b/manifest.uuid index 78ef748d20..f37fe009d9 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -d670e8bd51c794e2d7ea365ca553c2b74cf5a3a3 \ No newline at end of file +418c6d8113bc337556b0d47acfd6a7d865d1121f \ No newline at end of file diff --git a/src/pager.c b/src/pager.c index 9844dafcd6..ba72d0690d 100644 --- a/src/pager.c +++ b/src/pager.c @@ -4854,6 +4854,16 @@ int sqlite3PagerRefcount(Pager *pPager){ return sqlite3PcacheRefCount(pPager->pPCache); } +/* +** Return the approximate number of bytes of memory currently +** used by the pager and its associated cache. +*/ +int sqlite3PagerMemUsed(Pager *pPager){ + int perPageSize = pPager->pageSize + pPager->nExtra + 20; + return perPageSize*sqlite3PcachePagecount(pPager->pPCache) + + sqlite3MallocSize(pPager); +} + /* ** Return the number of references to the specified page. */ diff --git a/src/pager.h b/src/pager.h index 0fe1917be3..7d778c82cd 100644 --- a/src/pager.h +++ b/src/pager.h @@ -136,6 +136,7 @@ int sqlite3PagerSharedLock(Pager *pPager); /* Functions used to query pager state and configuration. */ u8 sqlite3PagerIsreadonly(Pager*); int sqlite3PagerRefcount(Pager*); +int sqlite3PagerMemUsed(Pager*); const char *sqlite3PagerFilename(Pager*); const sqlite3_vfs *sqlite3PagerVfs(Pager*); sqlite3_file *sqlite3PagerFile(Pager*); diff --git a/src/sqlite.h.in b/src/sqlite.h.in index a6d1a75765..97b5500647 100644 --- a/src/sqlite.h.in +++ b/src/sqlite.h.in @@ -5093,9 +5093,11 @@ int sqlite3_status(int op, int *pCurrent, int *pHighwater, int resetFlag); ** ^This interface is used to retrieve runtime status information ** about a single [database connection]. ^The first argument is the ** database connection object to be interrogated. ^The second argument -** is the parameter to interrogate. ^Currently, the only allowed value -** for the second parameter is [SQLITE_DBSTATUS_LOOKASIDE_USED]. -** Additional options will likely appear in future releases of SQLite. +** is an integer constant, taken from the set of +** [SQLITE_DBSTATUS_LOOKASIDE_USED | SQLITE_DBSTATUS_*] macros, that +** determiness the parameter to interrogate. The set of +** [SQLITE_DBSTATUS_LOOKASIDE_USED | SQLITE_DBSTATUS_*] macros is likely +** to grow in future releases of SQLite. ** ** ^The current value of the requested parameter is written into *pCur ** and the highest instantaneous value is written into *pHiwtr. ^If @@ -5122,9 +5124,17 @@ int sqlite3_db_status(sqlite3*, int op, int *pCur, int *pHiwtr, int resetFlg); ** ^(
SQLITE_DBSTATUS_LOOKASIDE_USED
**
This parameter returns the number of lookaside memory slots currently ** checked out.
)^ +** +**
SQLITE_DBSTATUS_CACHE_USED
+**
^This parameter returns the approximate number of of bytes of heap +** memory used by all pager caches associated with the database connection. +** ^The highwater mark associated with SQLITE_DBSTATUS_CACHE_USED is always 0. +** checked out.
)^ ** */ #define SQLITE_DBSTATUS_LOOKASIDE_USED 0 +#define SQLITE_DBSTATUS_CACHE_USED 1 +#define SQLITE_DBSTATUS_MAX 1 /* Largest defined DBSTATUS */ /* diff --git a/src/status.c b/src/status.c index f4c77a9109..f310f36d32 100644 --- a/src/status.c +++ b/src/status.c @@ -112,6 +112,26 @@ int sqlite3_db_status( } break; } + + /* + ** Return an approximation for the amount of memory currently used + ** by all pagers associated with the given database connection. The + ** highwater mark is meaningless and is returned as zero. + */ + case SQLITE_DBSTATUS_CACHE_USED: { + int totalUsed = 0; + int i; + for(i=0; inDb; i++){ + Btree *pBt = db->aDb[i].pBt; + if( pBt ){ + Pager *pPager = sqlite3BtreePager(pBt); + totalUsed += sqlite3PagerMemUsed(pPager); + } + } + *pCurrent = totalUsed; + *pHighwater = 0; + break; + } default: { return SQLITE_ERROR; } diff --git a/src/test_malloc.c b/src/test_malloc.c index 5556cc1e6e..d5f0a6df5a 100644 --- a/src/test_malloc.c +++ b/src/test_malloc.c @@ -1287,6 +1287,7 @@ static int test_db_status( int op; } aOp[] = { { "SQLITE_DBSTATUS_LOOKASIDE_USED", SQLITE_DBSTATUS_LOOKASIDE_USED }, + { "SQLITE_DBSTATUS_CACHE_USED", SQLITE_DBSTATUS_CACHE_USED }, }; Tcl_Obj *pResult; if( objc!=4 ){ diff --git a/test/dbstatus.test b/test/dbstatus.test new file mode 100644 index 0000000000..c7a6b5847d --- /dev/null +++ b/test/dbstatus.test @@ -0,0 +1,45 @@ +# 2010 March 10 +# +# The author disclaims copyright to this source code. In place of +# a legal notice, here is a blessing: +# +# May you do good and not evil. +# May you find forgiveness for yourself and forgive others. +# May you share freely, never taking more than you give. +# +#*********************************************************************** +# +# Tests for the sqlite3_db_status() function +# + +set testdir [file dirname $argv0] +source $testdir/tester.tcl + + +# Make sure sqlite3_db_config() and sqlite3_db_status are working. +# +unset -nocomplain PAGESZ +unset -nocomplain BASESZ +do_test dbstatus-1.1 { + db close + sqlite3 db :memory: + db eval { + CREATE TABLE t1(x); + } + set sz1 [lindex [sqlite3_db_status db SQLITE_DBSTATUS_CACHE_USED 0] 1] + db eval { + CREATE TABLE t2(y); + } + set sz2 [lindex [sqlite3_db_status db SQLITE_DBSTATUS_CACHE_USED 0] 1] + set ::PAGESZ [expr {$sz2-$sz1}] + set ::BASESZ [expr {$sz1-$::PAGESZ}] + expr {$::PAGESZ>1024 && $::PAGESZ<1200} +} {1} +do_test dbstatus-1.2 { + db eval { + INSERT INTO t1 VALUES(zeroblob(9000)); + } + lindex [sqlite3_db_status db SQLITE_DBSTATUS_CACHE_USED 0] 1 +} [expr {$BASESZ + 10*$PAGESZ}] + +finish_test