Changeset 6c2201b933ebc1d6c4049a3138d2e46aae3e56d7

Timestamp:

11/08/10 01:19:02 (3 years ago)

Author:

Nedko Arnaudov <nedko@…>

Children:

bea7c694e008ff9095e18e746d1c6bdd9e0f5ec8

Parents:

8aebce6821ae5d0266dcbc3de61ad34fe83e39e3

git-committer:

Nedko Arnaudov <nedko@arnaudov.name> / 2010-11-08T01:19:02Z+0200

Message:

ladishd: save [only] relevant a2j ports for the vgraph being saved

For studio saves, save only studio vgraph a2j ports.
For room project saves, save only room vgraph a2j ports.
If there is not a2j ports for the vgraph being saved, an empty a2j client will not be saved anymore

Location:

daemon

Files:

• graph.c (modified) (4 diffs)
• graph.h (modified) (1 diff)
• load.c (modified) (1 diff)
• room.c (modified) (2 diffs)
• save.c (modified) (5 diffs)
• virtualizer.c (modified) (8 diffs)
• virtualizer.h (modified) (1 diff)

daemon/graph.c

@@ -2171 +2171 @@
   ladish_graph_handle graph_handle,
   bool skip_hidden,
-  void * vgraph_filter,
   void * callback_context,
   bool
@@ -2204 +2203 @@
   struct list_head * port_node_ptr;
   struct ladish_graph_port * port_ptr;
-  void * vgraph;
 
   list_for_each(client_node_ptr, &graph_ptr->clients)
@@ -2213 +2211 @@
     {
       continue;
-    }
-
-    if (vgraph_filter != NULL)
-    {
-      vgraph = ladish_client_get_vgraph(client_ptr->client);
-      if (vgraph != vgraph_filter)
-      {
-        continue;
-      }
     }
 
@@ -2590 +2579 @@
     src,
     skip_hidden,
-    NULL,
     dest,
     ladish_graph_copy_client_begin_callback,

daemon/graph.h

@@ -183 +183 @@
   ladish_graph_handle graph_handle,
   bool skip_hidden,
-  void * vgraph_filter,
   void * callback_context,
   bool

daemon/load.c

@@ -359 +359 @@
   ctx.app_supervisor = app_supervisor;
 
-  ladish_graph_iterate_nodes(ladish_studio_get_jack_graph(), false, NULL, &ctx, interlink_client, NULL, NULL);
-}
+  ladish_graph_iterate_nodes(ladish_studio_get_jack_graph(), false, &ctx, interlink_client, NULL, NULL);
+}

daemon/room.c

@@ -538 +538 @@
     room_ptr->graph,
     false,
-    NULL,
     &context,
     ladish_room_iterate_link_ports_client_callback,
@@ -575 +574 @@
   }
 
-  ladish_graph_iterate_nodes(room_ptr->graph, false, NULL, room_ptr, NULL, destroy_port_link, NULL);
+  ladish_graph_iterate_nodes(room_ptr->graph, false, room_ptr, NULL, destroy_port_link, NULL);
   ladish_app_supervisor_stop(room_ptr->app_supervisor);
 }

daemon/save.c

@@ -610 +610 @@
 }
 
