mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-30 10:31:54 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

correct event buffer status reporting

Browse source
This commit is contained in:
unknown 2007-03-21 08:22:36 +01:00
parent f184c81733
commit c73db035de
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
storage/ndb/src/common/debugger/EventLogger.cpp
View file

@ -652,9 +652,9 @@ void getTextEventBufferStatus(QQQQ) {
"Event buffer status: used=%d%s(%d%) alloc=%d%s(%d%) " "Event buffer status: used=%d%s(%d%) alloc=%d%s(%d%) "
"max=%d%s apply_gci=%lld latest_gci=%lld", "max=%d%s apply_gci=%lld latest_gci=%lld",
used, used_unit, used, used_unit,
theData[2] ? (theData[1]*100)/theData[2] : 0, theData[2] ? (Uint32)((((Uint64)theData[1])*100)/theData[2]) : 0,
alloc, alloc_unit, alloc, alloc_unit,
theData[3] ? (theData[2]*100)/theData[3] : 0, theData[3] ? (Uint32)((((Uint64)theData[2])*100)/theData[3]) : 0,
max_, max_unit, max_, max_unit,
theData[4]+(((Uint64)theData[5])<<32), theData[4]+(((Uint64)theData[5])<<32),
theData[6]+(((Uint64)theData[7])<<32)); theData[6]+(((Uint64)theData[7])<<32));

10
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp
View file

@ -2100,15 +2100,17 @@ NdbEventBuffer::alloc_mem(EventBufData* data,
NdbMem_Free((char*)data->memory); NdbMem_Free((char*)data->memory);
assert(m_total_alloc >= data->sz); assert(m_total_alloc >= data->sz);
m_total_alloc -= data->sz;
data->memory = 0; data->memory = 0;
data->sz = 0; data->sz = 0;
data->memory = (Uint32*)NdbMem_Allocate(alloc_size); data->memory = (Uint32*)NdbMem_Allocate(alloc_size);
if (data->memory == 0) if (data->memory == 0)
{
m_total_alloc -= data->sz;
DBUG_RETURN(-1); DBUG_RETURN(-1);
}
data->sz = alloc_size; data->sz = alloc_size;
m_total_alloc += data->sz; m_total_alloc += add_sz;
if (change_sz != NULL) if (change_sz != NULL)
*change_sz += add_sz; *change_sz += add_sz;
@ -2780,7 +2782,7 @@ NdbEventBuffer::reportStatus()
else else
apply_gci= latest_gci; apply_gci= latest_gci;
if (100*m_free_data_sz < m_min_free_thresh*m_total_alloc && if (100*(Uint64)m_free_data_sz < m_min_free_thresh*(Uint64)m_total_alloc &&
m_total_alloc > 1024*1024) m_total_alloc > 1024*1024)
{ {
/* report less free buffer than m_free_thresh, /* report less free buffer than m_free_thresh,
@ -2791,7 +2793,7 @@ NdbEventBuffer::reportStatus()
goto send_report; goto send_report;
} }
if (100*m_free_data_sz > m_max_free_thresh*m_total_alloc && if (100*(Uint64)m_free_data_sz > m_max_free_thresh*(Uint64)m_total_alloc &&
m_total_alloc > 1024*1024) m_total_alloc > 1024*1024)
{ {
/* report more free than 2 * m_free_thresh /* report more free than 2 * m_free_thresh