mirror of
https://gitlab.freedesktop.org/pipewire/pipewire.git
synced 2025-11-16 07:00:00 -05:00
Optimize transport some more
We can optimize the transport some more if we allow the host to configure the area used for transfering buffers. We can then also place the current status in the area and avoid calling get_status(). We can also allocate this area in shared memory, avoiding a memcpy in the client-node.
This commit is contained in:
Wim Taymans
parent
b774b99db5
commit
e88a376d7c
21 changed files with 903 additions and 989 deletions
|
|
@ -668,7 +668,9 @@ static inline void
|
|||
send_need_input (PinosStream *stream)
|
||||
{
|
||||
PinosStreamPrivate *priv = stream->priv;
|
||||
pinos_transport_write_cmd (priv->trans, PINOS_TRANSPORT_CMD_NEED_DATA);
|
||||
uint8_t cmd = PINOS_TRANSPORT_CMD_NEED_DATA;
|
||||
write (priv->rtfd, &cmd, 1);
|
||||
|
||||
}
|
||||
|
||||
static void
|
||||
|
|
@ -1068,7 +1070,6 @@ parse_connection (PinosStream *stream)
|
|||
break;
|
||||
info.offset = p.offset;
|
||||
info.size = p.size;
|
||||
info.fd = priv->rtfd;
|
||||
|
||||
pinos_log_debug ("transport update %d %p", priv->rtfd, priv->trans);
|
||||
|
||||
|
|
@ -1165,24 +1166,24 @@ on_rtsocket_condition (GSocket *socket,
|
|||
uint8_t cmd;
|
||||
int i;
|
||||
|
||||
pinos_transport_read_cmd (priv->trans, &cmd);
|
||||
read (priv->rtfd, &cmd, 1);
|
||||
|
||||
if (cmd & PINOS_TRANSPORT_CMD_HAVE_DATA) {
|
||||
BufferId *bid;
|
||||
|
||||
for (i = 0; i < priv->trans->area->n_input_info; i++) {
|
||||
SpaPortInputInfo *info = &priv->trans->input_info[i];
|
||||
for (i = 0; i < priv->trans->area->n_inputs; i++) {
|
||||
SpaPortInput *input = &priv->trans->inputs[i];
|
||||
|
||||
if (info->buffer_id == SPA_ID_INVALID)
|
||||
if (input->buffer_id == SPA_ID_INVALID)
|
||||
continue;
|
||||
|
||||
if ((bid = find_buffer (stream, info->buffer_id))) {
|
||||
if ((bid = find_buffer (stream, input->buffer_id))) {
|
||||
for (i = 0; i < bid->buf->n_datas; i++) {
|
||||
bid->buf->datas[i].size = bid->datas[i].size;
|
||||
}
|
||||
g_signal_emit (stream, signals[SIGNAL_NEW_BUFFER], 0, bid->id);
|
||||
}
|
||||
info->buffer_id = SPA_ID_INVALID;
|
||||
input->buffer_id = SPA_ID_INVALID;
|
||||
}
|
||||
send_need_input (stream);
|
||||
}
|
||||
|
|
@ -1804,6 +1805,7 @@ pinos_stream_recycle_buffer (PinosStream *stream,
|
|||
{
|
||||
PinosStreamPrivate *priv;
|
||||
SpaNodeEventReuseBuffer rb;
|
||||
uint8_t cmd = PINOS_TRANSPORT_CMD_HAVE_EVENT;
|
||||
|
||||
g_return_val_if_fail (PINOS_IS_STREAM (stream), FALSE);
|
||||
g_return_val_if_fail (id != SPA_ID_INVALID, FALSE);
|
||||
|
|
@ -1815,7 +1817,7 @@ pinos_stream_recycle_buffer (PinosStream *stream,
|
|||
rb.port_id = priv->port_id;
|
||||
rb.buffer_id = id;
|
||||
pinos_transport_add_event (priv->trans, &rb.event);
|
||||
pinos_transport_write_cmd (priv->trans, PINOS_TRANSPORT_CMD_HAVE_EVENT);
|
||||
write (priv->rtfd, &cmd, 1);
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
|
@ -1871,13 +1873,15 @@ pinos_stream_send_buffer (PinosStream *stream,
|
|||
g_return_val_if_fail (priv->direction == SPA_DIRECTION_OUTPUT, FALSE);
|
||||
|
||||
if ((bid = find_buffer (stream, id))) {
|
||||
uint8_t cmd = PINOS_TRANSPORT_CMD_HAVE_DATA;
|
||||
|
||||
bid->used = TRUE;
|
||||
for (i = 0; i < bid->buf->n_datas; i++) {
|
||||
bid->datas[i].size = bid->buf->datas[i].size;
|
||||
}
|
||||
priv->trans->output_info[0].buffer_id = id;
|
||||
priv->trans->output_info[0].status = SPA_RESULT_OK;
|
||||
pinos_transport_write_cmd (priv->trans, PINOS_TRANSPORT_CMD_HAVE_DATA);
|
||||
priv->trans->outputs[0].buffer_id = id;
|
||||
priv->trans->outputs[0].status = SPA_RESULT_OK;
|
||||
write (priv->rtfd, &cmd, 1);
|
||||
return TRUE;
|
||||
} else {
|
||||
return FALSE;
|
||||
|
|
|
|||
|
|
@ -45,8 +45,8 @@ transport_area_get_size (PinosTransportArea *area)
|
|||
{
|
||||
size_t size;
|
||||
size = sizeof (PinosTransportArea);
|
||||
size += area->max_input_info * sizeof (SpaPortInputInfo);
|
||||
size += area->max_output_info * sizeof (SpaPortOutputInfo);
|
||||
size += area->max_inputs * sizeof (SpaPortInput);
|
||||
size += area->max_outputs * sizeof (SpaPortOutput);
|
||||
size += sizeof (SpaRingbuffer);
|
||||
size += INPUT_BUFFER_SIZE;
|
||||
size += sizeof (SpaRingbuffer);
|
||||
|
|
@ -60,13 +60,13 @@ transport_setup_area (void *p, PinosTransport *trans)
|
|||
PinosTransportArea *a;
|
||||
|
||||
trans->area = a = p;
|
||||
p = SPA_MEMBER (p, sizeof (PinosTransportArea), SpaPortInputInfo);
|
||||
p = SPA_MEMBER (p, sizeof (PinosTransportArea), SpaPortInput);
|
||||
|
||||
trans->input_info = p;
|
||||
p = SPA_MEMBER (p, a->max_input_info * sizeof (SpaPortInputInfo), void);
|
||||
trans->inputs = p;
|
||||
p = SPA_MEMBER (p, a->max_inputs * sizeof (SpaPortInput), void);
|
||||
|
||||
trans->output_info = p;
|
||||
p = SPA_MEMBER (p, a->max_output_info * sizeof (SpaPortOutputInfo), void);
|
||||
trans->outputs = p;
|
||||
p = SPA_MEMBER (p, a->max_outputs * sizeof (SpaPortOutput), void);
|
||||
|
||||
trans->input_buffer = p;
|
||||
spa_ringbuffer_init (trans->input_buffer, INPUT_BUFFER_SIZE);
|
||||
|
|
@ -84,24 +84,22 @@ transport_setup_area (void *p, PinosTransport *trans)
|
|||
}
|
||||
|
||||
PinosTransport *
|
||||
pinos_transport_new (unsigned int max_input_info,
|
||||
unsigned int max_output_info,
|
||||
int fd)
|
||||
pinos_transport_new (unsigned int max_inputs,
|
||||
unsigned int max_outputs)
|
||||
{
|
||||
PinosTransportImpl *impl;
|
||||
PinosTransport *trans;
|
||||
PinosTransportArea area;
|
||||
|
||||
area.max_input_info = max_input_info;
|
||||
area.n_input_info = 0;
|
||||
area.max_output_info = max_output_info;
|
||||
area.n_output_info = 0;
|
||||
area.max_inputs = max_inputs;
|
||||
area.n_inputs = 0;
|
||||
area.max_outputs = max_outputs;
|
||||
area.n_outputs = 0;
|
||||
|
||||
impl = calloc (1, sizeof (PinosTransportImpl));
|
||||
impl->offset = 0;
|
||||
|
||||
trans = &impl->trans;
|
||||
trans->fd = fd;
|
||||
|
||||
pinos_memblock_alloc (PINOS_MEMBLOCK_FLAG_WITH_FD |
|
||||
PINOS_MEMBLOCK_FLAG_MAP_READWRITE |
|
||||
|
|
@ -127,7 +125,6 @@ pinos_transport_new_from_info (PinosTransportInfo *info)
|
|||
|
||||
impl = calloc (1, sizeof (PinosTransportImpl));
|
||||
trans = &impl->trans;
|
||||
trans->fd = info->fd;
|
||||
|
||||
impl->mem.flags = PINOS_MEMBLOCK_FLAG_MAP_READWRITE |
|
||||
PINOS_MEMBLOCK_FLAG_WITH_FD;
|
||||
|
|
@ -159,8 +156,6 @@ pinos_transport_free (PinosTransport *trans)
|
|||
return;
|
||||
|
||||
pinos_memblock_free (&impl->mem);
|
||||
if (trans->fd != -1)
|
||||
close (trans->fd);
|
||||
free (impl);
|
||||
}
|
||||
|
||||
|
|
@ -176,7 +171,6 @@ pinos_transport_get_info (PinosTransport *trans,
|
|||
info->memfd = impl->mem.fd;
|
||||
info->offset = impl->offset;
|
||||
info->size = impl->mem.size;
|
||||
info->fd = trans->fd;
|
||||
|
||||
return SPA_RESULT_OK;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -46,30 +46,27 @@ typedef struct {
|
|||
int memfd;
|
||||
off_t offset;
|
||||
size_t size;
|
||||
int fd;
|
||||
} PinosTransportInfo;
|
||||
|
||||
struct _PinosTransportArea {
|
||||
unsigned int max_input_info;
|
||||
unsigned int n_input_info;
|
||||
unsigned int max_output_info;
|
||||
unsigned int n_output_info;
|
||||
unsigned int max_inputs;
|
||||
unsigned int n_inputs;
|
||||
unsigned int max_outputs;
|
||||
unsigned int n_outputs;
|
||||
};
|
||||
|
||||
struct _PinosTransport {
|
||||
PinosTransportArea *area;
|
||||
SpaPortInputInfo *input_info;
|
||||
SpaPortOutputInfo *output_info;
|
||||
SpaPortInput *inputs;
|
||||
SpaPortOutput *outputs;
|
||||
void *input_data;
|
||||
SpaRingbuffer *input_buffer;
|
||||
void *output_data;
|
||||
SpaRingbuffer *output_buffer;
|
||||
int fd;
|
||||
};
|
||||
|
||||
PinosTransport * pinos_transport_new (unsigned int max_input_info,
|
||||
unsigned int max_output_info,
|
||||
int fd);
|
||||
PinosTransport * pinos_transport_new (unsigned int max_inputs,
|
||||
unsigned int max_outputs);
|
||||
PinosTransport * pinos_transport_new_from_info (PinosTransportInfo *info);
|
||||
|
||||
void pinos_transport_free (PinosTransport *trans);
|
||||
|
|
@ -85,29 +82,6 @@ SpaResult pinos_transport_next_event (PinosTransport *trans,
|
|||
SpaResult pinos_transport_parse_event (PinosTransport *trans,
|
||||
void *event);
|
||||
|
||||
static inline void
|
||||
pinos_transport_write_cmd (PinosTransport *trans,
|
||||
uint8_t cmd)
|
||||
{
|
||||
write (trans->fd, &cmd, 1);
|
||||
}
|
||||
|
||||
static inline void
|
||||
pinos_transport_read_cmd (PinosTransport *trans,
|
||||
uint8_t *cmd)
|
||||
{
|
||||
read (trans->fd, cmd, 1);
|
||||
}
|
||||
|
||||
static inline void
|
||||
pinos_transport_sync_cmd (PinosTransport *trans,
|
||||
uint8_t out_cmd,
|
||||
uint8_t *in_cmd)
|
||||
{
|
||||
write (trans->fd, &out_cmd, 1);
|
||||
read (trans->fd, in_cmd, 1);
|
||||
}
|
||||
|
||||
#ifdef __cplusplus
|
||||
} /* extern "C" */
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue