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

Remove monitor poll and hook in mainloop

Browse source 
Provide a mainloop SpaPoll and let the monitors hook into it.
This commit is contained in:
Wim Taymans 2016-10-07 18:19:03 +02:00
parent 2905d91467
commit 50c3b40cd0
8 changed files with 133 additions and 149 deletions
Download patch file Download diff file Expand all files Collapse all files

48
pinos/modules/spa/spa-alsa-monitor.c
View file

@ -49,11 +49,6 @@ struct _PinosSpaALSAMonitorPrivate
URI uri;
GSource *watch_source;
unsigned int n_poll;
SpaPollItem poll[16];
GHashTable *nodes;
};
@ -165,30 +160,12 @@ remove_item (PinosSpaALSAMonitor *this, SpaMonitorItem *item)
}
}
static gboolean
poll_event (GIOChannel *source,
GIOCondition condition,
gpointer user_data)
{
PinosSpaALSAMonitor *this = user_data;
PinosSpaALSAMonitorPrivate *priv = this->priv;
SpaPollNotifyData data;
data.user_data = priv->poll[0].user_data;
data.fds = priv->poll[0].fds;
data.n_fds = priv->poll[0].n_fds;
priv->poll[0].after_cb (&data);
return TRUE;
}
static void
on_monitor_event (SpaMonitor *monitor,
SpaMonitorEvent *event,
void *user_data)
{
PinosSpaALSAMonitor *this = user_data;
PinosSpaALSAMonitorPrivate *priv = this->priv;
switch (event->type) {
case SPA_MONITOR_EVENT_TYPE_ADDED:
@ -208,31 +185,6 @@ on_monitor_event (SpaMonitor *monitor,
g_debug ("alsa-monitor %p: changed: \"%s\"", this, item->name);
break;
}
case SPA_MONITOR_EVENT_TYPE_ADD_POLL:
{
SpaPollItem *item = event->data;
GIOChannel *channel;
priv->poll[priv->n_poll] = *item;
priv->n_poll++;
channel = g_io_channel_unix_new (item->fds[0].fd);
priv->watch_source = g_io_create_watch (channel, G_IO_IN);
g_io_channel_unref (channel);
g_source_set_callback (priv->watch_source, (GSourceFunc) poll_event, this, NULL);
g_source_attach (priv->watch_source, g_main_context_get_thread_default ());
g_source_unref (priv->watch_source);
break;
}
case SPA_MONITOR_EVENT_TYPE_UPDATE_POLL:
break;
case SPA_MONITOR_EVENT_TYPE_REMOVE_POLL:
{
priv->n_poll--;
g_source_destroy (priv->watch_source);
priv->watch_source = NULL;
break;
}
default:
break;
}

48
pinos/modules/spa/spa-v4l2-monitor.c
View file

@ -49,11 +49,6 @@ struct _PinosSpaV4l2MonitorPrivate
URI uri;
GSource *watch_source;
unsigned int n_poll;
SpaPollItem poll[16];
GHashTable *nodes;
};
@ -165,30 +160,12 @@ remove_item (PinosSpaV4l2Monitor *this, SpaMonitorItem *item)
}
}
static gboolean
poll_event (GIOChannel *source,
GIOCondition condition,
gpointer user_data)
{
PinosSpaV4l2Monitor *this = user_data;
PinosSpaV4l2MonitorPrivate *priv = this->priv;
SpaPollNotifyData data;
data.user_data = priv->poll[0].user_data;
data.fds = priv->poll[0].fds;
data.n_fds = priv->poll[0].n_fds;
priv->poll[0].after_cb (&data);
return TRUE;
}
static void
on_monitor_event (SpaMonitor *monitor,
SpaMonitorEvent *event,
void *user_data)
{
PinosSpaV4l2Monitor *this = user_data;
PinosSpaV4l2MonitorPrivate *priv = this->priv;
switch (event->type) {
case SPA_MONITOR_EVENT_TYPE_ADDED:
@ -208,31 +185,6 @@ on_monitor_event (SpaMonitor *monitor,
g_debug ("v4l2-monitor %p: changed: \"%s\"", this, item->name);
break;
}
case SPA_MONITOR_EVENT_TYPE_ADD_POLL:
{
SpaPollItem *item = event->data;
GIOChannel *channel;
priv->poll[priv->n_poll] = *item;
priv->n_poll++;
channel = g_io_channel_unix_new (item->fds[0].fd);
priv->watch_source = g_io_create_watch (channel, G_IO_IN);
g_io_channel_unref (channel);
g_source_set_callback (priv->watch_source, (GSourceFunc) poll_event, this, NULL);
g_source_attach (priv->watch_source, g_main_context_get_thread_default ());
g_source_unref (priv->watch_source);
break;
}
case SPA_MONITOR_EVENT_TYPE_UPDATE_POLL:
break;
case SPA_MONITOR_EVENT_TYPE_REMOVE_POLL:
{
priv->n_poll--;
g_source_destroy (priv->watch_source);
priv->watch_source = NULL;
break;
}
default:
break;
}

78
pinos/server/daemon.c
View file

@ -57,8 +57,9 @@ struct _PinosDaemonPrivate
GHashTable *node_factories;
SpaSupport support[3];
SpaSupport support[4];
SpaLog log;
SpaPoll main_loop;
};
enum
@ -868,6 +869,69 @@ do_log (SpaLog *log,
va_end (args);
}
typedef struct {
PinosDaemonPrivate *priv;
SpaPollItem item;
} PollData;
static gboolean
poll_event (GIOChannel *source,
GIOCondition condition,
gpointer user_data)
{
PollData *data = user_data;
SpaPollNotifyData d;
d.user_data = data->item.user_data;
d.fds = data->item.fds;
d.n_fds = data->item.n_fds;
data->item.after_cb (&d);
return TRUE;
}
static SpaResult
do_add_item (SpaPoll *poll,
SpaPollItem *item)
{
PinosDaemonPrivate *priv = SPA_CONTAINER_OF (poll, PinosDaemonPrivate, main_loop);
GIOChannel *channel;
GSource *source;
PollData data;
channel = g_io_channel_unix_new (item->fds[0].fd);
source = g_io_create_watch (channel, G_IO_IN);
g_io_channel_unref (channel);
data.priv = priv;
data.item = *item;
g_source_set_callback (source, (GSourceFunc) poll_event, g_slice_dup (PollData, &data) , NULL);
item->id = g_source_attach (source, g_main_context_get_thread_default ());
g_source_unref (source);
return SPA_RESULT_OK;
}
static SpaResult
do_update_item (SpaPoll *poll,
SpaPollItem *item)
{
return SPA_RESULT_OK;
}
static SpaResult
do_remove_item (SpaPoll *poll,
SpaPollItem *item)
{
GSource *source;
source = g_main_context_find_source_by_id (g_main_context_get_thread_default (), item->id);
g_source_destroy (source);
return SPA_RESULT_OK;
}
static void
pinos_daemon_init (PinosDaemon * daemon)
{
@ -886,6 +950,14 @@ pinos_daemon_init (PinosDaemon * daemon)
g_object_unref);
priv->loop = pinos_rtloop_new();
priv->main_loop.handle = NULL;
priv->main_loop.size = sizeof (SpaPoll);
priv->main_loop.info = NULL;
priv->main_loop.info = NULL;
priv->main_loop.add_item = do_add_item;
priv->main_loop.update_item = do_update_item;
priv->main_loop.remove_item = do_remove_item;
priv->log.handle = NULL;
priv->log.size = sizeof (SpaLog);
priv->log.info = NULL;
@ -902,8 +974,10 @@ pinos_daemon_init (PinosDaemon * daemon)
priv->support[1].data = daemon->log;
priv->support[2].uri = SPA_POLL__DataLoop;
priv->support[2].data = &priv->loop->poll;
priv->support[3].uri = SPA_POLL__MainLoop;
priv->support[3].data = &priv->main_loop;
daemon->support = priv->support;
daemon->n_support = 3;
daemon->n_support = 4;
}
/**