ioline: add new calls pa_ioline_detach_iochannel() and pa_ioline_is_drained()

This commit is contained in:
Lennart Poettering 2009-04-29 04:14:52 +02:00
parent a64097ab1f
commit c2150118bf
2 changed files with 31 additions and 2 deletions

View file

@ -283,7 +283,7 @@ static int do_read(pa_ioline *l) {
pa_assert(l);
pa_assert(PA_REFCNT_VALUE(l) >= 1);
while (!l->dead && pa_iochannel_is_readable(l->io)) {
while (l->io && !l->dead && pa_iochannel_is_readable(l->io)) {
ssize_t r;
size_t len;
@ -348,7 +348,7 @@ static int do_write(pa_ioline *l) {
pa_assert(l);
pa_assert(PA_REFCNT_VALUE(l) >= 1);
while (!l->dead && pa_iochannel_is_writable(l->io) && l->wbuf_valid_length) {
while (l->io && !l->dead && pa_iochannel_is_writable(l->io) && l->wbuf_valid_length > 0) {
if ((r = pa_iochannel_write(l->io, l->wbuf+l->wbuf_index, l->wbuf_valid_length)) <= 0) {
@ -443,3 +443,25 @@ void pa_ioline_printf(pa_ioline *l, const char *format, ...) {
pa_ioline_puts(l, t);
pa_xfree(t);
}
pa_iochannel* pa_ioline_detach_iochannel(pa_ioline *l) {
pa_iochannel *r;
pa_assert(l);
if (!l->io)
return NULL;
r = l->io;
l->io = NULL;
pa_iochannel_set_callback(r, NULL, NULL);
return r;
}
pa_bool_t pa_ioline_is_drained(pa_ioline *l) {
pa_assert(l);
return l->wbuf_valid_length <= 0;
}

View file

@ -54,4 +54,11 @@ void pa_ioline_set_drain_callback(pa_ioline*io, pa_ioline_drain_cb_t callback, v
/* Make sure to close the ioline object as soon as the send buffer is emptied */
void pa_ioline_defer_close(pa_ioline *io);
/* Returns TRUE when everything was written */
pa_bool_t pa_ioline_is_drained(pa_ioline *io);
/* Detaches from the iochannel and returns it. Data that has already
* been read will not be available in the detached iochannel */
pa_iochannel* pa_ioline_detach_iochannel(pa_ioline *l);
#endif