Optimized memory utlization resizing serialization buffer buffer
This commit is contained in:
@@ -1357,6 +1357,9 @@ typedef enum {
|
||||
ndpi_serialization_string
|
||||
} ndpi_serialization_type;
|
||||
|
||||
#define NDPI_SERIALIZER_DEFAULT_BUFFER_SIZE 8192
|
||||
#define NDPI_SERIALIZER_DEFAULT_BUFFER_INCR 1024
|
||||
|
||||
#define NDPI_SERIALIZER_STATUS_COMMA (1 << 0)
|
||||
#define NDPI_SERIALIZER_STATUS_ARRAY (1 << 1)
|
||||
#define NDPI_SERIALIZER_STATUS_EOR (1 << 2)
|
||||
@@ -1368,6 +1371,7 @@ typedef struct {
|
||||
|
||||
typedef struct {
|
||||
ndpi_private_serializer_status status;
|
||||
u_int32_t initial_buffer_size;
|
||||
u_int32_t buffer_size;
|
||||
ndpi_serialization_format fmt;
|
||||
u_int8_t *buffer;
|
||||
|
||||
@@ -155,7 +155,7 @@ int ndpi_init_serializer_ll(ndpi_serializer *_serializer,
|
||||
|
||||
memset(serializer, 0, sizeof(ndpi_private_serializer));
|
||||
|
||||
serializer->buffer_size = buffer_size;
|
||||
serializer->initial_buffer_size = serializer->buffer_size = buffer_size;
|
||||
serializer->buffer = (u_int8_t *) malloc(serializer->buffer_size * sizeof(u_int8_t));
|
||||
|
||||
if(serializer->buffer == NULL)
|
||||
@@ -178,7 +178,7 @@ int ndpi_init_serializer_ll(ndpi_serializer *_serializer,
|
||||
|
||||
int ndpi_init_serializer(ndpi_serializer *_serializer,
|
||||
ndpi_serialization_format fmt) {
|
||||
return ndpi_init_serializer_ll(_serializer, fmt, 8192);
|
||||
return ndpi_init_serializer_ll(_serializer, fmt, NDPI_SERIALIZER_DEFAULT_BUFFER_SIZE);
|
||||
}
|
||||
|
||||
/* ********************************** */
|
||||
@@ -250,8 +250,14 @@ static inline int ndpi_extend_serializer_buffer(ndpi_serializer *_serializer, u_
|
||||
void *r;
|
||||
ndpi_private_serializer *serializer = (ndpi_private_serializer*)_serializer;
|
||||
|
||||
if(min_len < 1024)
|
||||
min_len = 1024;
|
||||
if (min_len < NDPI_SERIALIZER_DEFAULT_BUFFER_INCR) {
|
||||
if (serializer->initial_buffer_size < NDPI_SERIALIZER_DEFAULT_BUFFER_INCR) {
|
||||
if (min_len < serializer->initial_buffer_size)
|
||||
min_len = serializer->initial_buffer_size;
|
||||
} else {
|
||||
min_len = NDPI_SERIALIZER_DEFAULT_BUFFER_INCR;
|
||||
}
|
||||
}
|
||||
|
||||
new_size = serializer->buffer_size + min_len;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user