/* packet info */
pa_packet *packet;
#ifdef HAVE_CREDS
- pa_bool_t with_creds;
+ bool with_creds;
pa_creds creds;
#endif
pa_queue *send_queue;
- pa_bool_t dead;
+ bool dead;
struct {
union {
size_t index;
} read;
- pa_bool_t use_shm;
+ bool use_shm;
pa_memimport *import;
pa_memexport *export;
#ifdef HAVE_CREDS
pa_creds read_creds, write_creds;
- pa_bool_t read_creds_valid, send_creds_now;
+ bool read_creds_valid, send_creds_now;
#endif
};
} else if (!p->dead && pa_iochannel_is_hungup(p->io))
goto fail;
- if (!p->dead && pa_iochannel_is_writable(p->io)) {
- if (do_write(p) < 0)
+ while (!p->dead && pa_iochannel_is_writable(p->io)) {
+ int r = do_write(p);
+ if (r < 0)
goto fail;
+ if (r == 0)
+ break;
}
pa_pstream_unref(p);
pa_assert(io);
pa_assert(pool);
- p = pa_xnew(pa_pstream, 1);
+ p = pa_xnew0(pa_pstream, 1);
PA_REFCNT_INIT(p);
p->io = io;
pa_iochannel_set_callback(io, io_callback, p);
- p->dead = FALSE;
p->mainloop = m;
p->defer_event = m->defer_new(m, defer_callback, p);
p->send_queue = pa_queue_new();
- p->write.current = NULL;
- p->write.index = 0;
- pa_memchunk_reset(&p->write.memchunk);
- p->read.memblock = NULL;
- p->read.packet = NULL;
- p->read.index = 0;
-
- p->receive_packet_callback = NULL;
- p->receive_packet_callback_userdata = NULL;
- p->receive_memblock_callback = NULL;
- p->receive_memblock_callback_userdata = NULL;
- p->drain_callback = NULL;
- p->drain_callback_userdata = NULL;
- p->die_callback = NULL;
- p->die_callback_userdata = NULL;
- p->revoke_callback = NULL;
- p->revoke_callback_userdata = NULL;
- p->release_callback = NULL;
- p->release_callback_userdata = NULL;
-
p->mempool = pool;
- p->use_shm = FALSE;
- p->export = NULL;
-
/* We do importing unconditionally */
p->import = pa_memimport_new(p->mempool, memimport_release_cb, p);
pa_iochannel_socket_set_rcvbuf(io, pa_mempool_block_size_max(p->mempool));
pa_iochannel_socket_set_sndbuf(io, pa_mempool_block_size_max(p->mempool));
-#ifdef HAVE_CREDS
- p->send_creds_now = FALSE;
- p->read_creds_valid = FALSE;
-#endif
return p;
}
i->offset = offset;
i->seek_mode = seek_mode;
#ifdef HAVE_CREDS
- i->with_creds = FALSE;
+ i->with_creds = false;
#endif
pa_queue_push(p->send_queue, i);
item->type = PA_PSTREAM_ITEM_SHMRELEASE;
item->block_id = block_id;
#ifdef HAVE_CREDS
- item->with_creds = FALSE;
+ item->with_creds = false;
#endif
pa_queue_push(p->send_queue, item);
item->type = PA_PSTREAM_ITEM_SHMREVOKE;
item->block_id = block_id;
#ifdef HAVE_CREDS
- item->with_creds = FALSE;
+ item->with_creds = false;
#endif
pa_queue_push(p->send_queue, item);
} else {
uint32_t flags;
- pa_bool_t send_payload = TRUE;
+ bool send_payload = true;
pa_assert(p->write.current->type == PA_PSTREAM_ITEM_MEMBLOCK);
pa_assert(p->write.current->chunk.memblock);
&length) >= 0) {
flags |= PA_FLAG_SHMDATA;
- send_payload = FALSE;
+ send_payload = false;
shm_info[PA_PSTREAM_SHM_BLOCKID] = htonl(block_id);
shm_info[PA_PSTREAM_SHM_SHMID] = htonl(shm_id);
if ((r = pa_iochannel_write_with_creds(p->io, d, l, &p->write_creds)) < 0)
goto fail;
- p->send_creds_now = FALSE;
+ p->send_creds_now = false;
} else
#endif
p->drain_callback(p, p->drain_callback_userdata);
}
- return 0;
+ return (size_t) r == l ? 1 : 0;
fail:
#ifdef HAVE_CREDS
{
- pa_bool_t b = 0;
+ bool b = 0;
if ((r = pa_iochannel_read_with_creds(p->io, d, l, &p->read_creds, &b)) <= 0)
goto fail;
if ((flags & PA_FLAG_SHMMASK) == PA_FLAG_SHMDATA) {
if (length != sizeof(p->read.shm_info)) {
- pa_log_warn("Received SHM memblock frame with Invalid frame length.");
+ pa_log_warn("Received SHM memblock frame with invalid frame length.");
return -1;
}
p->read.data = NULL;
#ifdef HAVE_CREDS
- p->read_creds_valid = FALSE;
+ p->read_creds_valid = false;
#endif
return 0;
p->release_callback_userdata = userdata;
}
-pa_bool_t pa_pstream_is_pending(pa_pstream *p) {
- pa_bool_t b;
+bool pa_pstream_is_pending(pa_pstream *p) {
+ bool b;
pa_assert(p);
pa_assert(PA_REFCNT_VALUE(p) > 0);
if (p->dead)
- b = FALSE;
+ b = false;
else
b = p->write.current || !pa_queue_isempty(p->send_queue);
if (p->dead)
return;
- p->dead = TRUE;
+ p->dead = true;
if (p->import) {
pa_memimport_free(p->import);
p->receive_memblock_callback = NULL;
}
-void pa_pstream_enable_shm(pa_pstream *p, pa_bool_t enable) {
+void pa_pstream_enable_shm(pa_pstream *p, bool enable) {
pa_assert(p);
pa_assert(PA_REFCNT_VALUE(p) > 0);
}
}
-pa_bool_t pa_pstream_get_shm(pa_pstream *p) {
+bool pa_pstream_get_shm(pa_pstream *p) {
pa_assert(p);
pa_assert(PA_REFCNT_VALUE(p) > 0);