mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-04 13:30:12 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

jack: dynamically fill the port array

Browse source 
Don't preallocate ports, do so on demand to reduce memory
usage.
This commit is contained in:
Wim Taymans 2020-06-16 20:57:52 +02:00
parent b852b58f82
commit c9d4c1ba95
1 changed files with 20 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

32
pipewire-jack/src/pipewire-jack.c
View file

@ -228,8 +228,8 @@ struct context {
#define GET_DIRECTION(f) ((f) & JackPortIsInput ? SPA_DIRECTION_INPUT : SPA_DIRECTION_OUTPUT) #define GET_DIRECTION(f) ((f) & JackPortIsInput ? SPA_DIRECTION_INPUT : SPA_DIRECTION_OUTPUT)
#define GET_IN_PORT(c,p) (&c->port_pool[SPA_DIRECTION_INPUT][p]) #define GET_IN_PORT(c,p) (c->port_pool[SPA_DIRECTION_INPUT][p])
#define GET_OUT_PORT(c,p) (&c->port_pool[SPA_DIRECTION_OUTPUT][p]) #define GET_OUT_PORT(c,p) (c->port_pool[SPA_DIRECTION_OUTPUT][p])
#define GET_PORT(c,d,p) (d == SPA_DIRECTION_INPUT ? GET_IN_PORT(c,p) : GET_OUT_PORT(c,p)) #define GET_PORT(c,d,p) (d == SPA_DIRECTION_INPUT ? GET_IN_PORT(c,p) : GET_OUT_PORT(c,p))
struct metadata { struct metadata {
@ -307,7 +307,8 @@ struct client {
struct mix mix_pool[MAX_MIX]; struct mix mix_pool[MAX_MIX];
struct spa_list free_mix; struct spa_list free_mix;
struct port port_pool[2][MAX_PORTS]; uint32_t n_port_pool[2];
struct port *port_pool[2][MAX_PORTS];
struct spa_list ports[2]; struct spa_list ports[2];
struct spa_list free_ports[2]; struct spa_list free_ports[2];
@ -345,17 +346,9 @@ static int do_sync(struct client *client);
static void init_port_pool(struct client *c, enum spa_direction direction) static void init_port_pool(struct client *c, enum spa_direction direction)
{ {
int i;
spa_list_init(&c->ports[direction]); spa_list_init(&c->ports[direction]);
spa_list_init(&c->free_ports[direction]); spa_list_init(&c->free_ports[direction]);
for (i = 0; i < MAX_PORTS; i++) { c->n_port_pool[direction] = 0;
c->port_pool[direction][i].direction = direction;
c->port_pool[direction][i].id = i;
c->port_pool[direction][i].emptyptr =
SPA_PTR_ALIGN(c->port_pool[direction][i].empty, MAX_ALIGN, float);
spa_list_append(&c->free_ports[direction], &c->port_pool[direction][i].link);
}
} }
static struct object * alloc_object(struct client *c) static struct object * alloc_object(struct client *c)
@ -452,10 +445,23 @@ static struct port * alloc_port(struct client *c, enum spa_direction direction)
{ {
struct port *p; struct port *p;
struct object *o; struct object *o;
uint32_t i, n;
if (spa_list_is_empty(&c->free_ports[direction])) if (spa_list_is_empty(&c->free_ports[direction])) {
p = calloc(OBJECT_CHUNK, sizeof(struct port));
if (p == NULL)
return NULL; return NULL;
n = c->n_port_pool[direction];
for (i = 0; i < OBJECT_CHUNK; i++, n++) {
p[i].direction = direction;
p[i].id = n;
p[i].emptyptr = SPA_PTR_ALIGN(p[i].empty, MAX_ALIGN, float);
c->port_pool[direction][n] = &p[i];
spa_list_append(&c->free_ports[direction], &p[i].link);
}
c->n_port_pool[direction] = n;
}
p = spa_list_first(&c->free_ports[direction], struct port, link); p = spa_list_first(&c->free_ports[direction], struct port, link);
spa_list_remove(&p->link); spa_list_remove(&p->link);