mirror of
https://gitlab.freedesktop.org/pipewire/pipewire.git
synced 2025-11-02 09:01:50 -05:00
Make buffer structure sharable
Use stucture offsets instead of pointers so that we can share the buffer structure between client and server. We can then pass an fd wrapping the memory of the buffer to the client. Add beginnings of a memory pool
This commit is contained in:
Wim Taymans
parent
3ace7e9648
commit
98993c680b
23 changed files with 456 additions and 583 deletions
|
|
@ -1,373 +0,0 @@
|
|||
/* Pinos
|
||||
* Copyright (C) 2015 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 <string.h>
|
||||
|
||||
#include <gst/gst.h>
|
||||
#include <gio/gio.h>
|
||||
#include <gio/gunixfdlist.h>
|
||||
|
||||
#include "pinos/client/pinos.h"
|
||||
#include "pinos/client/enumtypes.h"
|
||||
|
||||
#include "pinos/client/client-port.h"
|
||||
|
||||
#define PINOS_CLIENT_PORT_GET_PRIVATE(obj) \
|
||||
(G_TYPE_INSTANCE_GET_PRIVATE ((obj), PINOS_TYPE_CLIENT_PORT, PinosClientPortPrivate))
|
||||
|
||||
struct _PinosClientPortPrivate
|
||||
{
|
||||
GDBusProxy *proxy;
|
||||
};
|
||||
|
||||
G_DEFINE_TYPE (PinosClientPort, pinos_client_port, PINOS_TYPE_PORT);
|
||||
|
||||
enum
|
||||
{
|
||||
PROP_0,
|
||||
PROP_PROXY,
|
||||
};
|
||||
|
||||
static void
|
||||
on_ringbuffer (GObject *source_object,
|
||||
GAsyncResult *res,
|
||||
gpointer user_data)
|
||||
{
|
||||
GTask *task = user_data;
|
||||
PinosClientPort *port = g_task_get_source_object (task);
|
||||
PinosClientPortPrivate *priv = port->priv;
|
||||
GVariant *ret;
|
||||
GError *error = NULL;
|
||||
GUnixFDList *fdlist;
|
||||
gint fd, semfd, fd_idx, sem_idx;
|
||||
guint fdsize;
|
||||
PinosRingbuffer *rbuf;
|
||||
|
||||
g_assert (priv->proxy == G_DBUS_PROXY (source_object));
|
||||
|
||||
ret = g_dbus_proxy_call_with_unix_fd_list_finish (priv->proxy, &fdlist, res, &error);
|
||||
if (ret == NULL)
|
||||
goto create_failed;
|
||||
|
||||
g_variant_get (ret, "(huh)", &fd_idx, &fdsize, &sem_idx);
|
||||
g_variant_unref (ret);
|
||||
|
||||
fd = g_unix_fd_list_get (fdlist, fd_idx, &error);
|
||||
semfd = g_unix_fd_list_get (fdlist, sem_idx, &error);
|
||||
g_object_unref (fdlist);
|
||||
|
||||
if (fd == -1 || semfd == -1)
|
||||
goto create_failed;
|
||||
|
||||
rbuf = pinos_ringbuffer_new_import (PINOS_RINGBUFFER_MODE_WRITE,
|
||||
fd, fdsize, semfd);
|
||||
|
||||
g_task_return_pointer (task, rbuf, (GDestroyNotify) g_object_unref);
|
||||
g_object_unref (task);
|
||||
|
||||
return;
|
||||
|
||||
/* ERRORS */
|
||||
create_failed:
|
||||
{
|
||||
g_warning ("failed to get ringbuffer: %s", error->message);
|
||||
g_task_return_error (task, error);
|
||||
g_object_unref (task);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
static void
|
||||
pinos_client_port_get_ringbuffer (PinosPort *port,
|
||||
PinosProperties *props,
|
||||
GTask *task)
|
||||
{
|
||||
PinosClientPortPrivate *priv = PINOS_CLIENT_PORT (port)->priv;
|
||||
|
||||
g_dbus_proxy_call (priv->proxy,
|
||||
"GetRingbuffer",
|
||||
g_variant_new ("(@a{sv})",
|
||||
pinos_properties_to_variant (props)),
|
||||
G_DBUS_CALL_FLAGS_NONE,
|
||||
-1,
|
||||
NULL, /* GCancellable *cancellable */
|
||||
on_ringbuffer,
|
||||
task);
|
||||
}
|
||||
|
||||
static void
|
||||
pinos_client_port_get_property (GObject *_object,
|
||||
guint prop_id,
|
||||
GValue *value,
|
||||
GParamSpec *pspec)
|
||||
{
|
||||
PinosClientPort *port = PINOS_CLIENT_PORT (_object);
|
||||
PinosClientPortPrivate *priv = port->priv;
|
||||
|
||||
switch (prop_id) {
|
||||
case PROP_PROXY:
|
||||
g_value_set_object (value, priv->proxy);
|
||||
break;
|
||||
|
||||
default:
|
||||
G_OBJECT_WARN_INVALID_PROPERTY_ID (port, prop_id, pspec);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
pinos_client_port_set_property (GObject *_object,
|
||||
guint prop_id,
|
||||
const GValue *value,
|
||||
GParamSpec *pspec)
|
||||
{
|
||||
PinosClientPort *port = PINOS_CLIENT_PORT (_object);
|
||||
PinosClientPortPrivate *priv = port->priv;
|
||||
|
||||
switch (prop_id) {
|
||||
case PROP_PROXY:
|
||||
priv->proxy = g_value_dup_object (value);
|
||||
break;
|
||||
|
||||
default:
|
||||
G_OBJECT_WARN_INVALID_PROPERTY_ID (port, prop_id, pspec);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
proxy_g_properties_changed (GDBusProxy *_proxy,
|
||||
GVariant *changed_properties,
|
||||
GStrv invalidated_properties,
|
||||
gpointer user_data)
|
||||
{
|
||||
PinosClientPort *port = user_data;
|
||||
GVariantIter *iter;
|
||||
gchar *key;
|
||||
|
||||
g_variant_get (changed_properties, "a{sv}", &iter);
|
||||
while (g_variant_iter_next (iter, "{&sv}", &key, NULL)) {
|
||||
GVariant *variant;
|
||||
gsize size;
|
||||
gpointer data;
|
||||
GBytes *bytes;
|
||||
|
||||
variant = g_dbus_proxy_get_cached_property (_proxy, key);
|
||||
if (variant == NULL)
|
||||
continue;
|
||||
|
||||
if (strcmp (key, "PossibleFormats") == 0) {
|
||||
data = g_variant_dup_string (variant, &size);
|
||||
bytes = g_bytes_new_take (data, size);
|
||||
g_object_set (port, "possible-formats", bytes, NULL);
|
||||
g_bytes_unref (bytes);
|
||||
}
|
||||
g_variant_unref (variant);
|
||||
}
|
||||
g_variant_iter_free (iter);
|
||||
}
|
||||
|
||||
static void
|
||||
proxy_set_property_cb (GDBusProxy *proxy,
|
||||
GAsyncResult *res,
|
||||
gpointer user_data)
|
||||
{
|
||||
GVariant *ret;
|
||||
GError *error = NULL;
|
||||
|
||||
ret = g_dbus_proxy_call_finish (proxy, res, &error);
|
||||
if (ret == NULL) {
|
||||
g_warning ("Error setting property: %s", error->message);
|
||||
g_error_free (error);
|
||||
} else
|
||||
g_variant_unref (ret);
|
||||
}
|
||||
|
||||
|
||||
static void
|
||||
on_property_notify (GObject *obj,
|
||||
GParamSpec *pspec,
|
||||
gpointer user_data)
|
||||
{
|
||||
PinosPort *port = PINOS_PORT (obj);
|
||||
PinosClientPortPrivate *priv = PINOS_CLIENT_PORT (port)->priv;
|
||||
const gchar *prop_name = NULL;
|
||||
GVariant *variant;
|
||||
|
||||
if (pspec == NULL || strcmp (g_param_spec_get_name (pspec), "possible-formats") == 0) {
|
||||
GBytes *bytes = pinos_port_get_possible_formats (port);
|
||||
prop_name = "PossibleFormats";
|
||||
variant = bytes ? g_variant_new_string (g_bytes_get_data (bytes, NULL)) : NULL;
|
||||
}
|
||||
if (prop_name) {
|
||||
g_dbus_proxy_call (G_DBUS_PROXY (priv->proxy),
|
||||
"org.freedesktop.DBus.Properties.Set",
|
||||
g_variant_new ("(ssv)",
|
||||
"org.pinos.Port1",
|
||||
prop_name,
|
||||
variant),
|
||||
G_DBUS_CALL_FLAGS_NONE,
|
||||
-1,
|
||||
NULL,
|
||||
(GAsyncReadyCallback) proxy_set_property_cb,
|
||||
port);
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
pinos_client_port_constructed (GObject * object)
|
||||
{
|
||||
PinosClientPort *port = PINOS_CLIENT_PORT (object);
|
||||
PinosClientPortPrivate *priv = port->priv;
|
||||
|
||||
g_debug ("client-port %p: constructed", port);
|
||||
g_signal_connect (priv->proxy,
|
||||
"g-properties-changed",
|
||||
(GCallback) proxy_g_properties_changed,
|
||||
port);
|
||||
g_signal_connect (port, "notify", (GCallback) on_property_notify, port);
|
||||
|
||||
G_OBJECT_CLASS (pinos_client_port_parent_class)->constructed (object);
|
||||
}
|
||||
|
||||
static void
|
||||
pinos_client_port_dispose (GObject * object)
|
||||
{
|
||||
PinosClientPort *port = PINOS_CLIENT_PORT (object);
|
||||
|
||||
g_debug ("client-port %p: dispose", port);
|
||||
|
||||
G_OBJECT_CLASS (pinos_client_port_parent_class)->dispose (object);
|
||||
}
|
||||
|
||||
|
||||
static void
|
||||
pinos_client_port_finalize (GObject * object)
|
||||
{
|
||||
PinosClientPort *port = PINOS_CLIENT_PORT (object);
|
||||
PinosClientPortPrivate *priv = port->priv;
|
||||
|
||||
g_debug ("client-port %p: finalize", port);
|
||||
g_clear_object (&priv->proxy);
|
||||
|
||||
G_OBJECT_CLASS (pinos_client_port_parent_class)->finalize (object);
|
||||
}
|
||||
|
||||
static void
|
||||
pinos_client_port_class_init (PinosClientPortClass * klass)
|
||||
{
|
||||
GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
|
||||
PinosPortClass *port_class = PINOS_PORT_CLASS (klass);
|
||||
|
||||
g_type_class_add_private (klass, sizeof (PinosClientPortPrivate));
|
||||
|
||||
gobject_class->constructed = pinos_client_port_constructed;
|
||||
gobject_class->dispose = pinos_client_port_dispose;
|
||||
gobject_class->finalize = pinos_client_port_finalize;
|
||||
gobject_class->set_property = pinos_client_port_set_property;
|
||||
gobject_class->get_property = pinos_client_port_get_property;
|
||||
|
||||
g_object_class_install_property (gobject_class,
|
||||
PROP_PROXY,
|
||||
g_param_spec_object ("proxy",
|
||||
"Proxy",
|
||||
"The Proxy",
|
||||
G_TYPE_DBUS_PROXY,
|
||||
G_PARAM_READWRITE |
|
||||
G_PARAM_CONSTRUCT_ONLY |
|
||||
G_PARAM_STATIC_STRINGS));
|
||||
|
||||
port_class->get_ringbuffer = pinos_client_port_get_ringbuffer;
|
||||
}
|
||||
|
||||
static void
|
||||
pinos_client_port_init (PinosClientPort * port)
|
||||
{
|
||||
port->priv = PINOS_CLIENT_PORT_GET_PRIVATE (port);
|
||||
}
|
||||
|
||||
/**
|
||||
* pinos_client_port_new:
|
||||
* @node: a #PinosClientNode
|
||||
* @id: an id
|
||||
* @socket: a socket with the server port
|
||||
*
|
||||
* Create a new client port.
|
||||
*
|
||||
* Returns: a new client port
|
||||
*/
|
||||
PinosClientPort *
|
||||
pinos_client_port_new (PinosClientNode *node,
|
||||
gpointer id,
|
||||
GSocket *socket)
|
||||
{
|
||||
PinosClientPort *port;
|
||||
GDBusProxy *proxy = id;
|
||||
GVariant *variant;
|
||||
PinosDirection direction = PINOS_DIRECTION_INVALID;
|
||||
const gchar *name = "unknown";
|
||||
GBytes *possible_formats = NULL;
|
||||
GBytes *format = NULL;
|
||||
PinosProperties *properties = NULL;
|
||||
|
||||
variant = g_dbus_proxy_get_cached_property (G_DBUS_PROXY (proxy), "Direction");
|
||||
if (variant != NULL) {
|
||||
direction = g_variant_get_uint32 (variant);
|
||||
g_variant_unref (variant);
|
||||
}
|
||||
variant = g_dbus_proxy_get_cached_property (G_DBUS_PROXY (proxy), "Name");
|
||||
if (variant != NULL) {
|
||||
name = g_variant_get_string (variant, NULL);
|
||||
g_variant_unref (variant);
|
||||
}
|
||||
variant = g_dbus_proxy_get_cached_property (G_DBUS_PROXY (proxy), "PossibleFormats");
|
||||
if (variant != NULL) {
|
||||
gsize size;
|
||||
gpointer data;
|
||||
data = g_variant_dup_string (variant, &size);
|
||||
possible_formats = g_bytes_new_take (data, size);
|
||||
g_variant_unref (variant);
|
||||
}
|
||||
variant = g_dbus_proxy_get_cached_property (G_DBUS_PROXY (proxy), "Format");
|
||||
if (variant != NULL) {
|
||||
gsize size;
|
||||
gpointer data;
|
||||
data = g_variant_dup_string (variant, &size);
|
||||
format = g_bytes_new_take (data, size);
|
||||
g_variant_unref (variant);
|
||||
}
|
||||
variant = g_dbus_proxy_get_cached_property (G_DBUS_PROXY (proxy), "Properties");
|
||||
if (variant != NULL) {
|
||||
properties = pinos_properties_from_variant (variant);
|
||||
g_variant_unref (variant);
|
||||
}
|
||||
|
||||
port = g_object_new (PINOS_TYPE_CLIENT_PORT,
|
||||
"node", node,
|
||||
"direction", direction,
|
||||
"name", name,
|
||||
"possible-formats", possible_formats,
|
||||
"format", format,
|
||||
"properties", properties,
|
||||
"proxy", proxy,
|
||||
"socket", socket,
|
||||
NULL);
|
||||
return port;
|
||||
}
|
||||
|
|
@ -1,80 +0,0 @@
|
|||
/* Pinos
|
||||
* Copyright (C) 2015 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 __PINOS_CLIENT_PORT_H__
|
||||
#define __PINOS_CLIENT_PORT_H__
|
||||
|
||||
#include <glib-object.h>
|
||||
|
||||
G_BEGIN_DECLS
|
||||
|
||||
typedef struct _PinosClientPort PinosClientPort;
|
||||
typedef struct _PinosClientPortClass PinosClientPortClass;
|
||||
typedef struct _PinosClientPortPrivate PinosClientPortPrivate;
|
||||
|
||||
#include <pinos/client/introspect.h>
|
||||
#include <pinos/client/port.h>
|
||||
#include <pinos/client/client-node.h>
|
||||
|
||||
#define PINOS_TYPE_CLIENT_PORT (pinos_client_port_get_type ())
|
||||
#define PINOS_IS_CLIENT_PORT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PINOS_TYPE_CLIENT_PORT))
|
||||
#define PINOS_IS_CLIENT_PORT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PINOS_TYPE_CLIENT_PORT))
|
||||
#define PINOS_CLIENT_PORT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PINOS_TYPE_CLIENT_PORT, PinosClientPortClass))
|
||||
#define PINOS_CLIENT_PORT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PINOS_TYPE_CLIENT_PORT, PinosClientPort))
|
||||
#define PINOS_CLIENT_PORT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PINOS_TYPE_CLIENT_PORT, PinosClientPortClass))
|
||||
#define PINOS_CLIENT_PORT_CAST(obj) ((PinosClientPort*)(obj))
|
||||
#define PINOS_CLIENT_PORT_CLASS_CAST(klass) ((PinosClientPortClass*)(klass))
|
||||
|
||||
/**
|
||||
* PinosClientPort:
|
||||
*
|
||||
* Pinos client port object class.
|
||||
*/
|
||||
struct _PinosClientPort {
|
||||
PinosPort object;
|
||||
|
||||
PinosClientPortPrivate *priv;
|
||||
};
|
||||
|
||||
/**
|
||||
* PinosClientPortClass:
|
||||
* @get_formats: called to get a list of supported formats from the port
|
||||
* @create_channel: called to create a new channel object
|
||||
* @release_channel: called to release a channel object
|
||||
*
|
||||
* Pinos client port object class.
|
||||
*/
|
||||
struct _PinosClientPortClass {
|
||||
PinosPortClass parent_class;
|
||||
};
|
||||
|
||||
/* normal GObject stuff */
|
||||
GType pinos_client_port_get_type (void);
|
||||
|
||||
PinosClientPort * pinos_client_port_new (PinosClientNode *node,
|
||||
gpointer id,
|
||||
GSocket *socket);
|
||||
|
||||
GBytes * pinos_client_port_get_formats (PinosClientPort *port,
|
||||
GBytes *filter,
|
||||
GError **error);
|
||||
|
||||
G_END_DECLS
|
||||
|
||||
#endif /* __PINOS_CLIENT_PORT_H__ */
|
||||
|
|
@ -19,6 +19,7 @@
|
|||
|
||||
#include <sys/socket.h>
|
||||
#include <string.h>
|
||||
#include <sys/mman.h>
|
||||
|
||||
#include <gio/gio.h>
|
||||
#include <gio/gunixfdlist.h>
|
||||
|
|
@ -52,14 +53,19 @@ clear_mem_id (MemId *id)
|
|||
typedef struct {
|
||||
bool cleanup;
|
||||
uint32_t id;
|
||||
int fd;
|
||||
off_t offset;
|
||||
size_t size;
|
||||
SpaBuffer *buf;
|
||||
} BufferId;
|
||||
|
||||
static void
|
||||
clear_buffer_id (BufferId *id)
|
||||
{
|
||||
free (id->buf);
|
||||
munmap (id->buf, id->size);
|
||||
id->buf = NULL;
|
||||
close (id->fd);
|
||||
id->fd = -1;
|
||||
}
|
||||
|
||||
struct _PinosStreamPrivate
|
||||
|
|
@ -696,10 +702,18 @@ parse_control (PinosStream *stream,
|
|||
if (spa_control_iter_parse_cmd (&it, &p) < 0)
|
||||
break;
|
||||
|
||||
g_debug ("add buffer %d", p.buffer->id);
|
||||
bid.fd = spa_control_get_fd (ctrl, p.fd_index, false);
|
||||
if (bid.fd == -1)
|
||||
break;
|
||||
|
||||
g_debug ("add buffer %d", p.buffer_id);
|
||||
bid.cleanup = false;
|
||||
bid.id = p.buffer->id;
|
||||
bid.buf = p.buffer;
|
||||
bid.id = p.buffer_id;
|
||||
bid.offset = p.offset;
|
||||
bid.size = p.size;
|
||||
bid.buf = mmap (NULL, p.size, PROT_READ | PROT_WRITE, MAP_SHARED, bid.fd, p.offset);
|
||||
spa_debug_buffer (bid.buf);
|
||||
|
||||
g_array_append_val (priv->buffer_ids, bid);
|
||||
break;
|
||||
}
|
||||
|
|
@ -725,20 +739,18 @@ parse_control (PinosStream *stream,
|
|||
if (spa_control_iter_parse_cmd (&it, &p) < 0)
|
||||
break;
|
||||
|
||||
g_debug ("process buffer %d", p.buffer_id);
|
||||
if ((bid = find_buffer (stream, p.buffer_id))) {
|
||||
SpaBuffer *b = bid->buf;
|
||||
SpaData *d = SPA_BUFFER_DATAS (b);
|
||||
|
||||
for (i = 0; i < b->n_datas; i++) {
|
||||
SpaData *d = &b->datas[i];
|
||||
|
||||
if (d->type == SPA_DATA_TYPE_MEMID) {
|
||||
int id = *((int*)(d->ptr));
|
||||
if (d[i].type == SPA_DATA_TYPE_MEMID) {
|
||||
uint32_t id = SPA_PTR_TO_UINT32 (d[i].ptr);
|
||||
MemId *mid;
|
||||
|
||||
if ((mid = find_mem (stream, id))) {
|
||||
d->type = SPA_DATA_TYPE_FD;
|
||||
*((int *)(d->ptr)) = mid->fd;
|
||||
d[i].type = SPA_DATA_TYPE_FD;
|
||||
d[i].ptr = SPA_INT_TO_PTR (mid->fd);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue