mirror of
https://gitlab.freedesktop.org/pipewire/pipewire.git
synced 2025-11-01 22:58:50 -04:00
Make buffer data point to memory blocks
Make buffer data point to a registered memory block by its mem_id. Add some more helpers to allocate memfd backed memory. Allocate buffers in memfd so that we easily share them between client and server. Update pts and seq in v4l2 now that this change will actually be visible at the client.
This commit is contained in:
Wim Taymans
parent
98993c680b
commit
1169c2419b
19 changed files with 383 additions and 356 deletions
|
|
@ -339,54 +339,6 @@ spa_control_iter_get_data (SpaControlIter *iter, size_t *size)
|
|||
return si->data;
|
||||
}
|
||||
|
||||
#if 0
|
||||
typedef struct {
|
||||
SpaBuffer buffer;
|
||||
SpaMeta metas[16];
|
||||
SpaData datas[16];
|
||||
int memid[16];
|
||||
} MyBuffer;
|
||||
|
||||
static SpaResult
|
||||
parse_add_buffer (struct stack_iter *si,
|
||||
SpaControlCmdAddBuffer *command)
|
||||
{
|
||||
MyBuffer *b;
|
||||
uint32_t *p = si->data;
|
||||
unsigned int i;
|
||||
|
||||
command->port_id = *p++;
|
||||
b = malloc (sizeof (MyBuffer));
|
||||
b->buffer.id = *(uint32_t *)p++;
|
||||
b->buffer.size = *(uint32_t *)p++;
|
||||
b->buffer.n_metas = *(uint32_t *)p++;
|
||||
b->buffer.metas = offsetof (MyBuffer, metas);
|
||||
b->buffer.n_datas = *(uint32_t *)p++;
|
||||
b->buffer.datas = offsetof (MyBuffer, datas);
|
||||
|
||||
for (i = 0; i < b->buffer.n_metas; i++) {
|
||||
SpaMeta *m = &b->metas[i];
|
||||
m->type = *p++;
|
||||
m->size = *p++;
|
||||
m->offset = 0;
|
||||
p = p + (m->size + 3) / 4;
|
||||
}
|
||||
for (i = 0; i < b->buffer.n_datas; i++) {
|
||||
SpaData *d = &b->datas[i];
|
||||
d->type = SPA_DATA_TYPE_MEMID;
|
||||
d->ptr_type = NULL;
|
||||
b->memid[i] = *p++;
|
||||
d->ptr = &b->memid[i];
|
||||
d->offset = *p++;
|
||||
d->size = *p++;
|
||||
d->stride = *p++;
|
||||
}
|
||||
command->buffer = &b->buffer;
|
||||
|
||||
return SPA_RESULT_OK;
|
||||
}
|
||||
#endif
|
||||
|
||||
SpaResult
|
||||
spa_control_iter_parse_cmd (SpaControlIter *iter,
|
||||
void *command)
|
||||
|
|
@ -719,60 +671,6 @@ builder_add_cmd (struct stack_builder *sb, SpaControlCmd cmd, size_t size)
|
|||
return p;
|
||||
}
|
||||
|
||||
#if 0
|
||||
static SpaResult
|
||||
build_add_buffer (struct stack_builder *sb,
|
||||
SpaControlCmdAddBuffer *command)
|
||||
{
|
||||
unsigned int i;
|
||||
size_t size;
|
||||
SpaBuffer *b = command->buffer;
|
||||
uint32_t *p;
|
||||
|
||||
/* port + id + size + n_metas + n_datas */
|
||||
size = 4 + 4 + 4 + 4 + 4;
|
||||
|
||||
for (i = 0; i < b->n_metas; i++) {
|
||||
SpaMeta *m = &b->metas[i];
|
||||
/* type + size + data */
|
||||
size += 4 + 4 + m->size;
|
||||
}
|
||||
for (i = 0; i < b->n_datas; i++) {
|
||||
SpaData *d = &b->datas[i];
|
||||
if (d->type != SPA_DATA_TYPE_MEMID)
|
||||
continue;
|
||||
/* memidx + offset + size + stride */
|
||||
size += 4 + 4 + 4 + 4;
|
||||
}
|
||||
p = builder_add_cmd (sb, SPA_CONTROL_CMD_ADD_BUFFER, size);
|
||||
|
||||
*p++ = command->port_id;
|
||||
*p++ = b->id;
|
||||
*p++ = b->size;
|
||||
*p++ = b->n_metas;
|
||||
*p++ = b->n_datas;
|
||||
|
||||
for (i = 0; i < b->n_metas; i++) {
|
||||
SpaMeta *m = &b->metas[i];
|
||||
|
||||
*p++ = m->type;
|
||||
*p++ = m->size;
|
||||
memcpy (p, m->data, m->size);
|
||||
p = p + m->size / 4;
|
||||
}
|
||||
for (i = 0; i < b->n_datas; i++) {
|
||||
SpaData *d = &b->datas[i];
|
||||
if (d->type != SPA_DATA_TYPE_MEMID)
|
||||
continue;
|
||||
*p++ = *((uint32_t*)(d->ptr));
|
||||
*p++ = d->offset;
|
||||
*p++ = d->size;
|
||||
*p++ = d->stride;
|
||||
}
|
||||
return SPA_RESULT_OK;
|
||||
}
|
||||
#endif
|
||||
|
||||
/**
|
||||
* spa_control_builder_add_cmd:
|
||||
* @builder: a #SpaControlBuilder
|
||||
|
|
|
|||
|
|
@ -20,6 +20,7 @@
|
|||
#include <stdio.h>
|
||||
|
||||
#include "spa/debug.h"
|
||||
#include "spa/memory.h"
|
||||
|
||||
SpaResult
|
||||
spa_debug_port_info (const SpaPortInfo *info)
|
||||
|
|
@ -88,9 +89,11 @@ spa_debug_buffer (const SpaBuffer *buffer)
|
|||
return SPA_RESULT_INVALID_ARGUMENTS;
|
||||
|
||||
fprintf (stderr, "SpaBuffer %p:\n", buffer);
|
||||
fprintf (stderr, " id: \t%08x\n", buffer->id);
|
||||
fprintf (stderr, " size: \t%zd\n", buffer->size);
|
||||
fprintf (stderr, " n_metas: \t%u (offset %zd)\n", buffer->n_metas, buffer->metas);
|
||||
fprintf (stderr, " id: %08X\n", buffer->id);
|
||||
fprintf (stderr, " mem_id: %08X\n", buffer->mem_id);
|
||||
fprintf (stderr, " offset: %zd\n", buffer->offset);
|
||||
fprintf (stderr, " size: %zd\n", buffer->size);
|
||||
fprintf (stderr, " n_metas: %u (offset %zd)\n", buffer->n_metas, buffer->metas);
|
||||
for (i = 0; i < buffer->n_metas; i++) {
|
||||
SpaMeta *m = &SPA_BUFFER_METAS (buffer)[i];
|
||||
fprintf (stderr, " meta %d: type %d, offset %zd, size %zd:\n", i, m->type, m->offset, m->size);
|
||||
|
|
@ -121,26 +124,24 @@ spa_debug_buffer (const SpaBuffer *buffer)
|
|||
fprintf (stderr, " n_datas: \t%u (offset %zd)\n", buffer->n_datas, buffer->datas);
|
||||
for (i = 0; i < buffer->n_datas; i++) {
|
||||
SpaData *d = &SPA_BUFFER_DATAS (buffer)[i];
|
||||
fprintf (stderr, " data %d: type %d\n", i, d->type);
|
||||
switch (d->type) {
|
||||
case SPA_DATA_TYPE_MEMPTR:
|
||||
fprintf (stderr, " memptr %p\n", d->ptr);
|
||||
break;
|
||||
case SPA_DATA_TYPE_FD:
|
||||
fprintf (stderr, " fd %d\n", SPA_PTR_TO_INT (d->ptr));
|
||||
break;
|
||||
case SPA_DATA_TYPE_MEMID:
|
||||
fprintf (stderr, " memid %d\n", SPA_PTR_TO_UINT32 (d->ptr));
|
||||
break;
|
||||
case SPA_DATA_TYPE_POINTER:
|
||||
fprintf (stderr, " pointer %p\n", d->ptr);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
SpaMemory *mem;
|
||||
|
||||
mem = spa_memory_find (0, d->mem_id);
|
||||
fprintf (stderr, " data %d: (memory %p)\n", i, mem);
|
||||
if (mem) {
|
||||
fprintf (stderr, " pool_id: %u\n", mem->pool_id);
|
||||
fprintf (stderr, " id: %u\n", mem->id);
|
||||
fprintf (stderr, " flags: %08x\n", mem->flags);
|
||||
fprintf (stderr, " type: %s\n", mem->type ? mem->type : "*unknown*");
|
||||
fprintf (stderr, " fd: %d\n", mem->fd);
|
||||
fprintf (stderr, " ptr: %p\n", mem->ptr);
|
||||
fprintf (stderr, " size: %zd\n", mem->size);
|
||||
} else {
|
||||
fprintf (stderr, " invalid memory reference\n");
|
||||
}
|
||||
fprintf (stderr, " offset %zd:\n", d->offset);
|
||||
fprintf (stderr, " size %zd:\n", d->size);
|
||||
fprintf (stderr, " stride %zd:\n", d->stride);
|
||||
fprintf (stderr, " offset: %zd\n", d->offset);
|
||||
fprintf (stderr, " size: %zd\n", d->size);
|
||||
fprintf (stderr, " stride: %zd\n", d->stride);
|
||||
}
|
||||
return SPA_RESULT_OK;
|
||||
}
|
||||
|
|
|
|||
106
spa/lib/memory.c
106
spa/lib/memory.c
|
|
@ -17,7 +17,16 @@
|
|||
* Boston, MA 02110-1301, USA.
|
||||
*/
|
||||
|
||||
#define _GNU_SOURCE
|
||||
|
||||
#include <string.h>
|
||||
#include <stddef.h>
|
||||
#include <stdio.h>
|
||||
#include <sys/socket.h>
|
||||
#include <errno.h>
|
||||
#include <sys/mman.h>
|
||||
#include <unistd.h>
|
||||
#include <fcntl.h>
|
||||
|
||||
#include "spa/memory.h"
|
||||
|
||||
|
|
@ -39,6 +48,7 @@ spa_memory_pool_init (SpaMemoryPool *pool, uint32_t id)
|
|||
{
|
||||
int i;
|
||||
|
||||
memset (pool, 0, sizeof (SpaMemoryPool));
|
||||
for (i = 0; i < MAX_MEMORIES; i++)
|
||||
pool->free_mem[i] = MAX_MEMORIES - 1 - i;
|
||||
pool->n_free = MAX_MEMORIES;
|
||||
|
|
@ -103,12 +113,84 @@ spa_memory_alloc (uint32_t pool_id)
|
|||
|
||||
mem = &pool->memories[id];
|
||||
mem->refcount = 1;
|
||||
mem->notify = NULL;
|
||||
mem->pool_id = pool_id;
|
||||
mem->id = id;
|
||||
|
||||
return mem;
|
||||
}
|
||||
|
||||
SpaMemory *
|
||||
spa_memory_alloc_with_fd (uint32_t pool_id, void *data, size_t size)
|
||||
{
|
||||
SpaMemory *mem;
|
||||
char filename[] = "/dev/shm/spa-tmpfile.XXXXXX";
|
||||
|
||||
if (!(mem = spa_memory_alloc (pool_id)))
|
||||
return NULL;
|
||||
|
||||
mem->fd = mkostemp (filename, O_CLOEXEC);
|
||||
if (mem->fd == -1) {
|
||||
fprintf (stderr, "Failed to create temporary file: %s\n", strerror (errno));
|
||||
return NULL;
|
||||
}
|
||||
unlink (filename);
|
||||
|
||||
if (data) {
|
||||
if (write (mem->fd, data, size) != (ssize_t) size) {
|
||||
fprintf (stderr, "Failed to write data: %s\n", strerror (errno));
|
||||
close (mem->fd);
|
||||
return NULL;
|
||||
}
|
||||
} else {
|
||||
if (ftruncate (mem->fd, size) < 0) {
|
||||
fprintf (stderr, "Failed to truncate temporary file: %s\n", strerror (errno));
|
||||
close (mem->fd);
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
|
||||
mem->flags = SPA_MEMORY_FLAG_READWRITE;
|
||||
mem->ptr = NULL;
|
||||
mem->size = size;
|
||||
|
||||
return mem;
|
||||
}
|
||||
|
||||
|
||||
SpaMemory *
|
||||
spa_memory_import (uint32_t pool_id, uint32_t id)
|
||||
{
|
||||
SpaMemory *mem = NULL;
|
||||
SpaMemoryPool *pool;
|
||||
int i;
|
||||
bool init = false;
|
||||
|
||||
if (pool_id >= MAX_POOLS || !pools[pool_id].valid)
|
||||
return NULL;
|
||||
|
||||
pool = &pools[pool_id];
|
||||
|
||||
for (i = 0; i < pool->n_free; i++) {
|
||||
if (pool->free_mem[i] == id) {
|
||||
pool->free_mem[i] = pool->free_mem[pool->n_free - 1];
|
||||
pool->n_free--;
|
||||
init = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
mem = &pool->memories[id];
|
||||
if (init) {
|
||||
mem->refcount = 1;
|
||||
mem->notify = NULL;
|
||||
mem->pool_id = pool_id;
|
||||
mem->id = id;
|
||||
}
|
||||
|
||||
return mem;
|
||||
}
|
||||
|
||||
SpaResult
|
||||
spa_memory_free (uint32_t pool_id, uint32_t id)
|
||||
{
|
||||
|
|
@ -139,3 +221,27 @@ spa_memory_find (uint32_t pool_id, uint32_t id)
|
|||
|
||||
return &pool->memories[id];
|
||||
}
|
||||
|
||||
void *
|
||||
spa_memory_ensure_ptr (SpaMemory *mem)
|
||||
{
|
||||
int prot = 0;
|
||||
|
||||
if (mem == NULL)
|
||||
return NULL;
|
||||
|
||||
if (mem->ptr)
|
||||
return mem->ptr;
|
||||
|
||||
if (mem->flags & SPA_MEMORY_FLAG_READABLE)
|
||||
prot |= PROT_READ;
|
||||
if (mem->flags & SPA_MEMORY_FLAG_WRITABLE)
|
||||
prot |= PROT_WRITE;
|
||||
|
||||
mem->ptr = mmap (NULL, mem->size, prot, MAP_SHARED, mem->fd, 0);
|
||||
if (mem->ptr == MAP_FAILED) {
|
||||
mem->ptr = NULL;
|
||||
fprintf (stderr, "Failed to mmap memory %p: %s\n", mem, strerror (errno));
|
||||
}
|
||||
return mem->ptr;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue