Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 14:48:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Improve SerializationFormat's write buffer growth strategy.

Browse source
This commit is contained in:
Jon Siwek 2014-03-14 17:26:38 -05:00
parent 8061a34b3e
commit 6595c7c75b
1 changed files with 5 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/SerializationFormat.cc
View file

@ -13,7 +13,7 @@ SerializationFormat::SerializationFormat()
SerializationFormat::~SerializationFormat() SerializationFormat::~SerializationFormat()
{ {
delete [] output; free(output);
} }
void SerializationFormat::StartRead(char* data, uint32 arg_len) void SerializationFormat::StartRead(char* data, uint32 arg_len)
@ -33,13 +33,13 @@ void SerializationFormat::StartWrite()
{ {
if ( output && output_size > INITIAL_SIZE ) if ( output && output_size > INITIAL_SIZE )
{ {
delete [] output; free(output);
output = 0; output = 0;
} }
if ( ! output ) if ( ! output )
{ {
output = new char[INITIAL_SIZE]; output = (char*)safe_malloc(INITIAL_SIZE);
output_size = INITIAL_SIZE; output_size = INITIAL_SIZE;
} }
@ -75,11 +75,8 @@ bool SerializationFormat::WriteData(const void* b, size_t count)
// Increase buffer if necessary. // Increase buffer if necessary.
while ( output_pos + count > output_size ) while ( output_pos + count > output_size )
{ {
output_size = output_pos + count + INITIAL_SIZE; output_size += output_size * 1.5;
char* tmp = new char[output_size]; output = (char*)safe_realloc(output, output_size);
memcpy(tmp, output, output_pos);
delete [] output;
output = tmp;
} }
memcpy(output + output_pos, b, count); memcpy(output + output_pos, b, count);