make separate sockets for data and control

pinos/server/client-node.c

@@ -40,7 +40,9 @@
 struct _PinosClientNodePrivate
 {
   int fd;
+  int rtfd;
   GSocket *sockets[2];
+  GSocket *rtsockets[2];
   SpaHandle *handle;
 };
 
@@ -104,7 +106,7 @@ pinos_client_node_set_property (GObject      *_object,
  */
 GSocket *
 pinos_client_node_get_socket_pair (PinosClientNode  *this,
-                                   GError          **error)
+                                     GError          **error)
 {
   PinosNode *node;
   PinosClientNodePrivate *priv;
@@ -156,6 +158,70 @@ create_failed:
   }
 }
 
+/**
+ * pinos_client_node_get_rtsocket_pair:
+ * @node: a #PinosClientNode
+ * @error: a #GError
+ *
+ * Create or return a previously create socket pair for @node. The
+ * Socket for the other end is returned.
+ *
+ * Returns: a #GSocket that can be used to send/receive buffers to node.
+ */
+GSocket *
+pinos_client_node_get_rtsocket_pair (PinosClientNode  *this,
+                                     GError          **error)
+{
+  PinosNode *node;
+  PinosClientNodePrivate *priv;
+
+  g_return_val_if_fail (PINOS_IS_CLIENT_NODE (this), FALSE);
+  node = PINOS_NODE (this);
+  priv = this->priv;
+
+  if (priv->rtsockets[1] == NULL) {
+    SpaProps *props;
+    SpaPropValue value;
+    int fd[2];
+
+    if (socketpair (AF_UNIX, SOCK_STREAM, 0, fd) != 0)
+      goto no_sockets;
+
+    priv->rtsockets[0] = g_socket_new_from_fd (fd[0], error);
+    if (priv->rtsockets[0] == NULL)
+      goto create_failed;
+
+    priv->rtsockets[1] = g_socket_new_from_fd (fd[1], error);
+    if (priv->rtsockets[1] == NULL)
+      goto create_failed;
+
+    priv->rtfd = g_socket_get_fd (priv->rtsockets[0]);
+
+    spa_node_get_props (node->node, &props);
+    value.value = &priv->rtfd;
+    value.size = sizeof (int);
+    spa_props_set_value (props, spa_props_index_for_name (props, "rt-socket"), &value);
+    spa_node_set_props (node->node, props);
+  }
+  return g_object_ref (priv->rtsockets[1]);
+
+  /* ERRORS */
+no_sockets:
+  {
+    g_set_error (error,
+                 G_IO_ERROR,
+                 g_io_error_from_errno (errno),
+                 "could not create socketpair: %s", strerror (errno));
+    return NULL;
+  }
+create_failed:
+  {
+    g_clear_object (&priv->rtsockets[0]);
+    g_clear_object (&priv->rtsockets[1]);
+    return NULL;
+  }
+}
+
 static void
 pinos_client_node_dispose (GObject * object)
 {
@@ -171,6 +237,7 @@ pinos_client_node_dispose (GObject * object)
   value.value = &fd;
   value.size = sizeof (int);
   spa_props_set_value (props, spa_props_index_for_name (props, "socket"), &value);
+  spa_props_set_value (props, spa_props_index_for_name (props, "rt-socket"), &value);
   spa_node_set_props (node->node, props);
 
   G_OBJECT_CLASS (pinos_client_node_parent_class)->dispose (object);
@@ -186,6 +253,8 @@ pinos_client_node_finalize (GObject * object)
 
   g_clear_object (&priv->sockets[0]);
   g_clear_object (&priv->sockets[1]);
+  g_clear_object (&priv->rtsockets[0]);
+  g_clear_object (&priv->rtsockets[1]);
   spa_handle_clear (priv->handle);
   g_free (priv->handle);
 

pinos/server/client-node.h

@@ -69,6 +69,8 @@ PinosNode *        pinos_client_node_new                  (PinosDaemon     *daem
 
 GSocket *          pinos_client_node_get_socket_pair      (PinosClientNode  *node,
                                                            GError          **error);
+GSocket *          pinos_client_node_get_rtsocket_pair    (PinosClientNode  *node,
+                                                           GError          **error);
 
 G_END_DECLS
 

pinos/server/daemon.c

@@ -378,8 +378,8 @@ handle_create_client_node (PinosDaemon1           *interface,
   PinosProperties *props;
   GError *error = NULL;
   GUnixFDList *fdlist;
-  GSocket *socket;
-  gint fdidx;
+  GSocket *socket, *rtsocket;
+  gint fdidx, rtfdidx;
 
   sender = g_dbus_method_invocation_get_sender (invocation);
   client = sender_get_client (daemon, sender, TRUE);
@@ -397,6 +397,10 @@ handle_create_client_node (PinosDaemon1           *interface,
   if (socket == NULL)
     goto no_socket;
 
+  rtsocket = pinos_client_node_get_rtsocket_pair (PINOS_CLIENT_NODE (node), &error);
+  if (rtsocket == NULL)
+    goto no_socket;
+
   pinos_client_add_object (client, G_OBJECT (node));
 
   object_path = pinos_node_get_object_path (PINOS_NODE (node));
@@ -405,10 +409,12 @@ handle_create_client_node (PinosDaemon1           *interface,
 
   fdlist = g_unix_fd_list_new ();
   fdidx = g_unix_fd_list_append (fdlist, g_socket_get_fd (socket), &error);
+  rtfdidx = g_unix_fd_list_append (fdlist, g_socket_get_fd (rtsocket), &error);
   g_object_unref (socket);
+  g_object_unref (rtsocket);
 
   g_dbus_method_invocation_return_value_with_unix_fd_list (invocation,
-           g_variant_new ("(oh)", object_path, fdidx), fdlist);
+           g_variant_new ("(ohh)", object_path, fdidx, rtfdidx), fdlist);
   g_object_unref (fdlist);
 
   return TRUE;
@@ -943,8 +949,11 @@ poll_event (GIOChannel *source,
   PollData *data = user_data;
   SpaPollNotifyData d;
 
+  g_debug ("poll event %d", data->item.fds[0].fd);
+
   d.user_data = data->item.user_data;
   d.fds = data->item.fds;
+  d.fds[0].revents = condition;
   d.n_fds = data->item.n_fds;
   data->item.after_cb (&d);
 
@@ -960,6 +969,7 @@ do_add_item (SpaPoll     *poll,
   GSource *source;
   PollData data;
 
+  g_debug ("add main poll");
   channel = g_io_channel_unix_new (item->fds[0].fd);
   source = g_io_create_watch (channel, G_IO_IN);
   g_io_channel_unref (channel);
@@ -987,6 +997,7 @@ do_remove_item (SpaPoll     *poll,
 {
   GSource *source;
 
+  g_debug ("remove main poll %d", item->id);
   source = g_main_context_find_source_by_id (g_main_context_get_thread_default (), item->id);
   g_source_destroy (source);