+#undef indent
+#undef fd
+
+bool ladish_write_dict(int fd, int indent, ladish_dict_handle dict)
+{
+  struct ladish_write_context context;
+
+  if (ladish_dict_is_empty(dict))
+  {
+    return true;
+  }
+
+  context.fd = fd;
+  context.indent = indent + 1;
+
+  if (!ladish_write_indented_string(fd, indent, "<dict>\n"))
+  {
+    return false;
+  }
+
+  if (!ladish_dict_iterate(dict, &context, write_dict_entry))
+  {
+    return false;
+  }
+
+  if (!ladish_write_indented_string(fd, indent, "</dict>\n"))
+  {
+    return false;
+  }
+
+  return true;
+}
+
+bool ladish_write_vgraph(int fd, int indent, ladish_graph_handle vgraph, ladish_app_supervisor_handle app_supervisor)
+{
+  struct ladish_write_context context;
+
+  context.fd = fd;
+  context.indent = indent + 1;
+
+  if (!ladish_write_indented_string(fd, indent, "<clients>\n"))
+  {
+    return false;
+  }
+
+  if (!ladish_graph_iterate_nodes(
+        vgraph,
+        true,
+        &context,
+        ladish_save_vgraph_client_begin,
+        ladish_save_vgraph_port,
+        ladish_save_vgraph_client_end))
+  {
+    log_error("ladish_graph_iterate_nodes() failed");
+    return false;
+  }
+
+  if (!ladish_write_indented_string(fd, indent, "</clients>\n"))
+  {
+    return false;
+  }
+
+  if (!ladish_write_indented_string(fd, indent, "<connections>\n"))
+  {
+    return false;
+  }
+
+  if (!ladish_graph_iterate_connections(vgraph, true, &context, ladish_save_vgraph_connection))
+  {
+    log_error("ladish_graph_iterate_connections() failed");
+    return false;
+  }
+
+  if (!ladish_write_indented_string(fd, indent, "</connections>\n"))
+  {
+    return false;
+  }
+
+  if (!ladish_write_indented_string(fd, indent, "<applications>\n"))
+  {
+    return false;
+  }
+
+  if (!ladish_app_supervisor_enum(app_supervisor, &context, ladish_save_app))
+  {
+    return false;
+  }
+
+  if (!ladish_write_indented_string(fd, indent, "</applications>\n"))
+  {
+    return false;
+  }
+
+  return true;
+}
+
+bool ladish_write_room_link_ports(int fd, int indent, ladish_room_handle room)
+{
+  struct ladish_write_context context;
+
+  context.fd = fd;
+  context.indent = indent;
+
+  if (!ladish_room_iterate_link_ports(room, &context, ladish_write_room_port))
+  {
+    log_error("ladish_room_iterate_link_ports() failed");
+    return false;
+  }
+
+  return true;
+}
+
+/********************/
+/* write jack graph */
+/********************/
+
+struct ladish_write_jack_context
+{
+  int fd;
+  int indent;
+  ladish_graph_handle vgraph_filter;
+  bool client_vgraph_match;
+  bool a2j;
+  bool client_visible;
+};
+
+static bool ladish_save_jack_client_write_prolog(int fd, int indent, ladish_client_handle client_handle, const char * client_name)
+{
+  uuid_t uuid;
+  char str[37];
+
+  ladish_client_get_uuid(client_handle, uuid);
+  uuid_unparse(uuid, str);
+
+  log_info("saving jack client '%s' (%s)", client_name, str);
+
+  if (!ladish_write_indented_string(fd, indent, "<client name=\""))
+  {
+    return false;
+  }
+
+  if (!ladish_write_string(fd, client_name))
+  {
+    return false;
+  }
+
+  if (!ladish_write_string(fd, "\" uuid=\""))
+  {
+    return false;
+  }
+
+  if (!ladish_write_string(fd, str))
+  {
+    return false;
+  }
+
+  if (!ladish_write_string(fd, "\">\n"))
+  {
+    return false;
+  }
+
+  if (!ladish_write_indented_string(fd, indent + 1, "<ports>\n"))
+  {
+    return false;
+  }
+
+  return true;
+}
+
+#define fd (((struct ladish_write_jack_context *)context)->fd)
+#define indent (((struct ladish_write_jack_context *)context)->indent)
+#define ctx_ptr ((struct ladish_write_jack_context *)context)
+
 static
 bool
@@ -619 +792 @@
   void ** client_iteration_context_ptr_ptr)
 {
-  uuid_t uuid;
-  char str[37];
-
-  ladish_client_get_uuid(client_handle, uuid);
-  uuid_unparse(uuid, str);
-
-  log_info("saving jack client '%s' (%s)", client_name, str);
-
-  if (!ladish_write_indented_string(fd, indent, "<client name=\""))
-  {
-    return false;
-  }
-
-  if (!ladish_write_string(fd, client_name))
-  {
-    return false;
-  }
-
-  if (!ladish_write_string(fd, "\" uuid=\""))
-  {
-    return false;
-  }
-
-  if (!ladish_write_string(fd, str))
-  {
-    return false;
-  }
-
-  if (!ladish_write_string(fd, "\">\n"))
-  {
-    return false;
-  }
-
-  if (!ladish_write_indented_string(fd, indent + 1, "<ports>\n"))
-  {
-    return false;
-  }
-
-  return true;
+  void * vgraph;
+
+  vgraph = ladish_client_get_vgraph(client_handle);
+  ctx_ptr->client_vgraph_match = vgraph == ctx_ptr->vgraph_filter;
+  ctx_ptr->a2j = ladish_virtualizer_is_a2j_client(client_handle);
+
+  /* for the a2j client vgraph is always the studio graph.
+     However if studio has no a2j ports, lets not write a2j client.
+     If there is a a2j port that matched the vgraph, the prolog will get written anyway */
+  ctx_ptr->client_visible = ctx_ptr->client_vgraph_match && !ctx_ptr->a2j;
+
+  if (!ctx_ptr->client_visible)
+  {
+    return true;
+  }
+
+  return ladish_save_jack_client_write_prolog(fd, indent, client_handle, client_name);
 }
 
