LADI
/
ladish
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ladishd: improve log on save and on graph dump

This commit is contained in:
Nedko Arnaudov 2010-12-28 03:39:04 +02:00
parent eeaa82d171
commit 918cecca74
2 changed files with 42 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
daemon/graph.c
View File

@ -2583,9 +2583,11 @@ void ladish_graph_dump(ladish_graph_handle graph_handle)
{
client_ptr = list_entry(client_node_ptr, struct ladish_graph_client, siblings);
log_info(" %s client '%s', id=%"PRIu64", ptr=%p%", client_ptr->hidden ? "invisible" : "visible", client_ptr->name, client_ptr->id, client_ptr->client);
ladish_client_get_uuid(client_ptr->client, uuid);
uuid_unparse(uuid, uuid_str);
log_info(" uuid=%s", uuid_str);
if (ladish_client_get_interlink(client_ptr->client, uuid))
{
uuid_unparse(uuid, uuid_str);
@ -2595,6 +2597,17 @@ void ladish_graph_dump(ladish_graph_handle graph_handle)
{
log_info(" no interlink");
}
if (ladish_client_get_app(client_ptr->client, uuid))
{
uuid_unparse(uuid, uuid_str);
log_info(" app=%s", uuid_str);
}
else
{
log_info(" appless client");
}
dump_dict(" ", ladish_client_get_dict(client_ptr->client));
log_info(" ports:");
list_for_each(port_node_ptr, &client_ptr->ports)
@ -2606,7 +2619,19 @@ void ladish_graph_dump(ladish_graph_handle graph_handle)
vgraph = ladish_port_get_vgraph(port_ptr->port);
log_info(" %s port '%s', uuid=%s, id=%"PRIu64", type=0x%"PRIX32", flags=0x%"PRIX32", ptr=%p, vgraph=%s", port_ptr->hidden ? "invisible" : "visible", port_ptr->name, uuid_str, port_ptr->id, port_ptr->type, port_ptr->flags, port_ptr->port, vgraph != NULL ? ladish_graph_get_description(vgraph) : "NULL");
log_info(" %s port '%s', uuid=%s, id=%"PRIu64"", port_ptr->hidden ? "invisible" : "visible", port_ptr->name, uuid_str, port_ptr->id);
log_info(" type=0x%"PRIX32", flags=0x%"PRIX32", ptr=%p, vgraph=%s", port_ptr->type, port_ptr->flags, port_ptr->port, vgraph != NULL ? ladish_graph_get_description(vgraph) : "NULL");
if (ladish_port_get_app(port_ptr->port, uuid))
{
uuid_unparse(uuid, uuid_str);
log_info(" app=%s", uuid_str);
}
else
{
log_info(" appless port");
}
dump_dict(" ", ladish_port_get_dict(port_ptr->port));
}
}

17
daemon/save.c
View File

@ -353,7 +353,20 @@ ladish_save_vgraph_client_begin(
uuid_t uuid;
char str[37];
ctx_ptr->client_visible = !hidden || ladish_client_has_app(client_handle);
ctx_ptr->client_visible = !hidden;
if (!ctx_ptr->client_visible)
{
if (ladish_client_has_app(client_handle))
{
ctx_ptr->client_visible = true;
log_info("saving hidden vgraph client '%s' of managed app", client_name);
}
else
{
log_info("not saving hidden vgraph client '%s' because it has no app associated", client_name);
}
}
if (!ctx_ptr->client_visible)
{
return true;
@ -496,6 +509,7 @@ ladish_save_vgraph_port(
/* skip hidden ports of running apps */
if (hidden && !is_hidden_port_interesting(ctx_ptr->app_supervisor, client_handle, port_handle))
{
log_info("skippping hidden vgraph port '%s':'%s'", client_name, port_name);
return true;
}
@ -1009,6 +1023,7 @@ ladish_save_jack_port(
/* skip hidden ports of running apps */
if (hidden && !is_hidden_port_interesting(ctx_ptr->app_supervisor, client_handle, port_handle))
{
log_info("skippping hidden vgraph port '%s':'%s'", client_name, port_name);
return true;
}