move things around

This commit is contained in:
Wim Taymans 2017-07-11 15:57:20 +02:00
parent 847cef83b6
commit d1655196c3
130 changed files with 363 additions and 335 deletions

View file

@ -0,0 +1,529 @@
/* PipeWire
* Copyright (C) 2016 Wim Taymans <wim.taymans@gmail.com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
* License along with this library; if not, write to the
* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
* Boston, MA 02110-1301, USA.
*/
#include <stdint.h>
#include <stddef.h>
#include <stdio.h>
#include <string.h>
#include <errno.h>
#include <unistd.h>
#include <sys/socket.h>
#include <spa/lib/debug.h>
#include <pipewire/pipewire.h>
#include "connection.h"
/** \cond */
#define MAX_BUFFER_SIZE (1024 * 32)
#define MAX_FDS 28
static bool debug_messages = 0;
struct buffer {
uint8_t *buffer_data;
size_t buffer_size;
size_t buffer_maxsize;
int fds[MAX_FDS];
uint32_t n_fds;
off_t offset;
void *data;
size_t size;
bool update;
};
struct impl {
struct pw_connection this;
struct buffer in, out;
uint32_t dest_id;
uint8_t opcode;
struct spa_pod_builder builder;
};
/** \endcond */
/** Get an fd from a connection
*
* \param conn the connection
* \param index the index of the fd to get
* \return the fd at \a index or -1 when no such fd exists
*
* \memberof pw_connection
*/
int pw_connection_get_fd(struct pw_connection *conn, uint32_t index)
{
struct impl *impl = SPA_CONTAINER_OF(conn, struct impl, this);
if (index < 0 || index >= impl->in.n_fds)
return -1;
return impl->in.fds[index];
}
/** Add an fd to a connection
*
* \param conn the connection
* \param fd the fd to add
* \return the index of the fd or -1 when an error occured
*
* \memberof pw_connection
*/
uint32_t pw_connection_add_fd(struct pw_connection *conn, int fd)
{
struct impl *impl = SPA_CONTAINER_OF(conn, struct impl, this);
uint32_t index, i;
for (i = 0; i < impl->out.n_fds; i++) {
if (impl->out.fds[i] == fd)
return i;
}
index = impl->out.n_fds;
if (index >= MAX_FDS) {
pw_log_error("connection %p: too many fds", conn);
return -1;
}
impl->out.fds[index] = fd;
impl->out.n_fds++;
return index;
}
static void *connection_ensure_size(struct pw_connection *conn, struct buffer *buf, size_t size)
{
if (buf->buffer_size + size > buf->buffer_maxsize) {
buf->buffer_maxsize = SPA_ROUND_UP_N(buf->buffer_size + size, MAX_BUFFER_SIZE);
buf->buffer_data = realloc(buf->buffer_data, buf->buffer_maxsize);
pw_log_warn("connection %p: resize buffer to %zd %zd %zd",
conn, buf->buffer_size, size, buf->buffer_maxsize);
}
return (uint8_t *) buf->buffer_data + buf->buffer_size;
}
static bool refill_buffer(struct pw_connection *conn, struct buffer *buf)
{
ssize_t len;
struct cmsghdr *cmsg;
struct msghdr msg = { 0 };
struct iovec iov[1];
char cmsgbuf[CMSG_SPACE(MAX_FDS * sizeof(int))];
iov[0].iov_base = buf->buffer_data + buf->buffer_size;
iov[0].iov_len = buf->buffer_maxsize - buf->buffer_size;
msg.msg_iov = iov;
msg.msg_iovlen = 1;
msg.msg_control = cmsgbuf;
msg.msg_controllen = sizeof(cmsgbuf);
msg.msg_flags = MSG_CMSG_CLOEXEC;
while (true) {
len = recvmsg(conn->fd, &msg, msg.msg_flags);
if (len < 0) {
if (errno == EINTR)
continue;
else
goto recv_error;
}
break;
}
buf->buffer_size += len;
/* handle control messages */
for (cmsg = CMSG_FIRSTHDR(&msg); cmsg != NULL; cmsg = CMSG_NXTHDR(&msg, cmsg)) {
if (cmsg->cmsg_level != SOL_SOCKET || cmsg->cmsg_type != SCM_RIGHTS)
continue;
buf->n_fds =
(cmsg->cmsg_len - ((char *) CMSG_DATA(cmsg) - (char *) cmsg)) / sizeof(int);
memcpy(buf->fds, CMSG_DATA(cmsg), buf->n_fds * sizeof(int));
}
pw_log_trace("connection %p: %d read %zd bytes and %d fds", conn, conn->fd, len,
buf->n_fds);
return true;
/* ERRORS */
recv_error:
pw_log_error("could not recvmsg on fd %d: %s", conn->fd, strerror(errno));
return false;
}
static void clear_buffer(struct buffer *buf)
{
buf->n_fds = 0;
buf->offset = 0;
buf->size = 0;
buf->buffer_size = 0;
}
/** Make a new connection object for the given socket
*
* \param fd the socket
* \returns a newly allocated connection object
*
* \memberof pw_connection
*/
struct pw_connection *pw_connection_new(int fd)
{
struct impl *impl;
struct pw_connection *this;
impl = calloc(1, sizeof(struct impl));
if (impl == NULL)
return NULL;
debug_messages = pw_debug_is_category_enabled("connection");
this = &impl->this;
pw_log_debug("connection %p: new", this);
this->fd = fd;
pw_signal_init(&this->need_flush);
pw_signal_init(&this->destroy_signal);
impl->out.buffer_data = malloc(MAX_BUFFER_SIZE);
impl->out.buffer_maxsize = MAX_BUFFER_SIZE;
impl->in.buffer_data = malloc(MAX_BUFFER_SIZE);
impl->in.buffer_maxsize = MAX_BUFFER_SIZE;
impl->in.update = true;
if (impl->out.buffer_data == NULL || impl->in.buffer_data == NULL)
goto no_mem;
return this;
no_mem:
free(impl->out.buffer_data);
free(impl->in.buffer_data);
free(impl);
return NULL;
}
/** Destroy a connection
*
* \param conn the connection to destroy
*
* \memberof pw_connection
*/
void pw_connection_destroy(struct pw_connection *conn)
{
struct impl *impl = SPA_CONTAINER_OF(conn, struct impl, this);
pw_log_debug("connection %p: destroy", conn);
pw_signal_emit(&conn->destroy_signal, conn);
free(impl->out.buffer_data);
free(impl->in.buffer_data);
free(impl);
}
/** Move to the next packet in the connection
*
* \param conn the connection
* \param opcode addres of result opcode
* \param dest_id addres of result destination id
* \param dt pointer to packet data
* \param sz size of packet data
* \return true on success
*
* Get the next packet in \a conn and store the opcode and destination
* id as well as the packet data and size.
*
* \memberof pw_connection
*/
bool
pw_connection_get_next(struct pw_connection *conn,
uint8_t *opcode,
uint32_t *dest_id,
void **dt,
uint32_t *sz)
{
struct impl *impl = SPA_CONTAINER_OF(conn, struct impl, this);
size_t len, size;
uint8_t *data;
struct buffer *buf;
uint32_t *p;
buf = &impl->in;
/* move to next packet */
buf->offset += buf->size;
again:
if (buf->update) {
if (!refill_buffer(conn, buf))
return false;
buf->update = false;
}
/* now read packet */
data = buf->buffer_data;
size = buf->buffer_size;
if (buf->offset >= size) {
clear_buffer(buf);
buf->update = true;
return false;
}
data += buf->offset;
size -= buf->offset;
if (size < 8) {
connection_ensure_size(conn, buf, 8);
buf->update = true;
goto again;
}
p = (uint32_t *) data;
data += 8;
size -= 8;
*dest_id = p[0];
*opcode = p[1] >> 24;
len = p[1] & 0xffffff;
if (len > size) {
connection_ensure_size(conn, buf, len);
buf->update = true;
goto again;
}
buf->size = len;
buf->data = data;
buf->offset += 8;
*dt = buf->data;
*sz = buf->size;
if (debug_messages) {
printf("<<<<<<<<< in:\n");
spa_debug_pod((struct spa_pod *)data);
}
return true;
}
static inline void *begin_write(struct pw_connection *conn, uint32_t size)
{
struct impl *impl = SPA_CONTAINER_OF(conn, struct impl, this);
uint32_t *p;
struct buffer *buf = &impl->out;
/* 4 for dest_id, 1 for opcode, 3 for size and size for payload */
p = connection_ensure_size(conn, buf, 8 + size);
return p + 2;
}
static uint32_t write_pod(struct spa_pod_builder *b, uint32_t ref, const void *data, uint32_t size)
{
struct impl *impl = SPA_CONTAINER_OF(b, struct impl, builder);
if (ref == -1)
ref = b->offset;
if (b->size <= b->offset) {
b->size = SPA_ROUND_UP_N(b->offset + size, 4096);
b->data = begin_write(&impl->this, b->size);
}
memcpy(b->data + ref, data, size);
return ref;
}
struct spa_pod_builder *
pw_connection_begin_write_resource(struct pw_connection *conn,
struct pw_resource *resource,
uint8_t opcode)
{
struct impl *impl = SPA_CONTAINER_OF(conn, struct impl, this);
uint32_t diff, base, i, b;
struct pw_client *client = resource->client;
struct pw_core *core = client->core;
const char **types;
base = client->n_types;
diff = spa_type_map_get_size(core->type.map) - base;
if (diff > 0) {
types = alloca(diff * sizeof(char *));
for (i = 0, b = base; i < diff; i++, b++)
types[i] = spa_type_map_get_type(core->type.map, b);
client->n_types += diff;
pw_core_notify_update_types(client->core_resource, base, diff, types);
}
impl->dest_id = resource->id;
impl->opcode = opcode;
impl->builder = (struct spa_pod_builder) { NULL, 0, 0, NULL, write_pod };
return &impl->builder;
}
struct spa_pod_builder *
pw_connection_begin_write_proxy(struct pw_connection *conn,
struct pw_proxy *proxy,
uint8_t opcode)
{
struct impl *impl = SPA_CONTAINER_OF(conn, struct impl, this);
uint32_t diff, base, i, b;
const char **types;
struct pw_remote *remote = proxy->remote;
struct pw_core *core = remote->core;
base = remote->n_types;
diff = spa_type_map_get_size(core->type.map) - base;
if (diff > 0) {
types = alloca(diff * sizeof(char *));
for (i = 0, b = base; i < diff; i++, b++)
types[i] = spa_type_map_get_type(core->type.map, b);
remote->n_types += diff;
pw_core_do_update_types(remote->core_proxy, base, diff, types);
}
impl->dest_id = proxy->id;
impl->opcode = opcode;
impl->builder = (struct spa_pod_builder) { NULL, 0, 0, NULL, write_pod };
return &impl->builder;
}
void
pw_connection_end_write(struct pw_connection *conn,
struct spa_pod_builder *builder)
{
struct impl *impl = SPA_CONTAINER_OF(conn, struct impl, this);
uint32_t *p, size = builder->offset;
struct buffer *buf = &impl->out;
p = connection_ensure_size(conn, buf, 8 + size);
*p++ = impl->dest_id;
*p++ = (impl->opcode << 24) | (size & 0xffffff);
buf->buffer_size += 8 + size;
if (debug_messages) {
printf(">>>>>>>>> out:\n");
spa_debug_pod((struct spa_pod *)p);
}
pw_signal_emit(&conn->need_flush, conn);
}
/** Flush the connection object
*
* \param conn the connection object
* \return true on success
*
* Write the queued messages on the connection to the socket
*
* \memberof pw_connection
*/
bool pw_connection_flush(struct pw_connection *conn)
{
struct impl *impl = SPA_CONTAINER_OF(conn, struct impl, this);
ssize_t len;
struct msghdr msg = { 0 };
struct iovec iov[1];
struct cmsghdr *cmsg;
char cmsgbuf[CMSG_SPACE(MAX_FDS * sizeof(int))];
int *cm, i, fds_len;
struct buffer *buf;
buf = &impl->out;
if (buf->buffer_size == 0)
return true;
fds_len = buf->n_fds * sizeof(int);
iov[0].iov_base = buf->buffer_data;
iov[0].iov_len = buf->buffer_size;
msg.msg_iov = iov;
msg.msg_iovlen = 1;
if (buf->n_fds > 0) {
msg.msg_control = cmsgbuf;
msg.msg_controllen = CMSG_SPACE(fds_len);
cmsg = CMSG_FIRSTHDR(&msg);
cmsg->cmsg_level = SOL_SOCKET;
cmsg->cmsg_type = SCM_RIGHTS;
cmsg->cmsg_len = CMSG_LEN(fds_len);
cm = (int *) CMSG_DATA(cmsg);
for (i = 0; i < buf->n_fds; i++)
cm[i] = buf->fds[i] > 0 ? buf->fds[i] : -buf->fds[i];
msg.msg_controllen = cmsg->cmsg_len;
} else {
msg.msg_control = NULL;
msg.msg_controllen = 0;
}
while (true) {
len = sendmsg(conn->fd, &msg, MSG_NOSIGNAL);
if (len < 0) {
if (errno == EINTR)
continue;
else
goto send_error;
}
break;
}
pw_log_trace("connection %p: %d written %zd bytes and %u fds", conn, conn->fd, len,
buf->n_fds);
buf->buffer_size -= len;
buf->n_fds = 0;
return true;
/* ERRORS */
send_error:
pw_log_error("could not sendmsg: %s", strerror(errno));
return false;
}
/** Clear the connection object
*
* \param conn the connection object
* \return true on success
*
* Remove all queued messages from \a conn
*
* \memberof pw_connection
*/
bool pw_connection_clear(struct pw_connection *conn)
{
struct impl *impl = SPA_CONTAINER_OF(conn, struct impl, this);
clear_buffer(&impl->out);
clear_buffer(&impl->in);
impl->in.update = true;
return true;
}

View file

@ -0,0 +1,89 @@
/* PipeWire
* Copyright (C) 2016 Wim Taymans <wim.taymans@gmail.com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
* License along with this library; if not, write to the
* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
* Boston, MA 02110-1301, USA.
*/
#ifndef __PIPEWIRE_CONNECTION_H__
#define __PIPEWIRE_CONNECTION_H__
#ifdef __cplusplus
extern "C" {
#endif
#include <spa/defs.h>
#include <pipewire/sig.h>
/** \class pw_connection
*
* \brief Manages the connection between client and server
*
* The \ref pw_connection handles the connection between client
* and server on a given socket.
*/
struct pw_connection {
int fd; /**< the socket */
/** Emited when data has been written that needs to be flushed */
PW_SIGNAL(need_flush, (struct pw_listener *listener, struct pw_connection *conn));
/** Emited when the connection is destroyed */
PW_SIGNAL(destroy_signal, (struct pw_listener *listener, struct pw_connection *conn));
};
struct pw_connection *
pw_connection_new(int fd);
void
pw_connection_destroy(struct pw_connection *conn);
uint32_t
pw_connection_add_fd(struct pw_connection *conn, int fd);
int
pw_connection_get_fd(struct pw_connection *conn, uint32_t index);
bool
pw_connection_get_next(struct pw_connection *conn,
uint8_t *opcode,
uint32_t *dest_id,
void **data, uint32_t *size);
struct spa_pod_builder *
pw_connection_begin_write_resource(struct pw_connection *conn,
struct pw_resource *resource,
uint8_t opcode);
struct spa_pod_builder *
pw_connection_begin_write_proxy(struct pw_connection *conn,
struct pw_proxy *proxy,
uint8_t opcode);
void
pw_connection_end_write(struct pw_connection *conn,
struct spa_pod_builder *builder);
bool
pw_connection_flush(struct pw_connection *conn);
bool
pw_connection_clear(struct pw_connection *conn);
#ifdef __cplusplus
} /* extern "C" */
#endif
#endif /* __PIPEWIRE_CONNECTION_H__ */

File diff suppressed because it is too large Load diff