@@ -669 +820 @@
   void * client_iteration_context_ptr)
 {
+  if (!ctx_ptr->client_visible)
+  {
+    return true;
+  }
+
   if (!ladish_write_indented_string(fd, indent + 1, "</ports>\n"))
   {
@@ -698 +854 @@
   char str[37];
 
+  /* check vgraph for a2j ports */
+  if (ctx_ptr->a2j && ctx_ptr->vgraph_filter == ladish_port_get_vgraph(port_handle))
+  {
+    if (!ctx_ptr->client_visible)
+    {
+      if (!ladish_save_jack_client_write_prolog(fd, indent, client_handle, client_name))
+      {
+        return false;
+      }
+
+      ctx_ptr->client_visible = true;
+    }
+  }
+
+  if (!ctx_ptr->client_visible)
+  {
+    return true;
+  }
+
   ladish_port_get_uuid(port_handle, uuid);
   uuid_unparse(uuid, str);
@@ -731 +906 @@
 }
 
+#undef ctx_ptr
 #undef indent
 #undef fd
 
-bool ladish_write_dict(int fd, int indent, ladish_dict_handle dict)
-{
-  struct ladish_write_context context;
-
-  if (ladish_dict_is_empty(dict))
-  {
-    return true;
+bool ladish_write_jgraph(int fd, int indent, ladish_graph_handle vgraph)
+{
+  struct ladish_write_jack_context context;
+
+  if (!ladish_write_indented_string(fd, indent, "<clients>\n"))
+  {
+    return false;
   }
 
   context.fd = fd;
   context.indent = indent + 1;
-
-  if (!ladish_write_indented_string(fd, indent, "<dict>\n"))
-  {
-    return false;
-  }
-
-  if (!ladish_dict_iterate(dict, &context, write_dict_entry))
-  {
-    return false;
-  }
-
-  if (!ladish_write_indented_string(fd, indent, "</dict>\n"))
-  {
-    return false;
-  }
-
-  return true;
-}
-
-bool ladish_write_vgraph(int fd, int indent, ladish_graph_handle vgraph, ladish_app_supervisor_handle app_supervisor)
-{
-  struct ladish_write_context context;
-
-  context.fd = fd;
-  context.indent = indent + 1;
-
-  if (!ladish_write_indented_string(fd, indent, "<clients>\n"))
-  {
-    return false;
-  }
-
-  if (!ladish_graph_iterate_nodes(
-        vgraph,
-        true,
-        NULL,
-        &context,
-        ladish_save_vgraph_client_begin,
-        ladish_save_vgraph_port,
-        ladish_save_vgraph_client_end))
-  {
-    log_error("ladish_graph_iterate_nodes() failed");
-    return false;
-  }
-
-  if (!ladish_write_indented_string(fd, indent, "</clients>\n"))
-  {
-    return false;
-  }
-
-  if (!ladish_write_indented_string(fd, indent, "<connections>\n"))
-  {
-    return false;
-  }
-
-  if (!ladish_graph_iterate_connections(vgraph, true, &context, ladish_save_vgraph_connection))
-  {
-    log_error("ladish_graph_iterate_connections() failed");
-    return false;
-  }
-
-  if (!ladish_write_indented_string(fd, indent, "</connections>\n"))
-  {
-    return false;
-  }
-
-  if (!ladish_write_indented_string(fd, indent, "<applications>\n"))
-  {
-    return false;
-  }
-
-  if (!ladish_app_supervisor_enum(app_supervisor, &context, ladish_save_app))
-  {
-    return false;
-  }
-
-  if (!ladish_write_indented_string(fd, indent, "</applications>\n"))
-  {
-    return false;
-  }
-
-  return true;
-}
-
-bool ladish_write_room_link_ports(int fd, int indent, ladish_room_handle room)
-{
-  struct ladish_write_context context;
-
-  context.fd = fd;
-  context.indent = indent;
-
-  if (!ladish_room_iterate_link_ports(room, &context, ladish_write_room_port))
-  {
-    log_error("ladish_room_iterate_link_ports() failed");
-    return false;
-  }
-
-  return true;
-}
-
-bool ladish_write_jgraph(int fd, int indent, ladish_graph_handle vgraph)
-{
-  struct ladish_write_context context;
-
-  if (!ladish_write_indented_string(fd, indent, "<clients>\n"))
-  {
-    return false;
-  }
-
-  context.fd = fd;
-  context.indent = indent + 1;
+  context.vgraph_filter = vgraph;
 
   if (!ladish_graph_iterate_nodes(
         ladish_studio_get_jack_graph(),
         true,
-        vgraph,
         &context,
         ladish_save_jack_client_begin,

daemon/virtualizer.c

@@ -443 +443 @@
   const char * vclient_name;
   bool is_a2j;
-  uuid_t jclient_uuid;
   uuid_t vclient_uuid;
   pid_t pid;
@@ -526 +525 @@
   jack_client_name = ladish_graph_get_client_name(virtualizer_ptr->jack_graph, jack_client);
 
-  ladish_client_get_uuid(jack_client, jclient_uuid);
-  is_a2j = uuid_compare(jclient_uuid, g_a2j_uuid) == 0;
+  is_a2j = ladish_virtualizer_is_a2j_client(jack_client);
   if (is_a2j)
   {
@@ -1126 +1124 @@
   uuid_t vclient_uuid;
   ladish_client_handle vclient;
-  uuid_t jclient_uuid;
 
   //ladish_graph_dump(g_studio.jack_graph);
@@ -1143 +1140 @@
   }
 
-  ladish_client_get_uuid(jclient, jclient_uuid);
-  ASSERT(uuid_compare(jclient_uuid, g_a2j_uuid) != 0); /* a2j client has no app associated */
+  ASSERT(!ladish_virtualizer_is_a2j_client(jclient)); /* a2j client has no app associated */
 
   vgraph = ladish_client_get_vgraph(jclient);
@@ -1264 +1260 @@
   ladish_client_handle vclient;
   bool is_empty;
-  uuid_t jclient_uuid;
   struct app_remove_context ctx;
 
@@ -1272 +1267 @@
   ctx.app_name = app_name;
 
-  ladish_graph_iterate_nodes(jack_graph, false, NULL, &ctx, NULL, remove_app_port, NULL);
+  ladish_graph_iterate_nodes(jack_graph, false, &ctx, NULL, remove_app_port, NULL);
 
   jclient = ladish_graph_find_client_by_app(jack_graph, app_uuid);
@@ -1281 +1276 @@
   }
 
-  ladish_client_get_uuid(jclient, jclient_uuid);
-  ASSERT(uuid_compare(jclient_uuid, g_a2j_uuid) != 0); /* a2j client has no app associated */
+  ASSERT(!ladish_virtualizer_is_a2j_client(jclient)); /* a2j client has no app associated */
 
   vgraph = ladish_client_get_vgraph(jclient);
@@ -1379 +1373 @@
   return false;
 }
+
+bool ladish_virtualizer_is_a2j_client(ladish_client_handle jclient)
+{
+  uuid_t jclient_uuid;
+
+  ladish_client_get_uuid(jclient, jclient_uuid);
+  return uuid_compare(jclient_uuid, g_a2j_uuid) == 0;
+}

daemon/virtualizer.h

@@ -72 +72 @@
   uuid_t uuid);
 
+bool
+ladish_virtualizer_is_a2j_client(
+  ladish_client_handle jclient);
+
 void
 ladish_virtualizer_destroy(