vrr/ntopng
2
0
Fork 0
mirror of https://github.com/ntop/ntopng.git synced 2026-05-12 04:09:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Counts also idle entries to honor -X and -x

Browse source
This commit is contained in:
Simone Mainardi 2019-10-31 09:54:00 +01:00
parent 11d7f2aa12
commit 552ca89959
2 changed files with 29 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/GenericHash.cpp
View file

@ -342,8 +342,23 @@ u_int GenericHash::purgeIdle(bool force_idle) {
/* ************************************ */
int32_t GenericHash::getNumIdleEntries() const {
return entry_state_transition_counters.num_idle_transitions - entry_state_transition_counters.num_purged;
};
/* ************************************ */
bool GenericHash::hasEmptyRoom() {
/* Allow the total number of entries (that is, active and those idle but still not yet purged)
to be 30% more than the maximum hash table size specified. This prevents memory from growing
indefinitely when for example the purging is slow. */
return getNumEntries() + getNumIdleEntries() <= max_hash_size * 1.3;
};
/* ************************************ */
void GenericHash::lua(lua_State *vm) {
int64_t delta;
int64_t num_idle;
lua_newtable(vm);
@ -357,11 +372,11 @@ void GenericHash::lua(lua_State *vm) {
entry_state_transition_counters.num_purged);
#endif
delta = entry_state_transition_counters.num_idle_transitions - entry_state_transition_counters.num_purged;
if(delta < 0)
ntop->getTrace()->traceEvent(TRACE_ERROR, "Internal error: unexpected number of entries in state [iface: %s][%s][hash_entry_state_idle: %i][num_idle_transitions: %u][num_purged: %u]", iface ? iface->get_name(): "", name, delta, entry_state_transition_counters.num_idle_transitions, entry_state_transition_counters.num_purged);
num_idle = getNumIdleEntries();
if(num_idle < 0)
ntop->getTrace()->traceEvent(TRACE_ERROR, "Internal error: unexpected number of entries in state [iface: %s][%s][hash_entry_state_idle: %i][num_idle_transitions: %u][num_purged: %u]", iface ? iface->get_name(): "", name, num_idle, entry_state_transition_counters.num_idle_transitions, entry_state_transition_counters.num_purged);
else
lua_push_uint64_table_entry(vm, "hash_entry_state_idle", (u_int64_t)delta);
lua_push_uint64_table_entry(vm, "hash_entry_state_idle", (u_int64_t)num_idle);
lua_push_uint64_table_entry(vm, "hash_entry_state_active", (u_int64_t)getNumEntries());