diff options
Diffstat (limited to 'buffer_iocp.c')
-rw-r--r-- | buffer_iocp.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/buffer_iocp.c b/buffer_iocp.c index 7d5f230d..7ad41028 100644 --- a/buffer_iocp.c +++ b/buffer_iocp.c @@ -88,7 +88,7 @@ pin_release(struct evbuffer_overlapped *eo, unsigned flag) for (i = 0; i < eo->n_buffers; ++i) { EVUTIL_ASSERT(chain); next = chain->next; - _evbuffer_chain_unpin(chain, flag); + evbuffer_chain_unpin_(chain, flag); chain = next; } } @@ -131,7 +131,7 @@ evbuffer_commit_read(struct evbuffer *evbuf, ev_ssize_t nBytes) evbuffer_invoke_callbacks(evbuf); - _evbuffer_decref_and_unlock(evbuf); + evbuffer_decref_and_unlock_(evbuf); } void @@ -145,7 +145,7 @@ evbuffer_commit_write(struct evbuffer *evbuf, ev_ssize_t nBytes) evbuffer_drain(evbuf, nBytes); pin_release(buf,EVBUFFER_MEM_PINNED_W); buf->write_in_progress = 0; - _evbuffer_decref_and_unlock(evbuf); + evbuffer_decref_and_unlock_(evbuf); } struct evbuffer * @@ -204,7 +204,7 @@ evbuffer_launch_write(struct evbuffer *buf, ev_ssize_t at_most, for (i=0; i < MAX_WSABUFS && chain; ++i, chain=chain->next) { WSABUF *b = &buf_o->buffers[i]; b->buf = (char*)( chain->buffer + chain->misalign ); - _evbuffer_chain_pin(chain, EVBUFFER_MEM_PINNED_W); + evbuffer_chain_pin_(chain, EVBUFFER_MEM_PINNED_W); if ((size_t)at_most > chain->off) { /* XXXX Cast is safe for now, since win32 has no @@ -221,7 +221,7 @@ evbuffer_launch_write(struct evbuffer *buf, ev_ssize_t at_most, } buf_o->n_buffers = i; - _evbuffer_incref(buf); + evbuffer_incref_(buf); if (WSASend(buf_o->fd, buf_o->buffers, i, &bytesSent, 0, &ol->overlapped, NULL)) { int error = WSAGetLastError(); @@ -265,11 +265,11 @@ evbuffer_launch_read(struct evbuffer *buf, size_t at_most, buf_o->n_buffers = 0; memset(buf_o->buffers, 0, sizeof(buf_o->buffers)); - if (_evbuffer_expand_fast(buf, at_most, MAX_WSABUFS) == -1) + if (evbuffer_expand_fast_(buf, at_most, MAX_WSABUFS) == -1) goto done; evbuffer_freeze(buf, 0); - nvecs = _evbuffer_read_setup_vecs(buf, at_most, + nvecs = evbuffer_read_setup_vecs_(buf, at_most, vecs, MAX_WSABUFS, &chainp, 1); for (i=0;i<nvecs;++i) { WSABUF_FROM_EVBUFFER_IOV( @@ -282,12 +282,12 @@ evbuffer_launch_read(struct evbuffer *buf, size_t at_most, npin=0; for ( ; chain; chain = chain->next) { - _evbuffer_chain_pin(chain, EVBUFFER_MEM_PINNED_R); + evbuffer_chain_pin_(chain, EVBUFFER_MEM_PINNED_R); ++npin; } EVUTIL_ASSERT(npin == nvecs); - _evbuffer_incref(buf); + evbuffer_incref_(buf); if (WSARecv(buf_o->fd, buf_o->buffers, nvecs, &bytesRead, &flags, &ol->overlapped, NULL)) { int error = WSAGetLastError(); @@ -308,14 +308,14 @@ done: } evutil_socket_t -_evbuffer_overlapped_get_fd(struct evbuffer *buf) +evbuffer_overlapped_get_fd_(struct evbuffer *buf) { struct evbuffer_overlapped *buf_o = upcast_evbuffer(buf); return buf_o ? buf_o->fd : -1; } void -_evbuffer_overlapped_set_fd(struct evbuffer *buf, evutil_socket_t fd) +evbuffer_overlapped_set_fd_(struct evbuffer *buf, evutil_socket_t fd) { struct evbuffer_overlapped *buf_o = upcast_evbuffer(buf); EVBUFFER_LOCK(buf); |