frederik
/
libxcb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Coalesce _xcb_writev into _xcb_out_write and simplify.

This commit is contained in:
Jamey Sharp 2006-02-24 02:17:36 -08:00
parent 9463653b1e
commit f27166f49b
1 changed files with 19 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/xcb_out.c
View File

@ -58,28 +58,6 @@ static int force_sequence_wrap(XCBConnection *c)
return ret; return ret;
} }
static int _xcb_writev(const int fd, struct iovec *vec, int count)
{
int n = writev(fd, vec, count);
if(n > 0)
{
int rem = n;
for(; count; --count, ++vec)
{
int cur = vec->iov_len;
if(cur > rem)
cur = rem;
vec->iov_len -= cur;
vec->iov_base = (char *) vec->iov_base + cur;
rem -= cur;
if(vec->iov_len)
break;
}
assert(rem == 0);
}
return n;
}
/* Public interface */ /* Public interface */
CARD32 XCBGetMaximumRequestLength(XCBConnection *c) CARD32 XCBGetMaximumRequestLength(XCBConnection *c)
@ -251,12 +229,27 @@ int _xcb_out_write(XCBConnection *c)
{ {
int n; int n;
assert(!c->out.queue_len); assert(!c->out.queue_len);
n = _xcb_writev(c->fd, c->out.vec, c->out.vec_len); n = writev(c->fd, c->out.vec, c->out.vec_len);
while(c->out.vec_len && !c->out.vec[0].iov_len) if(n < 0 && errno == EAGAIN)
++c->out.vec, --c->out.vec_len; return 1;
if(n <= 0)
return 0;
for(; c->out.vec_len; --c->out.vec_len, ++c->out.vec)
{
int cur = c->out.vec->iov_len;
if(cur > n)
cur = n;
c->out.vec->iov_len -= cur;
c->out.vec->iov_base = (char *) c->out.vec->iov_base + cur;
n -= cur;
if(c->out.vec->iov_len)
break;
}
if(!c->out.vec_len) if(!c->out.vec_len)
c->out.vec = 0; c->out.vec = 0;
return (n > 0) || (n < 0 && errno == EAGAIN); assert(n == 0);
return 1;
} }
int _xcb_out_write_block(XCBConnection *c, struct iovec *vector, size_t count) int _xcb_out_write_block(XCBConnection *c, struct iovec *vector, size_t count)