hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

modutil_get_complete_packets now partially clones the buffer instead of allocating a new one.

Browse Source
This commit is contained in:
Markus Makela
2015-04-24 17:20:20 +03:00
parent d7b665b867
commit b62f7f942b
1 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
server/core/modutil.c
View File

@ -549,7 +549,6 @@ GWBUF* modutil_get_complete_packets(GWBUF** p_readbuf)
packet->next = NULL; packet->next = NULL;
*p_readbuf = packet; *p_readbuf = packet;
ptr = (uint8_t*)packet->start; ptr = (uint8_t*)packet->start;
end = (uint8_t*)packet->end;
len = gw_mysql_get_byte3(ptr) + 4; len = gw_mysql_get_byte3(ptr) + 4;
blen = gwbuf_length(packet); blen = gwbuf_length(packet);
@ -578,18 +577,13 @@ GWBUF* modutil_get_complete_packets(GWBUF** p_readbuf)
} }
/** The next packet is a partial, split into complete and partial packets */ /** The next packet is a partial, split into complete and partial packets */
if((buff = gwbuf_alloc(total)) == NULL) if((buff = gwbuf_clone_portion(packet,0,total)) == NULL)
{ {
skygw_log_write(LOGFILE_ERROR, skygw_log_write(LOGFILE_ERROR,
"Error: Failed to allocate new buffer " "Error: Failed to partially clone buffer.");
" of %d bytes while splitting buffer"
" into complete packets.",
total);
return NULL; return NULL;
} }
buff->next = NULL;
gwbuf_set_type(buff,GWBUF_TYPE_MYSQL);
memcpy(buff->start,packet->start,total);
gwbuf_consume(packet,total); gwbuf_consume(packet,total);
return buff; return buff;
} }