# HG changeset patch # User Thomas Harning Jr # Date 1295140314 18000 # Node ID 570e309a8d3e630ca191bf81fe3c8a7d7f2d1fee # Parent e2975977370502d95944455c954739b5b5c4a36e bufferevent unlearns read access to low-level timeout/watermark properties that appear shouldn't be exposed diff -r e29759773705 -r 570e309a8d3e doc/modules/luaevent.core.bufferevent.mdwn --- a/doc/modules/luaevent.core.bufferevent.mdwn Sat Jan 15 20:02:20 2011 -0500 +++ b/doc/modules/luaevent.core.bufferevent.mdwn Sat Jan 15 20:11:54 2011 -0500 @@ -43,24 +43,12 @@ * `low` - When buffer is below this, the event will be fired * `high` - N/A to libevent, user app may use this -## bufferevent:get_read_watermarks -* Output: `low, high` -* See `set_read_watermarks` - -## bufferevent:get_write_watermarks -* Output: `low, high` -* See `set_write_watermarks` - ## bufferevent:set_timeouts * Sets timeouts for the bufferevent's events * Input: `(read, write)` * `read` - Read readiness timeout * `write` - Write readiness timeout -## bufferevent:get_timeouts -* Output: `read, write` -* See `set_timeouts` - ## bufferevent:enable/disable * Input: `event flag` * `event flag` - `EV_READ`, `EV_WRITE`, or `EV_READ|EV_WRITE` diff -r e29759773705 -r 570e309a8d3e src/buffer_event.c --- a/src/buffer_event.c Sat Jan 15 20:02:20 2011 -0500 +++ b/src/buffer_event.c Sat Jan 15 20:11:54 2011 -0500 @@ -171,24 +171,6 @@ return 0; } -static int buffer_event_get_read_watermarks(lua_State* L) { - le_bufferevent* ev = buffer_event_get(L, 1); - if(!ev->ev) return 0; - - lua_pushinteger(L, ev->ev->wm_read.low); - lua_pushinteger(L, ev->ev->wm_read.high); - return 2; -} - -static int buffer_event_get_write_watermarks(lua_State* L) { - le_bufferevent* ev = buffer_event_get(L, 1); - if(!ev->ev) return 0; - - lua_pushinteger(L, ev->ev->wm_write.low); - lua_pushinteger(L, ev->ev->wm_write.high); - return 2; -} - static int buffer_event_set_timeouts(lua_State* L) { int timeout_read, timeout_write; le_bufferevent* ev = buffer_event_get(L, 1); @@ -201,20 +183,6 @@ return 0; } -static int buffer_event_get_timeouts(lua_State* L) { - le_bufferevent* ev = buffer_event_get(L, 1); - if(!ev->ev) return 0; - -#if LIBEVENT_VERSION_NUMBER >= 0x02000000 - lua_pushinteger(L, (ev->ev->timeout_read).tv_sec); - lua_pushinteger(L, (ev->ev->timeout_write).tv_sec); -#else - lua_pushinteger(L, ev->ev->timeout_read); - lua_pushinteger(L, ev->ev->timeout_write); -#endif - return 2; -} - static int buffer_event_enable(lua_State* L) { le_bufferevent* ev = buffer_event_get(L, 1); if(!ev->ev) return 0; @@ -236,10 +204,7 @@ {"get_write", buffer_event_get_write}, {"set_read_watermarks", buffer_event_set_read_watermarks}, {"set_write_watermarks", buffer_event_set_write_watermarks}, - {"get_read_watermarks", buffer_event_get_read_watermarks}, - {"get_write_watermarks", buffer_event_get_write_watermarks}, {"set_timeouts", buffer_event_set_timeouts}, - {"get_timeouts", buffer_event_get_timeouts}, {"enable", buffer_event_enable}, {"disable", buffer_event_disable}, {NULL, NULL}