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

Implement subscription with a signal

Browse source 
Use a signal for subscription events
Work on handling OOM errors and other errors.
This commit is contained in:
Wim Taymans 2016-12-22 16:50:01 +01:00
parent 1b66bbcffd
commit 85d375e4bb
32 changed files with 531 additions and 176 deletions
Download patch file Download diff file Expand all files Collapse all files

64
pinos/client/connection.c
View file

@ -98,6 +98,17 @@ connection_parse_client_update (PinosConnection *conn, PinosMessageClientUpdate
m->props = pinos_serialize_dict_deserialize (p, SPA_PTR_TO_INT (m->props));
}
static void
connection_parse_error (PinosConnection *conn, PinosMessageError *m)
{
void *p;
p = conn->in.data;
memcpy (m, p, sizeof (PinosMessageError));
if (m->error)
m->error = SPA_MEMBER (p, SPA_PTR_TO_INT (m->error), const char);
}
static void
connection_parse_notify_global (PinosConnection *conn, PinosMessageNotifyGlobal *ng)
{
@ -198,6 +209,8 @@ connection_parse_node_info (PinosConnection *conn, PinosMessageNodeInfo *m)
if (m->info->name)
m->info->name = SPA_MEMBER (di, SPA_PTR_TO_INT (m->info->name), const char);
if (m->info->error)
m->info->error = SPA_MEMBER (di, SPA_PTR_TO_INT (m->info->error), const char);
if (m->info->props)
m->info->props = pinos_serialize_dict_deserialize (di, SPA_PTR_TO_INT (m->info->props));
}
@ -374,6 +387,29 @@ connection_add_client_update (PinosConnection *conn,
}
}
static void
connection_add_error (PinosConnection *conn,
uint32_t dest_id,
PinosMessageError *m)
{
size_t len;
void *p;
PinosMessageError *d;
/* calc len */
len = sizeof (PinosMessageError);
len += m->error ? strlen (m->error) + 1 : 0;
p = connection_add_message (conn, dest_id, PINOS_MESSAGE_ERROR, len);
memcpy (p, m, sizeof (PinosMessageError));
d = p;
if (m->error) {
strcpy (p, m->error);
d->error = SPA_INT_TO_PTR (SPA_PTRDIFF (p, d));
}
}
static void
connection_add_notify_global (PinosConnection *conn,
uint32_t dest_id,
@ -593,6 +629,7 @@ connection_add_node_info (PinosConnection *conn, uint32_t dest_id, PinosMessageN
if (m->info) {
len += sizeof (PinosNodeInfo);
len += m->info->name ? strlen (m->info->name) + 1 : 0;
len += m->info->error ? strlen (m->info->error) + 1 : 0;
len += pinos_serialize_dict_get_size (m->info->props);
}
@ -615,6 +652,12 @@ connection_add_node_info (PinosConnection *conn, uint32_t dest_id, PinosMessageN
di->name = SPA_INT_TO_PTR (SPA_PTRDIFF (p, di));
p += slen;
}
if (m->info->error) {
slen = strlen (m->info->error) + 1;
memcpy (p, m->info->error, slen);
di->error = SPA_INT_TO_PTR (SPA_PTRDIFF (p, di));
p += slen;
}
if (m->info->props) {
len = pinos_serialize_dict_serialize (p, m->info->props);
di->props = SPA_INT_TO_PTR (SPA_PTRDIFF (p, di));
@ -952,7 +995,11 @@ pinos_connection_new (int fd)
PinosConnection *c;
c = calloc (1, sizeof (PinosConnection));
if (c == NULL)
return NULL;
pinos_log_debug ("connection %p: new", c);
c->fd = fd;
c->out.buffer_data = malloc (MAX_BUFFER_SIZE);
c->out.buffer_maxsize = MAX_BUFFER_SIZE;
@ -960,7 +1007,16 @@ pinos_connection_new (int fd)
c->in.buffer_maxsize = MAX_BUFFER_SIZE;
c->in.update = true;
if (c->out.buffer_data == NULL || c->in.buffer_data == NULL)
goto no_mem;
return c;
no_mem:
free (c->out.buffer_data);
free (c->in.buffer_data);
free (c);
return NULL;
}
void
@ -1069,6 +1125,10 @@ pinos_connection_parse_message (PinosConnection *conn,
memcpy (message, conn->in.data, sizeof (PinosMessageNotifyDone));
break;
case PINOS_MESSAGE_ERROR:
connection_parse_error (conn, message);
break;
case PINOS_MESSAGE_GET_REGISTRY:
if (conn->in.size < sizeof (PinosMessageGetRegistry))
return false;
@ -1265,6 +1325,10 @@ pinos_connection_add_message (PinosConnection *conn,
memcpy (p, message, sizeof (PinosMessageNotifyDone));
break;
case PINOS_MESSAGE_ERROR:
connection_add_error (conn, dest_id, message);
break;
case PINOS_MESSAGE_GET_REGISTRY:
p = connection_add_message (conn, dest_id, type, sizeof (PinosMessageGetRegistry));
memcpy (p, message, sizeof (PinosMessageGetRegistry));

10
pinos/client/connection.h
View file

@ -39,6 +39,7 @@ typedef enum {
PINOS_MESSAGE_SYNC,
PINOS_MESSAGE_NOTIFY_DONE,
PINOS_MESSAGE_ERROR,
PINOS_MESSAGE_GET_REGISTRY,
PINOS_MESSAGE_REMOVE_ID,
PINOS_MESSAGE_CORE_INFO,
@ -103,6 +104,13 @@ typedef struct {
uint32_t seq;
} PinosMessageNotifyDone;
/* PINOS_MESSAGE_ERROR */
typedef struct {
uint32_t id;
SpaResult res;
const char *error;
} PinosMessageError;
/* PINOS_MESSAGE_GET_REGISTRY */
typedef struct {
uint32_t seq;
@ -148,7 +156,7 @@ typedef struct {
/* PINOS_MESSAGE_NOTIFY_GLOBAL */
typedef struct {
uint32_t id;
const char * type;
const char *type;
} PinosMessageNotifyGlobal;
/* PINOS_MESSAGE_NOTIFY_GLOBAL_REMOVE */

151
pinos/client/context.c
View file

@ -37,9 +37,6 @@ typedef struct {
SpaSource source;
bool disconnecting;
PinosSubscriptionFunc subscribe_func;
void *subscribe_data;
} PinosContextImpl;
/**
@ -112,6 +109,7 @@ core_dispatch_func (void *object,
PinosSubscriptionEvent event;
pinos_log_debug ("got core info %d", type);
if (proxy->user_data == NULL)
event = PINOS_SUBSCRIPTION_EVENT_NEW;
else
@ -119,13 +117,11 @@ core_dispatch_func (void *object,
proxy->user_data = pinos_core_info_update (proxy->user_data, m->info);
if (impl->subscribe_func) {
impl->subscribe_func (this,
event,
proxy->type,
proxy->id,
impl->subscribe_data);
}
pinos_signal_emit (&this->subscription,
this,
event,
proxy->type,
proxy->id);
break;
}
case PINOS_MESSAGE_NOTIFY_DONE:
@ -136,6 +132,12 @@ core_dispatch_func (void *object,
context_set_state (this, PINOS_CONTEXT_STATE_CONNECTED, NULL);
break;
}
case PINOS_MESSAGE_ERROR:
{
PinosMessageError *m = message;
context_set_state (this, PINOS_CONTEXT_STATE_ERROR, m->error);
break;
}
case PINOS_MESSAGE_REMOVE_ID:
{
PinosMessageRemoveId *m = message;
@ -180,13 +182,11 @@ module_dispatch_func (void *object,
proxy->user_data = pinos_module_info_update (proxy->user_data, m->info);
if (impl->subscribe_func) {
impl->subscribe_func (this,
event,
proxy->type,
proxy->id,
impl->subscribe_data);
}
pinos_signal_emit (&this->subscription,
this,
event,
proxy->type,
proxy->id);
break;
}
@ -221,13 +221,11 @@ node_dispatch_func (void *object,
proxy->user_data = pinos_node_info_update (proxy->user_data, m->info);
if (impl->subscribe_func) {
impl->subscribe_func (this,
event,
proxy->type,
proxy->id,
impl->subscribe_data);
}
pinos_signal_emit (&this->subscription,
this,
event,
proxy->type,
proxy->id);
break;
}
default:
@ -261,13 +259,11 @@ client_dispatch_func (void *object,
proxy->user_data = pinos_client_info_update (proxy->user_data, m->info);
if (impl->subscribe_func) {
impl->subscribe_func (this,
event,
proxy->type,
proxy->id,
impl->subscribe_data);
}
pinos_signal_emit (&this->subscription,
this,
event,
proxy->type,
proxy->id);
break;
}
default:
@ -301,13 +297,11 @@ link_dispatch_func (void *object,
proxy->user_data = pinos_link_info_update (proxy->user_data, m->info);
if (impl->subscribe_func) {
impl->subscribe_func (this,
event,
proxy->type,
proxy->id,
impl->subscribe_data);
}
pinos_signal_emit (&this->subscription,
this,
event,
proxy->type,
proxy->id);
break;
}
default:
@ -338,24 +332,32 @@ registry_dispatch_func (void *object,
proxy = pinos_proxy_new (this,
SPA_ID_INVALID,
this->uri.node);
if (proxy == NULL)
goto no_mem;
proxy->dispatch_func = node_dispatch_func;
proxy->dispatch_data = impl;
} else if (!strcmp (ng->type, PINOS_MODULE_URI)) {
proxy = pinos_proxy_new (this,
SPA_ID_INVALID,
this->uri.module);
if (proxy == NULL)
goto no_mem;
proxy->dispatch_func = module_dispatch_func;
proxy->dispatch_data = impl;
} else if (!strcmp (ng->type, PINOS_CLIENT_URI)) {
proxy = pinos_proxy_new (this,
SPA_ID_INVALID,
this->uri.client);
if (proxy == NULL)
goto no_mem;
proxy->dispatch_func = client_dispatch_func;
proxy->dispatch_data = impl;
} else if (!strcmp (ng->type, PINOS_LINK_URI)) {
proxy = pinos_proxy_new (this,
SPA_ID_INVALID,
this->uri.link);
if (proxy == NULL)
goto no_mem;
proxy->dispatch_func = link_dispatch_func;
proxy->dispatch_data = impl;
}
@ -376,13 +378,11 @@ registry_dispatch_func (void *object,
PinosMessageNotifyGlobalRemove *ng = message;
pinos_log_debug ("got global remove %u", ng->id);
if (impl->subscribe_func) {
impl->subscribe_func (this,
PINOS_SUBSCRIPTION_EVENT_REMOVE,
SPA_ID_INVALID,
ng->id,
impl->subscribe_data);
}
pinos_signal_emit (&this->subscription,
this,
PINOS_SUBSCRIPTION_EVENT_REMOVE,
SPA_ID_INVALID,
ng->id);
break;
}
default:
@ -390,6 +390,9 @@ registry_dispatch_func (void *object,
break;
}
return SPA_RESULT_OK;
no_mem:
return SPA_RESULT_NO_MEMORY;
}
static void
@ -477,6 +480,9 @@ pinos_context_new (PinosLoop *loop,
PinosContext *this;
impl = calloc (1, sizeof (PinosContextImpl));
if (impl == NULL)
return NULL;
this = &impl->this;
pinos_log_debug ("context %p: new", impl);
@ -484,6 +490,9 @@ pinos_context_new (PinosLoop *loop,
if (properties == NULL)
properties = pinos_properties_new ("application.name", name, NULL);
if (properties == NULL)
goto no_mem;
pinos_fill_context_properties (properties);
this->properties = properties;
@ -503,9 +512,15 @@ pinos_context_new (PinosLoop *loop,
spa_list_init (&this->proxy_list);
pinos_signal_init (&this->state_changed);
pinos_signal_init (&this->subscription);
pinos_signal_init (&this->destroy_signal);
return this;
no_mem:
free (this->name);
free (impl);
return NULL;
}
void
@ -523,14 +538,10 @@ pinos_context_destroy (PinosContext *context)
spa_list_for_each_safe (proxy, t2, &context->proxy_list, link)
pinos_proxy_destroy (proxy);
if (context->name)
free (context->name);
free (context->name);
if (context->properties)
pinos_properties_free (context->properties);
if (context->error)
free (context->error);
free (context->error);
free (impl);
}
@ -579,8 +590,7 @@ pinos_context_connect (PinosContext *context)
if (name_size > (int)sizeof addr.sun_path) {
pinos_log_error ("socket path \"%s/%s\" plus null terminator exceeds 108 bytes",
runtime_dir, name);
close (fd);
return false;
goto error_close;
};
size = offsetof (struct sockaddr_un, sun_path) + name_size;
@ -589,12 +599,14 @@ pinos_context_connect (PinosContext *context)
context_set_state (context,
PINOS_CONTEXT_STATE_ERROR,
"connect failed: %s", strerror (errno));
close (fd);
return false;
goto error_close;
}
impl->fd = fd;
impl->connection = pinos_connection_new (fd);
if (impl->connection == NULL)
goto error_close;
impl->fd = fd;
pinos_loop_add_io (context->loop,
fd,
@ -606,6 +618,9 @@ pinos_context_connect (PinosContext *context)
context->core_proxy = pinos_proxy_new (context,
SPA_ID_INVALID,
context->uri.core);
if (context->core_proxy == NULL)
goto no_proxy;
context->core_proxy->dispatch_func = core_dispatch_func;
context->core_proxy->dispatch_data = impl;
@ -618,6 +633,9 @@ pinos_context_connect (PinosContext *context)
context->registry_proxy = pinos_proxy_new (context,
SPA_ID_INVALID,
context->uri.registry);
if (context->registry_proxy == NULL)
goto no_registry;
context->registry_proxy->dispatch_func = registry_dispatch_func;
context->registry_proxy->dispatch_data = impl;
@ -628,6 +646,14 @@ pinos_context_connect (PinosContext *context)
&grm,
true);
return true;
no_registry:
pinos_proxy_destroy (context->core_proxy);
no_proxy:
pinos_connection_destroy (impl->connection);
error_close:
close (fd);
return false;
}
/**
@ -645,6 +671,8 @@ pinos_context_disconnect (PinosContext *context)
impl->disconnecting = true;
pinos_proxy_destroy (context->registry_proxy);
pinos_proxy_destroy (context->core_proxy);
pinos_connection_destroy (impl->connection);
close (impl->fd);
@ -653,17 +681,6 @@ pinos_context_disconnect (PinosContext *context)
return true;
}
void
pinos_context_subscribe (PinosContext *context,
PinosSubscriptionFunc func,
void *data)
{
PinosContextImpl *impl = SPA_CONTAINER_OF (context, PinosContextImpl, this);
impl->subscribe_func = func;
impl->subscribe_data = data;
}
void
pinos_context_get_core_info (PinosContext *context,
PinosCoreInfoCallback cb,

23
pinos/client/context.h
View file

@ -29,6 +29,7 @@ typedef struct _PinosContext PinosContext;
#include <pinos/client/map.h>
#include <pinos/client/loop.h>
#include <pinos/client/properties.h>
#include <pinos/client/subscribe.h>
#include <pinos/client/proxy.h>
#include <pinos/client/uri.h>
@ -66,19 +67,25 @@ struct _PinosContext {
PinosProxy *core_proxy;
PinosProxy *registry_proxy;
PinosMap objects;
PinosMap objects;
SpaList global_list;
SpaList stream_list;
SpaList proxy_list;
SpaList global_list;
SpaList stream_list;
SpaList proxy_list;
PinosSendFunc send_func;
void *send_data;
PinosSendFunc send_func;
void *send_data;
PinosContextState state;
char *error;
PINOS_SIGNAL (state_changed, (PinosListener *listener,
PinosContext *context));
PINOS_SIGNAL (state_changed, (PinosListener *listener,
PinosContext *context));
PINOS_SIGNAL (subscription, (PinosListener *listener,
PinosContext *context,
PinosSubscriptionEvent event,
uint32_t type,
uint32_t id));
PINOS_SIGNAL (destroy_signal, (PinosListener *listener,
PinosContext *context));

28
pinos/client/introspect.c
View file

@ -127,7 +127,11 @@ pinos_spa_dict_copy (SpaDict *dict)
return NULL;
copy = calloc (1, sizeof (SpaDict));
if (copy == NULL)
goto no_mem;
copy->items = calloc (dict->n_items, sizeof (SpaDictItem));
if (copy->items == NULL)
goto no_items;
copy->n_items = dict->n_items;
for (i = 0; i < dict->n_items; i++) {
@ -135,6 +139,11 @@ pinos_spa_dict_copy (SpaDict *dict)
copy->items[i].value = strdup (dict->items[i].value);
}
return copy;
no_items:
free (copy);
no_mem:
return NULL;
}
PinosCoreInfo *
@ -148,6 +157,8 @@ pinos_core_info_update (PinosCoreInfo *info,
if (info == NULL) {
info = calloc (1, sizeof (PinosCoreInfo));
if (info == NULL)
return NULL;
change_mask = ~0;
} else {
change_mask = info->change_mask | update->change_mask;
@ -215,6 +226,8 @@ pinos_node_info_update (PinosNodeInfo *info,
if (info == NULL) {
info = calloc (1, sizeof (PinosNodeInfo));
if (info == NULL)
return NULL;
change_mask = ~0;
} else {
change_mask = info->change_mask | update->change_mask;
@ -229,6 +242,9 @@ pinos_node_info_update (PinosNodeInfo *info,
}
if (update->change_mask & (1 << 1)) {
info->state = update->state;
if (info->error)
free ((void*)info->error);
info->error = update->error ? strdup (update->error) : NULL;
}
if (update->change_mask & (1 << 2)) {
if (info->props)
@ -245,6 +261,8 @@ pinos_node_info_free (PinosNodeInfo *info)
return;
if (info->name)
free ((void*)info->name);
if (info->error)
free ((void*)info->error);
if (info->props)
pinos_spa_dict_destroy (info->props);
free (info);
@ -261,6 +279,8 @@ pinos_module_info_update (PinosModuleInfo *info,
if (info == NULL) {
info = calloc (1, sizeof (PinosModuleInfo));
if (info == NULL)
return NULL;
change_mask = ~0;
} else {
change_mask = info->change_mask | update->change_mask;
@ -320,6 +340,8 @@ pinos_client_info_update (PinosClientInfo *info,
if (info == NULL) {
info = calloc (1, sizeof (PinosClientInfo));
if (info == NULL)
return NULL;
change_mask = ~0;
} else {
change_mask = info->change_mask | update->change_mask;
@ -336,7 +358,7 @@ pinos_client_info_update (PinosClientInfo *info,
}
void
pinos_client_info_free (PinosClientInfo *info)
pinos_client_info_free (PinosClientInfo *info)
{
if (info == NULL)
return;
@ -356,6 +378,8 @@ pinos_link_info_update (PinosLinkInfo *info,
if (info == NULL) {
info = calloc (1, sizeof (PinosLinkInfo));
if (info == NULL)
return NULL;
change_mask = ~0;
} else {
change_mask = info->change_mask | update->change_mask;
@ -376,7 +400,7 @@ pinos_link_info_update (PinosLinkInfo *info,
}
void
pinos_link_info_free (PinosLinkInfo *info)
pinos_link_info_free (PinosLinkInfo *info)
{
free (info);
}

14
pinos/client/introspect.h
View file

@ -240,18 +240,20 @@ void pinos_context_get_client_info_by_id (PinosContext *co
* @id: generic id of the node
* @change_mask: bitfield of changed fields since last call
* @name: name the node, suitable for display
* @props: the properties of the node
* @state: the current state of the node
* @error: an error reason if @state is error
* @props: the properties of the node
*
* The node information. Extra information can be added in later
* versions.
*/
struct _PinosNodeInfo {
uint32_t id;
uint64_t change_mask;
const char *name;
PinosNodeState state;
SpaDict *props;
uint32_t id;
uint64_t change_mask;
const char *name;
PinosNodeState state;
const char *error;
SpaDict *props;
};
PinosNodeInfo * pinos_node_info_update (PinosNodeInfo *info,

23
pinos/client/loop.c
View file

@ -312,6 +312,8 @@ loop_add_io (SpaLoopUtils *utils,
SpaSourceImpl *source;
source = calloc (1, sizeof (SpaSourceImpl));
if (source == NULL)
return NULL;
source->source.loop = &impl->loop;
source->source.func = source_io_func;
@ -353,6 +355,8 @@ loop_add_idle (SpaLoopUtils *utils,
SpaSourceImpl *source;
source = calloc (1, sizeof (SpaSourceImpl));
if (source == NULL)
return NULL;
source->source.loop = &impl->loop;
source->source.func = source_idle_func;
@ -408,6 +412,8 @@ loop_add_event (SpaLoopUtils *utils,
SpaSourceImpl *source;
source = calloc (1, sizeof (SpaSourceImpl));
if (source == NULL)
return NULL;
source->source.loop = &impl->loop;
source->source.func = source_event_func;
@ -454,6 +460,8 @@ loop_add_timer (SpaLoopUtils *utils,
SpaSourceImpl *source;
source = calloc (1, sizeof (SpaSourceImpl));
if (source == NULL)
return NULL;
source->source.loop = &impl->loop;
source->source.func = source_timer_func;
@ -516,6 +524,8 @@ loop_add_signal (SpaLoopUtils *utils,
sigset_t mask;
source = calloc (1, sizeof (SpaSourceImpl));
if (source == NULL)
return NULL;
source->source.loop = &impl->loop;
source->source.func = source_signal_func;
@ -557,13 +567,14 @@ pinos_loop_new (void)
PinosLoop *this;
impl = calloc (1, sizeof (PinosLoopImpl));
if (impl == NULL)
return NULL;
this = &impl->this;
impl->epoll_fd = epoll_create1 (EPOLL_CLOEXEC);
if (impl->epoll_fd == -1) {
free (impl);
return NULL;
}
if (impl->epoll_fd == -1)
goto no_epoll;
spa_list_init (&impl->source_list);
@ -600,6 +611,10 @@ pinos_loop_new (void)
spa_ringbuffer_init (&impl->buffer, DATAS_SIZE);
return this;
no_epoll:
free (impl);
return NULL;
}
void

10
pinos/client/mem.c
View file

@ -91,14 +91,14 @@ pinos_memblock_alloc (PinosMemblockFlags flags,
mem->fd = memfd_create ("pinos-memfd", MFD_CLOEXEC | MFD_ALLOW_SEALING);
if (mem->fd == -1) {
pinos_log_error ("Failed to create memfd: %s\n", strerror (errno));
return SPA_RESULT_ERROR;
return SPA_RESULT_ERRNO;
}
#else
char filename[] = "/dev/shm/spa-tmpfile.XXXXXX";
mem->fd = mkostemp (filename, O_CLOEXEC);
if (mem->fd == -1) {
pinos_log_error ("Failed to create temporary file: %s\n", strerror (errno));
return SPA_RESULT_ERROR;
return SPA_RESULT_ERRNO;
}
unlink (filename);
#endif
@ -106,7 +106,7 @@ pinos_memblock_alloc (PinosMemblockFlags flags,
if (ftruncate (mem->fd, size) < 0) {
pinos_log_warn ("Failed to truncate temporary file: %s", strerror (errno));
close (mem->fd);
return SPA_RESULT_ERROR;
return SPA_RESULT_ERRNO;
}
#ifdef USE_MEMFD
if (flags & PINOS_MEMBLOCK_FLAG_SEAL) {
@ -125,11 +125,15 @@ pinos_memblock_alloc (PinosMemblockFlags flags,
prot |= PROT_WRITE;
mem->ptr = mmap (NULL, size, prot, MAP_SHARED, mem->fd, 0);
if (mem->ptr == MAP_FAILED)
return SPA_RESULT_NO_MEMORY;
} else {
mem->ptr = NULL;
}
} else {
mem->ptr = malloc (size);
if (mem->ptr == NULL)
return SPA_RESULT_NO_MEMORY;
mem->fd = -1;
}
return SPA_RESULT_OK;

12
pinos/client/properties.c
View file

@ -78,6 +78,9 @@ pinos_properties_new (const char *key, ...)
const char *value;
impl = calloc (1, sizeof (PinosPropertiesImpl));
if (impl == NULL)
return NULL;
pinos_array_init (&impl->items);
va_start (varargs, key);
@ -106,6 +109,9 @@ pinos_properties_new_dict (const SpaDict *dict)
PinosPropertiesImpl *impl;
impl = calloc (1, sizeof (PinosPropertiesImpl));
if (impl == NULL)
return NULL;
pinos_array_init (&impl->items);
for (i = 0; i < dict->n_items; i++)
@ -130,6 +136,9 @@ pinos_properties_copy (PinosProperties *properties)
SpaDictItem *item;
copy = pinos_properties_new (NULL, NULL);
if (copy == NULL)
return NULL;
pinos_array_for_each (item, &impl->items)
add_func (copy, strdup (item->key), strdup (item->value));
@ -154,6 +163,9 @@ pinos_properties_merge (PinosProperties *oldprops,
void * state = NULL;
res = pinos_properties_copy (oldprops);
if (res == NULL)
return NULL;
while ((key = pinos_properties_iterate (newprops, &state))) {
pinos_properties_set (res,
key,

3
pinos/client/proxy.c
View file

@ -33,6 +33,9 @@ pinos_proxy_new (PinosContext *context,
PinosProxy *this;
impl = calloc (1, sizeof (PinosProxyImpl));
if (impl == NULL)
return NULL;
this = &impl->this;
this->context = context;

3
pinos/client/rtkit.c
View file

@ -64,6 +64,9 @@ pinos_rtkit_bus_get_system (void)
dbus_error_init(&error);
bus = calloc (1, sizeof (PinosRTKitBus));
if (bus == NULL)
return NULL;
bus->bus = dbus_bus_get_private (DBUS_BUS_SYSTEM, &error);
if (bus->bus == NULL)
goto error;

16
pinos/client/stream.c
View file

@ -173,19 +173,25 @@ pinos_stream_new (PinosContext *context,
PinosStream *this;
impl = calloc (1, sizeof (PinosStreamImpl));
if (impl == NULL)
return NULL;
this = &impl->this;
pinos_log_debug ("stream %p: new", impl);
this->context = context;
this->name = strdup (name);
if (props == NULL) {
props = pinos_properties_new ("media.name", name, NULL);
} else if (!pinos_properties_get (props, "media.name")) {
pinos_properties_set (props, "media.name", name);
}
if (props == NULL)
goto no_mem;
this->properties = props;
this->context = context;
this->name = strdup (name);
pinos_signal_init (&this->destroy_signal);
pinos_signal_init (&this->state_changed);
pinos_signal_init (&this->format_changed);
@ -206,6 +212,10 @@ pinos_stream_new (PinosContext *context,
spa_list_insert (&context->stream_list, &this->link);
return this;
no_mem:
free (impl);
return NULL;
}
void

10
pinos/client/subscribe.h
View file

@ -48,16 +48,6 @@ typedef enum {
PINOS_SUBSCRIPTION_EVENT_REMOVE = 2,
} PinosSubscriptionEvent;
typedef void (*PinosSubscriptionFunc) (PinosContext *context,
PinosSubscriptionEvent event,
uint32_t type,
uint32_t id,
void *data);
void pinos_context_subscribe (PinosContext *context,
PinosSubscriptionFunc func,
void *data);
#ifdef __cplusplus
}
#endif

7
pinos/client/thread-mainloop.c
View file

@ -83,12 +83,14 @@ pinos_thread_main_loop_new (PinosLoop *loop,
pthread_mutexattr_t attr;
impl = calloc (1, sizeof (PinosThreadMainLoopImpl));
if (impl == NULL)
return NULL;
this = &impl->this;
pinos_log_debug ("thread-mainloop %p: new", impl);
this->loop = loop;
if (name)
this->name = strdup (name);
this->name = name ? strdup (name) : NULL;
pinos_loop_set_hooks (loop,
pre_hook,
@ -97,7 +99,6 @@ pinos_thread_main_loop_new (PinosLoop *loop,
pinos_signal_init (&this->destroy_signal);
pthread_mutexattr_init (&attr);
pthread_mutexattr_settype (&attr, PTHREAD_MUTEX_RECURSIVE);
pthread_mutex_init (&impl->lock, &attr);

6
pinos/client/transport.c
View file

@ -99,6 +99,9 @@ pinos_transport_new (unsigned int max_inputs,
area.n_outputs = 0;
impl = calloc (1, sizeof (PinosTransportImpl));
if (impl == NULL)
return NULL;
impl->offset = 0;
trans = &impl->trans;
@ -124,6 +127,9 @@ pinos_transport_new_from_info (PinosTransportInfo *info)
void *tmp;
impl = calloc (1, sizeof (PinosTransportImpl));
if (impl == NULL)
return NULL;
trans = &impl->trans;
pinos_signal_init (&trans->destroy_signal);