cuberite/libevent
1
0
Fork 0
mirror of https://github.com/cuberite/libevent.git synced 2025-09-18 08:49:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

Implement interface that provides the ability to have an outbound evhttp_connection free itself once all requests have completed

Browse Source
This commit is contained in:
John Ohl 2014-10-26 01:18:10 -04:00
parent 6dba1694c8
commit 2b9ec4c13c
3 changed files with 42 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
http-internal.h
View File

@ -74,6 +74,7 @@ struct evhttp_connection {
#define EVHTTP_CON_INCOMING 0x0001 /* only one request on it ever */ #define EVHTTP_CON_INCOMING 0x0001 /* only one request on it ever */
#define EVHTTP_CON_OUTGOING 0x0002 /* multiple requests possible */ #define EVHTTP_CON_OUTGOING 0x0002 /* multiple requests possible */
#define EVHTTP_CON_CLOSEDETECT 0x0004 /* detecting if persistent close */ #define EVHTTP_CON_CLOSEDETECT 0x0004 /* detecting if persistent close */
#define EVHTTP_CON_AUTOFREE 0x0008 /* set when we want to auto free the connection */
struct timeval timeout; /* timeout for events */ struct timeval timeout; /* timeout for events */
int retry_cnt; /* retry count */ int retry_cnt; /* retry count */

33
http.c
View File

@ -769,6 +769,7 @@ evhttp_connection_done(struct evhttp_connection *evcon)
{ {
struct evhttp_request *req = TAILQ_FIRST(&evcon->requests); struct evhttp_request *req = TAILQ_FIRST(&evcon->requests);
int con_outgoing = evcon->flags & EVHTTP_CON_OUTGOING; int con_outgoing = evcon->flags & EVHTTP_CON_OUTGOING;
int free_evcon = 0;
if (con_outgoing) { if (con_outgoing) {
/* idle or close the connection */ /* idle or close the connection */
@ -801,6 +802,12 @@ evhttp_connection_done(struct evhttp_connection *evcon)
* need to detect if the other side closes it. * need to detect if the other side closes it.
*/ */
evhttp_connection_start_detectclose(evcon); evhttp_connection_start_detectclose(evcon);
} else if ((evcon->flags & EVHTTP_CON_AUTOFREE)) {
/*
* If we have no more requests that need completion
* and we're not waiting for the connection to close
*/
free_evcon = 1;
} }
} else { } else {
/* /*
@ -819,6 +826,16 @@ evhttp_connection_done(struct evhttp_connection *evcon)
if (con_outgoing && ((req->flags & EVHTTP_USER_OWNED) == 0)) { if (con_outgoing && ((req->flags & EVHTTP_USER_OWNED) == 0)) {
evhttp_request_free(req); evhttp_request_free(req);
} }
/* If this was the last request of an outgoing connection and we're
* not waiting to receive a connection close event and we want to
* automatically free the connection. We check to ensure our request
* list is empty one last time just in case our callback added a
* new request.
*/
if (free_evcon && TAILQ_FIRST(&evcon->requests) == NULL) {
evhttp_connection_free(evcon);
}
} }
/* /*
@ -1174,6 +1191,11 @@ evhttp_connection_free(struct evhttp_connection *evcon)
mm_free(evcon); mm_free(evcon);
} }
void
evhttp_connection_free_on_completion(struct evhttp_connection *evcon) {
evcon->flags |= EVHTTP_CON_AUTOFREE;
}
void void
evhttp_connection_set_local_address(struct evhttp_connection *evcon, evhttp_connection_set_local_address(struct evhttp_connection *evcon,
const char *address) const char *address)
@ -1385,6 +1407,17 @@ evhttp_error_cb(struct bufferevent *bufev, short what, void *arg)
*/ */
EVUTIL_ASSERT(evcon->state == EVCON_IDLE); EVUTIL_ASSERT(evcon->state == EVCON_IDLE);
evhttp_connection_reset_(evcon); evhttp_connection_reset_(evcon);
/*
* If we have no more requests that need completion
* and we want to auto-free the connection when all
* requests have been completed.
*/
if (TAILQ_FIRST(&evcon->requests) == NULL
&& (evcon->flags & EVHTTP_CON_OUTGOING)
&& (evcon->flags & EVHTTP_CON_AUTOFREE)) {
evhttp_connection_free(evcon);
}
return; return;
} }

8
include/event2/http.h
View File

@ -675,6 +675,14 @@ void evhttp_connection_set_max_body_size(struct evhttp_connection* evcon,
EVENT2_EXPORT_SYMBOL EVENT2_EXPORT_SYMBOL
void evhttp_connection_free(struct evhttp_connection *evcon); void evhttp_connection_free(struct evhttp_connection *evcon);
/** Disowns a given connection object
*
* Can be used to tell libevent to free the connection object after
* the last request has completed or failed.
*/
EVENT2_EXPORT_SYMBOL
void evhttp_connection_free_on_completion(struct evhttp_connection *evcon);
/** sets the ip address from which http connections are made */ /** sets the ip address from which http connections are made */
EVENT2_EXPORT_SYMBOL EVENT2_EXPORT_SYMBOL
void evhttp_connection_set_local_address(struct evhttp_connection *evcon, void evhttp_connection_set_local_address(struct evhttp_connection *evcon,