cuberite/libevent
1
0
Fork 0
mirror of https://github.com/cuberite/libevent.git synced 2025-09-09 20:41:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Followup for Tomash Brechko's http patch

Browse Source 
This patch makes bufferevent_disable_hard() non-public, and
adds a comment about what it's for and why it's used.
This commit is contained in:
Nick Mathewson 2011-03-07 21:55:47 -05:00
parent 5dc566284d
commit c8baac9023
3 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
bufferevent-internal.h
View File

@ -36,6 +36,7 @@ extern "C" {
#include "evthread-internal.h" #include "evthread-internal.h"
#include "event2/thread.h" #include "event2/thread.h"
#include "ratelim-internal.h" #include "ratelim-internal.h"
#include "event2/bufferevent_struct.h"
/* These flags are reasons that we might be declining to actually enable /* These flags are reasons that we might be declining to actually enable
reading or writing on a bufferevent. reading or writing on a bufferevent.
@ -287,6 +288,20 @@ void bufferevent_unsuspend_write(struct bufferevent *bufev, bufferevent_suspend_
#define bufferevent_wm_unsuspend_read(b) \ #define bufferevent_wm_unsuspend_read(b) \
bufferevent_unsuspend_read((b), BEV_SUSPEND_WM) bufferevent_unsuspend_read((b), BEV_SUSPEND_WM)
/*
Disable a bufferevent. Equivalent to bufferevent_disable(), but
first resets 'connecting' flag to force EV_WRITE down for sure.
XXXX this method will go away in the future; try not to add new users.
See comment in evhttp_connection_reset() for discussion.
@param bufev the bufferevent to be disabled
@param event any combination of EV_READ | EV_WRITE.
@return 0 if successful, or -1 if an error occurred
@see bufferevent_disable()
*/
int bufferevent_disable_hard(struct bufferevent *bufev, short event);
/** Internal: Set up locking on a bufferevent. If lock is set, use it. /** Internal: Set up locking on a bufferevent. If lock is set, use it.
* Otherwise, use a new lock. */ * Otherwise, use a new lock. */
int bufferevent_enable_locking(struct bufferevent *bufev, void *lock); int bufferevent_enable_locking(struct bufferevent *bufev, void *lock);

12
http.c
View File

@ -100,6 +100,7 @@
#include "util-internal.h" #include "util-internal.h"
#include "http-internal.h" #include "http-internal.h"
#include "mm-internal.h" #include "mm-internal.h"
#include "bufferevent-internal.h"
#ifndef _EVENT_HAVE_GETNAMEINFO #ifndef _EVENT_HAVE_GETNAMEINFO
#define NI_MAXSERV 32 #define NI_MAXSERV 32
@ -1156,6 +1157,17 @@ evhttp_connection_reset(struct evhttp_connection *evcon)
{ {
struct evbuffer *tmp; struct evbuffer *tmp;
/* XXXX This is not actually an optimal fix. Instead we ought to have
an API for "stop connecting", or use bufferevent_setfd to turn off
connecting. But for Libevent 2.0, this seems like a minimal change
least likely to disrupt the rest of the bufferevent and http code.
Why is this here? If the fd is set in the bufferevent, and the
bufferevent is connecting, then you can't actually stop the
bufferevent from trying to connect with bufferevent_disable(). The
connect will never trigger, since we close the fd, but the timeout
might. That caused an assertion failure in evhttp_connection_fail.
*/
bufferevent_disable_hard(evcon->bufev, EV_READ|EV_WRITE); bufferevent_disable_hard(evcon->bufev, EV_READ|EV_WRITE);
if (evcon->fd != -1) { if (evcon->fd != -1) {

13
include/event2/bufferevent.h
View File

@ -374,19 +374,6 @@ int bufferevent_enable(struct bufferevent *bufev, short event);
*/ */
int bufferevent_disable(struct bufferevent *bufev, short event); int bufferevent_disable(struct bufferevent *bufev, short event);
/**
Disable a bufferevent. Equivalent to bufferevent_disable(), but
first resets 'connecting' flag to force EV_WRITE down for sure.
@param bufev the bufferevent to be disabled
@param event any combination of EV_READ | EV_WRITE.
@return 0 if successful, or -1 if an error occurred
@see bufferevent_disable()
*/
int bufferevent_disable_hard(struct bufferevent *bufev, short event);
/** /**
Return the events that are enabled on a given bufferevent. Return the events that are enabled on a given bufferevent.