generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Robert Iakobashvili made the 'master_buffer' get allocated first once it is

Browse Source 
can/will be used as it then makes the common cases save 16KB of data for each
easy handle that isn't used for pipelining.
This commit is contained in:
Daniel Stenberg
2007-04-24 10:18:06 +00:00
parent 6a35841b2e
commit bc1ae973da
6 changed files with 30 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/url.c
View File

@@ -1789,6 +1789,7 @@ static void conn_free(struct connectdata *conn)
Curl_safefree(conn->trailer);
Curl_safefree(conn->host.rawalloc); /* host name buffer */
Curl_safefree(conn->proxy.rawalloc); /* proxy name buffer */
Curl_safefree(conn->master_buffer);
Curl_llist_destroy(conn->send_pipe, NULL);
Curl_llist_destroy(conn->recv_pipe, NULL);
@@ -2825,7 +2826,7 @@ static CURLcode CreateConnection(struct SessionHandle *data,
to not have to modify everything at once, we allocate a temporary
connection data struct and fill in for comparison purposes. */
conn = (struct connectdata *)calloc(sizeof(struct connectdata), 1);
conn = (struct connectdata *)calloc(1, sizeof(struct connectdata));
if(!conn) {
*in_connect = NULL; /* clear the pointer */
return CURLE_OUT_OF_MEMORY;
@@ -2835,6 +2836,14 @@ static CURLcode CreateConnection(struct SessionHandle *data,
any failure */
*in_connect = conn;
if (data->multi && Curl_multi_canPipeline(data->multi) &&
!conn->master_buffer) {
/* Allocate master_buffer to be used for pipelining */
conn->master_buffer = calloc(BUFSIZE, sizeof (char));
if (!conn->master_buffer)
return CURLE_OUT_OF_MEMORY;
}
/* and we setup a few fields in case we end up actually using this struct */
conn->data = data; /* Setup the association between this connection
@@ -3803,6 +3812,7 @@ else {
Curl_safefree(old_conn->proxypasswd);
Curl_llist_destroy(old_conn->send_pipe, NULL);
Curl_llist_destroy(old_conn->recv_pipe, NULL);
Curl_safefree(old_conn->master_buffer);
free(old_conn); /* we don't need this anymore */