mahlon/ruby-mdbx
1
0
Fork 0
Code Issues Pull requests Activity

Multiple changes.

Browse source 
- Raise an error if invalid options are passed to the constructor.
- Bugfix: Ensure drop() only removes the specified collection.
- Fix initializer double memory allocation.
- Fix key/data object allocation: make garbage collection safe.
- Move common macros to the global header file.

FossilOrigin-Name: 98d3016bd25921dead39d9c5474712766b56519d575bc8cd960932b3fbc16b69
This commit is contained in:
Mahlon E. Smith 2021-06-28 23:39:46 +00:00
parent b7e515d51e
commit e9b476a4d7
10 changed files with 605 additions and 517 deletions
Download patch file Download diff file Expand all files Collapse all files

46
ext/mdbx_ext/stats.c
View file

@ -3,8 +3,6 @@
* Expose a bunch of mdbx internals to ruby.
* This is all largely stolen from mdbx_stat.c.
*
* Entry point is rmdbx_stats() in database.c.
*
*/
#include "mdbx_ext.h"
@ -28,6 +26,32 @@ rmdbx_gather_build_stats( VALUE stat )
}
/*
* Grab current memory usage. (Available since MDBX 0.10.0).
*/
void
rmdbx_gather_memory_stats( VALUE stat )
{
if (! ( MDBX_VERSION_MAJOR >= 0 && MDBX_VERSION_MINOR >= 10 ) )
return;
VALUE mem = rb_hash_new();
rb_hash_aset( stat, ID2SYM(rb_intern("system_memory")), mem );
intptr_t page_size;
intptr_t total_pages;
intptr_t avail_pages;
mdbx_get_sysraminfo( &page_size, &total_pages, &avail_pages );
rb_hash_aset( mem, ID2SYM(rb_intern("pagesize")), LONG2FIX( page_size ) );
rb_hash_aset( mem, ID2SYM(rb_intern("total_pages")), LONG2FIX( total_pages ) );
rb_hash_aset( mem, ID2SYM(rb_intern("avail_pages")), LONG2FIX( avail_pages ) );
return;
}
/*
* Metadata for the database file.
*/
@ -80,6 +104,16 @@ rmdbx_gather_environment_stats(
rb_hash_aset( environ, ID2SYM(rb_intern("pagesize")),
INT2NUM(mstat.ms_psize) );
rb_hash_aset( environ, ID2SYM(rb_intern("branch_pages")),
LONG2NUM(mstat.ms_branch_pages) );
rb_hash_aset( environ, ID2SYM(rb_intern("leaf_pages")),
LONG2NUM(mstat.ms_leaf_pages) );
rb_hash_aset( environ, ID2SYM(rb_intern("overflow_pages")),
LONG2NUM(mstat.ms_overflow_pages) );
rb_hash_aset( environ, ID2SYM(rb_intern("btree_depth")),
INT2NUM(mstat.ms_depth) );
rb_hash_aset( environ, ID2SYM(rb_intern("entries")),
LONG2NUM(mstat.ms_entries) );
rb_hash_aset( environ, ID2SYM(rb_intern("last_txnid")),
INT2NUM(menvinfo.mi_recent_txnid) );
rb_hash_aset( environ, ID2SYM(rb_intern("last_reader_txnid")),
@ -101,7 +135,7 @@ rmdbx_gather_environment_stats(
*
*/
int
reader_list_callback(
rmdbx_reader_list_cb(
void *ctx,
int num,
int slot,
@ -148,7 +182,7 @@ rmdbx_gather_reader_stats(
{
VALUE readers = rb_ary_new();
mdbx_reader_list( db->env, reader_list_callback, (void*)readers );
mdbx_reader_list( db->env, rmdbx_reader_list_cb, (void*)readers );
rb_hash_aset( stat, ID2SYM(rb_intern("readers")), readers );
return;
@ -168,6 +202,7 @@ rmdbx_gather_stats( rmdbx_db_t *db )
MDBX_stat mstat;
MDBX_envinfo menvinfo;
rmdbx_gather_memory_stats( stat );
rmdbx_gather_build_stats( stat );
rmdbx_open_txn( db, MDBX_TXN_RDONLY );
@ -183,9 +218,6 @@ rmdbx_gather_stats( rmdbx_db_t *db )
rmdbx_gather_environment_stats( stat, mstat, menvinfo );
rmdbx_gather_reader_stats( db, stat, mstat, menvinfo );
/* TODO: database and subdatabase stats */
return stat;
}