Changeset da4a6eb2a1588a437c77eee59f27a181876f0eeb

Timestamp:

12/27/10 15:34:35 (2 years ago)

Author:

Nedko Arnaudov <nedko@…>

Children:

eeaa82d17170e394c90099b17ec0f2b4a2998734

Parents:

3a5b7037d88ca19b2003cba39fa7a4ed2bbfae0c

git-committer:

Nedko Arnaudov <nedko@arnaudov.name> / 2010-12-27T15:34:35Z+0200

Message:

ladishd: save hidden porst of stopped apps.

Files:

• daemon/save.c (modified) (5 diffs)

daemon/save.c

@@ -46 +46 @@
 }
 
-static bool is_app_running(ladish_app_supervisor_handle app_supervisor, ladish_port_handle port)
+static bool is_hidden_port_interesting(ladish_app_supervisor_handle app_supervisor, ladish_client_handle client, ladish_port_handle port)
 {
   uuid_t app_uuid;
   ladish_app_handle app;
 
+  if (is_system_client(client) || ladish_port_is_link(port))
+  {
+    return true;
+  }
+
+  /* hidden ports of external apps should not be saved */
+  /* hidden ports of stopped managed apps should be saved */
+  /* hidden ports of started managed apps should not be saved */
+
   if (!ladish_port_get_app(port, app_uuid))
   {
+    /* port of external app, don't save */
     return false;
   }
@@ -59 +69 @@
   if (app == NULL)
   {
-    return false;
-  }
-
-  return ladish_app_is_running(app);
-}
-
-#define is_port_interesting(app_supervisor, client, port) ( \
-    is_app_running(app_supervisor, port) ||                 \
-    ladish_port_is_link(port) ||                            \
-    is_system_client(client))
+    ASSERT_NO_PASS;             /* this should not happen because app ports are removed before app is removed */
+    return false;
+  }
+
+  return !ladish_app_is_running(app);
+}
 
 bool ladish_write_string(int fd, const char * string)
@@ -489 +495 @@
 
   /* skip hidden ports of running apps */
-  if (hidden && !is_port_interesting(ctx_ptr->app_supervisor, client_handle, port_handle))
+  if (hidden && !is_hidden_port_interesting(ctx_ptr->app_supervisor, client_handle, port_handle))
   {
     return true;
@@ -604 +610 @@
 
   if (hidden &&
-      (!is_port_interesting(ctx_ptr->app_supervisor, client1, port1) ||
-       !is_port_interesting(ctx_ptr->app_supervisor, client2, port2)))
+      (!is_hidden_port_interesting(ctx_ptr->app_supervisor, client1, port1) ||
+       !is_hidden_port_interesting(ctx_ptr->app_supervisor, client2, port2)))
   {
     return true;
@@ -1002 +1008 @@
 
   /* skip hidden ports of running apps */
-  if (hidden && !is_port_interesting(ctx_ptr->app_supervisor, client_handle, port_handle))
+  if (hidden && !is_hidden_port_interesting(ctx_ptr->app_supervisor, client_handle, port_handle))
   {
     return true;