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

Add initial ZIPVFS support for the "main" database to the sqlite_memstat

Browse Source 
virtual table.

FossilOrigin-Name: 9cd27350b0f62debfe3238c57c3ab51079699142e82c05a7ec8460a8429f55f2
This commit is contained in:
drh
2018-09-27 15:45:03 +00:00
parent d7fda6cfc5
commit 7c5577acdc
3 changed files with 41 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ext/misc/memstat.c
+34 -21
View File
@@ -126,6 +126,7 @@ static int memstatClose(sqlite3_vtab_cursor *cur){
*/
#define MSV_GSTAT 0 /* sqlite3_status64() information */
#define MSV_DBSTAT 1 /* sqlite3_db_status() information */
#define MSV_ZIPVFS 2 /* ZIPVFS file-control with 64-bit return */
/*
** An array of quantities that can be measured and reported by
@@ -136,26 +137,34 @@ static const struct MemstatColumns {
int eType; /* Type of interface */
int eOp; /* Opcode */
} aMemstatColumn[] = {
{ "MEMORY_USED", MSV_GSTAT, SQLITE_STATUS_MEMORY_USED },
{ "MALLOC_SIZE", MSV_GSTAT, SQLITE_STATUS_MALLOC_SIZE },
{ "MALLOC_COUNT", MSV_GSTAT, SQLITE_STATUS_MALLOC_COUNT },
{ "PAGECACHE_USED", MSV_GSTAT, SQLITE_STATUS_PAGECACHE_USED },
{ "PAGECACHE_OVERFLOW", MSV_GSTAT, SQLITE_STATUS_PAGECACHE_OVERFLOW },
{ "PAGECACHE_SIZE", MSV_GSTAT, SQLITE_STATUS_PAGECACHE_SIZE },
{ "PARSER_STACK", MSV_GSTAT, SQLITE_STATUS_PARSER_STACK },
{ "LOOKASIDE_USED", MSV_DBSTAT, SQLITE_DBSTATUS_LOOKASIDE_USED },
{ "CACHE_USED", MSV_DBSTAT, SQLITE_DBSTATUS_CACHE_USED },
{ "SCHEMA_USED", MSV_DBSTAT, SQLITE_DBSTATUS_SCHEMA_USED },
{ "STMT_USED", MSV_DBSTAT, SQLITE_DBSTATUS_STMT_USED },
{ "LOOKASIDE_HIT", MSV_DBSTAT, SQLITE_DBSTATUS_LOOKASIDE_HIT },
{ "LOOKASIDE_MISS_SIZE", MSV_DBSTAT, SQLITE_DBSTATUS_LOOKASIDE_MISS_SIZE },
{ "LOOKASIDE_MISS_FULL", MSV_DBSTAT, SQLITE_DBSTATUS_LOOKASIDE_MISS_FULL },
{ "CACHE_HIT", MSV_DBSTAT, SQLITE_DBSTATUS_CACHE_HIT },
{ "CACHE_MISS", MSV_DBSTAT, SQLITE_DBSTATUS_CACHE_MISS },
{ "CACHE_WRITE", MSV_DBSTAT, SQLITE_DBSTATUS_CACHE_WRITE },
{ "DEFERRED_FKS", MSV_DBSTAT, SQLITE_DBSTATUS_DEFERRED_FKS },
{ "CACHE_USED_SHARED", MSV_DBSTAT, SQLITE_DBSTATUS_CACHE_USED_SHARED },
{ "CACHE_SPILL", MSV_DBSTAT, SQLITE_DBSTATUS_CACHE_SPILL },
{ "MEMORY_USED", MSV_GSTAT, SQLITE_STATUS_MEMORY_USED },
{ "MALLOC_SIZE", MSV_GSTAT, SQLITE_STATUS_MALLOC_SIZE },
{ "MALLOC_COUNT", MSV_GSTAT, SQLITE_STATUS_MALLOC_COUNT },
{ "PAGECACHE_USED", MSV_GSTAT, SQLITE_STATUS_PAGECACHE_USED },
{ "PAGECACHE_OVERFLOW", MSV_GSTAT, SQLITE_STATUS_PAGECACHE_OVERFLOW },
{ "PAGECACHE_SIZE", MSV_GSTAT, SQLITE_STATUS_PAGECACHE_SIZE },
{ "PARSER_STACK", MSV_GSTAT, SQLITE_STATUS_PARSER_STACK },
{ "DB_LOOKASIDE_USED", MSV_DBSTAT, SQLITE_DBSTATUS_LOOKASIDE_USED },
{ "DB_CACHE_USED", MSV_DBSTAT, SQLITE_DBSTATUS_CACHE_USED },
{ "DB_SCHEMA_USED", MSV_DBSTAT, SQLITE_DBSTATUS_SCHEMA_USED },
{ "DB_STMT_USED", MSV_DBSTAT, SQLITE_DBSTATUS_STMT_USED },
{ "DB_LOOKASIDE_HIT", MSV_DBSTAT, SQLITE_DBSTATUS_LOOKASIDE_HIT },
{ "DB_LOOKASIDE_MISS_SIZE", MSV_DBSTAT, SQLITE_DBSTATUS_LOOKASIDE_MISS_SIZE },
{ "DB_LOOKASIDE_MISS_FULL", MSV_DBSTAT, SQLITE_DBSTATUS_LOOKASIDE_MISS_FULL },
{ "DB_CACHE_HIT", MSV_DBSTAT, SQLITE_DBSTATUS_CACHE_HIT },
{ "DB_CACHE_MISS", MSV_DBSTAT, SQLITE_DBSTATUS_CACHE_MISS },
{ "DB_CACHE_WRITE", MSV_DBSTAT, SQLITE_DBSTATUS_CACHE_WRITE },
{ "DB_DEFERRED_FKS", MSV_DBSTAT, SQLITE_DBSTATUS_DEFERRED_FKS },
{ "DB_CACHE_USED_SHARED", MSV_DBSTAT, SQLITE_DBSTATUS_CACHE_USED_SHARED },
{ "DB_CACHE_SPILL", MSV_DBSTAT, SQLITE_DBSTATUS_CACHE_SPILL },
#ifdef SQLITE_ENABLE_ZIPVFS
{ "ZIPVFS_CACHE_USED", MSV_ZIPVFS, 231454 },
{ "ZIPVFS_CACHE_HIT", MSV_ZIPVFS, 231455 },
{ "ZIPVFS_CACHE_MISS", MSV_ZIPVFS, 231456 },
{ "ZIPVFS_CACHE_WRITE", MSV_ZIPVFS, 231457 },
{ "ZIPVFS_DIRECT_READ", MSV_ZIPVFS, 231458 },
{ "ZIPVFS_DIRECT_BYTES", MSV_ZIPVFS, 231459 },
#endif /* SQLITE_ENABLE_ZIPVFS */
};
#define MSV_NROW (sizeof(aMemstatColumn)/sizeof(aMemstatColumn[0]))
@@ -200,6 +209,10 @@ static int memstatColumn(
iHiwtr = xHiwtr;
break;
}
case MSV_ZIPVFS: {
sqlite3_file_control(pCur->db, 0, aMemstatColumn[i].eOp, (void*)&iCur);
break;
}
}
if( iCol==MSV_COLUMN_HIWTR ) iCur = iHiwtr;
sqlite3_result_int64(ctx, iCur);
@@ -222,7 +235,7 @@ static int memstatRowid(sqlite3_vtab_cursor *cur, sqlite_int64 *pRowid){
*/
static int memstatEof(sqlite3_vtab_cursor *cur){
memstat_cursor *pCur = (memstat_cursor*)cur;
return pCur->iRowid>=MSV_NROW;
return pCur->iRowid>MSV_NROW;
}
/*
manifest
+6 -9
View File
@@ -1,5 +1,5 @@
C Initial\sprototype\sof\sa\seponymous\svirtual\stable\sthat\saccesses\ssqlite3_status64()\nand\ssqlite3_db_status().
D 2018-09-27T15:21:13.771
C Add\sinitial\sZIPVFS\ssupport\sfor\sthe\s"main"\sdatabase\sto\sthe\ssqlite_memstat\nvirtual\stable.
D 2018-09-27T15:45:03.985
F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
F Makefile.in 01e95208a78b57d056131382c493c963518f36da4c42b12a97eb324401b3a334
@@ -286,7 +286,7 @@ F ext/misc/fileio.c 7317d825fab6a3c48f6e3822a00a6a22e08e55af31700ac96f16a523f830
F ext/misc/fuzzer.c 7c64b8197bb77b7d64eff7cac7848870235d4c25
F ext/misc/ieee754.c f190d0cc5182529acb15babd177781be1ac1718c
F ext/misc/json1.c 276f87dc8365b34b0fffb7ef32481dd07fac6fdb3224e2822396a48377ac8363
F ext/misc/memstat.c 1e36cfd77f528066df164f8f9bec3481f6b570cf92e27a9e43229c75a4baffa1
F ext/misc/memstat.c 09bfa9a16be3d44932233fd1aa95cdd09d7b3f72d3f36805483bfe23b48fe8ec
F ext/misc/memvfs.c ab36f49e02ebcdf85a1e08dc4d8599ea8f343e073ac9e0bca18a98b7e1ec9567
F ext/misc/mmapwarm.c 70b618f2d0bde43fae288ad0b7498a629f2b6f61b50a27e06fae3cd23c83af29
F ext/misc/nextchar.c 35c8b8baacb96d92abbb34a83a997b797075b342
@@ -1770,10 +1770,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
P 7fc2994434c7d9ed29c96a69c07e8eb4e97be776473c170c63f9a1bbaa09fa68
R dc5bab36f0540d8a30e5739e455f50c5
T *branch * memstat-vtab
T *sym-memstat-vtab *
T -sym-trunk *
P 0b44e1f68e0c8349367e3f929d4734c3df96338ec8d6fb652565bf894e8b8343
R eeaa8104d4a2a8c673af2ed0c882ed24
U drh
Z f687dcf36195771d0f69625cb386777d
Z 5dadcc7b0adb63e8fb1777ba189f8dd3
manifest.uuid
+1 -1
View File
@@ -1 +1 @@
0b44e1f68e0c8349367e3f929d4734c3df96338ec8d6fb652565bf894e8b8343
9cd27350b0f62debfe3238c57c3ab51079699142e82c05a7ec8460a8429f55f2