mirror of
https://github.com/Icinga/icinga2.git
synced 2025-07-23 13:45:04 +02:00
Simplified FIFO implementation
Fixed a memoryleak in Netstring class
This commit is contained in:
parent
badb51338c
commit
c7f8ec38fd
@ -5,7 +5,8 @@ using namespace icinga;
|
|||||||
FIFO::FIFO(void)
|
FIFO::FIFO(void)
|
||||||
{
|
{
|
||||||
m_Buffer = NULL;
|
m_Buffer = NULL;
|
||||||
m_BufferSize = 0;
|
m_DataSize = 0;
|
||||||
|
m_AllocSize = 0;
|
||||||
m_Offset = 0;
|
m_Offset = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -14,44 +15,29 @@ FIFO::~FIFO(void)
|
|||||||
Memory::Free(m_Buffer);
|
Memory::Free(m_Buffer);
|
||||||
}
|
}
|
||||||
|
|
||||||
char *FIFO::ResizeBuffer(char *buffer, size_t oldSize, size_t newSize)
|
void FIFO::ResizeBuffer(size_t newSize)
|
||||||
{
|
{
|
||||||
if (oldSize != 0)
|
if (m_AllocSize >= newSize)
|
||||||
oldSize += FIFO::BlockSize - (oldSize % FIFO::BlockSize);
|
return;
|
||||||
|
|
||||||
size_t ceilNewSize = newSize + FIFO::BlockSize - (newSize % FIFO::BlockSize);
|
newSize = (newSize / FIFO::BlockSize + 1) * FIFO::BlockSize;
|
||||||
size_t oldBlocks = oldSize / FIFO::BlockSize;
|
|
||||||
size_t newBlocks = ceilNewSize / FIFO::BlockSize;
|
|
||||||
|
|
||||||
if (oldBlocks == newBlocks)
|
m_Buffer = (char *)Memory::Reallocate(m_Buffer, newSize);
|
||||||
return buffer;
|
m_AllocSize = newSize;
|
||||||
|
|
||||||
if (newSize == 0) {
|
|
||||||
Memory::Free(buffer);
|
|
||||||
return NULL;
|
|
||||||
} else {
|
|
||||||
return (char *)Memory::Reallocate(buffer, newBlocks * FIFO::BlockSize);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void FIFO::Optimize(void)
|
void FIFO::Optimize(void)
|
||||||
{
|
{
|
||||||
char *newBuffer;
|
//char *newBuffer;
|
||||||
|
|
||||||
if (m_Offset == 0 || m_Offset < m_BufferSize / 5)
|
if (m_DataSize < m_Offset) {
|
||||||
return;
|
memcpy(m_Buffer, m_Buffer + m_Offset, m_DataSize);
|
||||||
|
|
||||||
if (m_BufferSize - m_Offset == 0) {
|
|
||||||
free(m_Buffer);
|
|
||||||
|
|
||||||
m_Buffer = 0;
|
|
||||||
m_BufferSize = 0;
|
|
||||||
m_Offset = 0;
|
m_Offset = 0;
|
||||||
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
newBuffer = (char *)ResizeBuffer(NULL, 0, m_BufferSize - m_Offset);
|
/*newBuffer = (char *)ResizeBuffer(NULL, 0, m_BufferSize - m_Offset);
|
||||||
|
|
||||||
if (newBuffer == NULL)
|
if (newBuffer == NULL)
|
||||||
return;
|
return;
|
||||||
@ -61,12 +47,12 @@ void FIFO::Optimize(void)
|
|||||||
free(m_Buffer);
|
free(m_Buffer);
|
||||||
m_Buffer = newBuffer;
|
m_Buffer = newBuffer;
|
||||||
m_BufferSize -= m_Offset;
|
m_BufferSize -= m_Offset;
|
||||||
m_Offset = 0;
|
m_Offset = 0;*/
|
||||||
}
|
}
|
||||||
|
|
||||||
size_t FIFO::GetSize(void) const
|
size_t FIFO::GetSize(void) const
|
||||||
{
|
{
|
||||||
return m_BufferSize - m_Offset;
|
return m_DataSize;
|
||||||
}
|
}
|
||||||
|
|
||||||
const void *FIFO::GetReadBuffer(void) const
|
const void *FIFO::GetReadBuffer(void) const
|
||||||
@ -76,11 +62,12 @@ const void *FIFO::GetReadBuffer(void) const
|
|||||||
|
|
||||||
size_t FIFO::Read(void *buffer, size_t count)
|
size_t FIFO::Read(void *buffer, size_t count)
|
||||||
{
|
{
|
||||||
count = (count <= m_BufferSize) ? count : m_BufferSize;
|
count = (count <= m_DataSize) ? count : m_DataSize;
|
||||||
|
|
||||||
if (buffer != NULL)
|
if (buffer != NULL)
|
||||||
memcpy(buffer, m_Buffer + m_Offset, count);
|
memcpy(buffer, m_Buffer + m_Offset, count);
|
||||||
|
|
||||||
|
m_DataSize -= count;
|
||||||
m_Offset += count;
|
m_Offset += count;
|
||||||
|
|
||||||
Optimize();
|
Optimize();
|
||||||
@ -90,16 +77,9 @@ size_t FIFO::Read(void *buffer, size_t count)
|
|||||||
|
|
||||||
void *FIFO::GetWriteBuffer(size_t count)
|
void *FIFO::GetWriteBuffer(size_t count)
|
||||||
{
|
{
|
||||||
char *new_buffer;
|
ResizeBuffer(m_Offset + m_DataSize + count);
|
||||||
|
|
||||||
new_buffer = ResizeBuffer(m_Buffer, m_BufferSize, m_BufferSize + count);
|
return m_Buffer + m_Offset + m_DataSize;
|
||||||
|
|
||||||
if (new_buffer == NULL)
|
|
||||||
throw exception(/*"Out of memory."*/);
|
|
||||||
|
|
||||||
m_Buffer = new_buffer;
|
|
||||||
|
|
||||||
return new_buffer + m_Offset + m_BufferSize;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
size_t FIFO::Write(const void *buffer, size_t count)
|
size_t FIFO::Write(const void *buffer, size_t count)
|
||||||
@ -109,7 +89,7 @@ size_t FIFO::Write(const void *buffer, size_t count)
|
|||||||
memcpy(target_buffer, buffer, count);
|
memcpy(target_buffer, buffer, count);
|
||||||
}
|
}
|
||||||
|
|
||||||
m_BufferSize += count;
|
m_DataSize += count;
|
||||||
|
|
||||||
return count;
|
return count;
|
||||||
}
|
}
|
||||||
|
@ -8,10 +8,11 @@ class FIFO : public Object
|
|||||||
{
|
{
|
||||||
private:
|
private:
|
||||||
char *m_Buffer;
|
char *m_Buffer;
|
||||||
size_t m_BufferSize;
|
size_t m_DataSize;
|
||||||
|
size_t m_AllocSize;
|
||||||
size_t m_Offset;
|
size_t m_Offset;
|
||||||
|
|
||||||
char *ResizeBuffer(char *buffer, size_t oldSize, size_t newSize);
|
void ResizeBuffer(size_t newSize);
|
||||||
void Optimize(void);
|
void Optimize(void);
|
||||||
|
|
||||||
public:
|
public:
|
||||||
|
@ -66,5 +66,7 @@ void Netstring::WriteJSONToFIFO(FIFO::RefType fifo, cJSON *object)
|
|||||||
|
|
||||||
fifo->Write(strLength, strlen(strLength));
|
fifo->Write(strLength, strlen(strLength));
|
||||||
fifo->Write(json, len);
|
fifo->Write(json, len);
|
||||||
|
free(json);
|
||||||
|
|
||||||
fifo->Write(",", 1);
|
fifo->Write(",", 1);
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user