ivi-resource-manager: integrate to resolver

diff --git a/src/plugins/ivi-resource-manager/plugin-ivi-resource-manager.c b/src/plugins/ivi-resource-manager/plugin-ivi-resource-manager.c
index c69811d..34bb5c8 100644 (file)
--- a/src/plugins/ivi-resource-manager/plugin-ivi-resource-manager.c
+++ b/src/plugins/ivi-resource-manager/plugin-ivi-resource-manager.c
@@ -39,6 +39,7 @@
 #include <murphy/core/plugin.h>
 #include <murphy/core/console.h>
 #include <murphy/core/event.h>
+#include <murphy/core/context.h>
 #include <murphy/core/lua-bindings/murphy.h>
 
 #include <murphy-db/mql.h>
@@ -55,22 +56,67 @@ struct mrp_resmgr_data_s {
     mrp_event_watch_t   *w;
     mrp_resmgr_screen_t *screen;
     mrp_htbl_t          *resources;
+    int                  ndepend;
+    const char         **depends;
+    mrp_zone_mask_t      zones;
 };
 
 
+void mrp_resmgr_register_dependency(mrp_resmgr_data_t *data,
+                                    const char *db_table_name)
+{
+    size_t size;
+    const char **depends;
+    char dependency[512];
+    int idx;
+
+    MRP_ASSERT(data && db_table_name, "invalid argument");
+
+    idx = data->ndepend;
+    size = (idx + 1) * sizeof(const char *);
+
+    if (!(depends = mrp_realloc(data->depends, size))) {
+        mrp_log_error("ivi-resource-manager: failed to allocate memory "
+                      "for resource dependencies");
+        data->ndepend = 0;
+        data->depends = NULL;
+        return;
+    }
+
+    snprintf(dependency, sizeof(dependency), "$%s", db_table_name);
+
+    if (!(depends[idx] = mrp_strdup(dependency))) {
+        mrp_log_error("ivi-resource-manager: failed to strdup dependency");
+        data->depends = depends;
+        return;
+    }
+
+    data->ndepend = idx + 1;
+    data->depends = depends;
+}
+
 void mrp_resmgr_insert_resource(mrp_resmgr_data_t *data,
+                                mrp_zone_t *zone,
                                 mrp_resource_t *key,
                                 void *resource)
 {
-    MRP_ASSERT(data && key && resource, "invalid argument");
+    uint32_t zoneid;
+
+    MRP_ASSERT(data && zone && key && resource, "invalid argument");
     MRP_ASSERT(data->resources, "uninitialised data structure");
 
+    zoneid = mrp_zone_get_id(zone);
+
+    data->zones |= ((mrp_zone_mask_t)1 << zoneid);
+
     mrp_htbl_insert(data->resources, key, resource);
 }
 
-void *mrp_resmgr_remove_resource(mrp_resmgr_data_t *data, mrp_resource_t *key)
+void *mrp_resmgr_remove_resource(mrp_resmgr_data_t *data,
+                                 mrp_zone_t *zone,
+                                 mrp_resource_t *key)
 {
-    MRP_ASSERT(data && key, "invalid argument");
+    MRP_ASSERT(data && zone && key, "invalid argument");
     MRP_ASSERT(data->resources, "uninitialised data structure");
 
     return mrp_htbl_remove(data->resources, key, FALSE);
@@ -84,6 +130,67 @@ void *mrp_resmgr_lookup_resource(mrp_resmgr_data_t *data, mrp_resource_t *key)
     return mrp_htbl_lookup(data->resources, key);
 }
 
+static int resource_update_cb(mrp_scriptlet_t *script, mrp_context_tbl_t *ctbl)
+{
+    mrp_resmgr_data_t *data = (mrp_resmgr_data_t *)script->data;
+    mrp_zone_mask_t mask;
+    uint32_t zoneid;
+
+    MRP_UNUSED(ctbl);
+
+    for (mask = data->zones, zoneid = 0;   mask;   mask >>= 1, zoneid++) {
+        if ((mask & 1))
+            mrp_resource_owner_recalc(zoneid);
+    }
+
+    return TRUE;
+}
+
+static void add_depenedencies_to_resolver(mrp_resmgr_data_t *data)
+{
+    const char *target = "_ivi_resources";
+    mrp_interpreter_t resource_updater = {
+        { NULL, NULL },
+        "resource_updater",
+        NULL,
+        NULL,
+        NULL,
+        resource_update_cb,
+        NULL
+    };
+
+    mrp_plugin_t *plugin;
+    mrp_context_t *ctx;
+    mrp_resolver_t *resolver;
+    char buf[2048];
+    char *p, *e;
+    int i;
+    int success;
+
+    MRP_ASSERT(data, "invalid argument");
+
+    plugin = data->plugin;
+
+    if (!(ctx = plugin->ctx) || !(resolver = ctx->r))
+        return;
+
+    if (!data->ndepend || !data->depends)
+        return;
+
+    for (i = 0, e = (p = buf) + sizeof(buf); i < data->ndepend && p < e; i++)
+        p += snprintf(p, e-p, " %s", data->depends[i]);
+
+    printf("%s:%s\n\tresource_recalc()\n\n", target, buf);
+
+    success = mrp_resolver_add_prepared_target(resolver, target,
+                                               data->depends, data->ndepend,
+                                               &resource_updater, NULL, data);
+    if (!success) {
+        mrp_log_error("ivi-resource-manager: failed to install "
+                      "resolver target '%s'", target);
+    }
+}
+
 static void event_cb(mrp_event_watch_t *w, int id, mrp_msg_t *event_data,
                      void *user_data)
 {
@@ -112,6 +219,8 @@ static void event_cb(mrp_event_watch_t *w, int id, mrp_msg_t *event_data,
             if (success) {
                 if (!strcmp(inst, plugin->instance)) {
                     data->screen = mrp_resmgr_screen_create(data);
+
+                    add_depenedencies_to_resolver(data);
                 }
             }
         } /* if PLUGIN_STARTED */

diff --git a/src/plugins/ivi-resource-manager/plugin-ivi-resource-manager.h b/src/plugins/ivi-resource-manager/plugin-ivi-resource-manager.h
index 463ac20..6e0e380 100644 (file)
--- a/src/plugins/ivi-resource-manager/plugin-ivi-resource-manager.h
+++ b/src/plugins/ivi-resource-manager/plugin-ivi-resource-manager.h
@@ -34,8 +34,14 @@ typedef struct mrp_resmgr_data_s      mrp_resmgr_data_t;
 typedef struct mrp_resmgr_screen_s    mrp_resmgr_screen_t;
 typedef struct mrp_resmgr_class_s     mrp_resmgr_class_t;
 
-void  mrp_resmgr_insert_resource(mrp_resmgr_data_t *, mrp_resource_t *,void *);
-void *mrp_resmgr_remove_resource(mrp_resmgr_data_t *, mrp_resource_t *);
+
+
+void  mrp_resmgr_register_dependency(mrp_resmgr_data_t *, const char *);
+
+void  mrp_resmgr_insert_resource(mrp_resmgr_data_t *, mrp_zone_t *,
+                                 mrp_resource_t *, void *);
+void *mrp_resmgr_remove_resource(mrp_resmgr_data_t *, mrp_zone_t *,
+                                 mrp_resource_t *);
 void *mrp_resmgr_lookup_resource(mrp_resmgr_data_t *, mrp_resource_t *);
 
 #endif  /* __MURPHY_IVI_RESOURCE_MANAGER_H__ */

diff --git a/src/plugins/ivi-resource-manager/screen.c b/src/plugins/ivi-resource-manager/screen.c
index e3bcbf8..080847c 100644 (file)
--- a/src/plugins/ivi-resource-manager/screen.c
+++ b/src/plugins/ivi-resource-manager/screen.c
@@ -42,6 +42,9 @@
 #include "screen.h"
 #include "class.h"
 
+#define RESOURCE_NAME       "screen"
+#define ACTIVE_SCREEN_TABLE "active_screen"
+
 #define ACTIVE_SCREEN_MAX   32
 
 #define ATTRIBUTE(n,t,v)    {n, MRP_RESOURCE_RW, mqi_##t, {.t=v}}
@@ -76,7 +79,8 @@ struct screen_resource_s {
 static screen_resource_t *screen_resource_create(mrp_resmgr_screen_t *,
                                                  mrp_zone_t *,mrp_resource_t *,
                                                  mrp_application_class_t *);
-static void screen_resource_destroy(mrp_resmgr_screen_t *,  mrp_resource_t *);
+static void screen_resource_destroy(mrp_resmgr_screen_t *,  mrp_zone_t *,
+                                    mrp_resource_t *);
 static screen_resource_t *screen_resource_lookup(mrp_resmgr_screen_t *,
                                                  mrp_resource_t *);
 
@@ -125,8 +129,8 @@ mrp_resmgr_screen_t *mrp_resmgr_screen_create(mrp_resmgr_data_t *data)
     uint32_t i;
 
     if ((screen = mrp_allocz(sizeof(*screen)))) {
-        resid = mrp_resource_definition_create("screen", true, screen_attrs,
-                                               &screen_ftbl, screen);
+        resid = mrp_resource_definition_create(RESOURCE_NAME,true,screen_attrs,
+                                               &screen_ftbl,screen);
         mrp_lua_resclass_create_from_c(resid);
 
         screen->data = data;
@@ -137,6 +141,8 @@ mrp_resmgr_screen_t *mrp_resmgr_screen_create(mrp_resmgr_data_t *data)
             mrp_list_init(screen->classes + i);
 
         mqi_open();
+
+        mrp_resmgr_register_dependency(data, ACTIVE_SCREEN_TABLE);
     }
 
     return screen;
@@ -156,6 +162,7 @@ static screen_resource_t *screen_resource_create(mrp_resmgr_screen_t *screen,
                                                  mrp_resource_t *res,
                                                  mrp_application_class_t *ac)
 {
+    mrp_resmgr_data_t *data;
     uint32_t zone_id;
     mrp_list_hook_t *classes;
     mrp_resmgr_class_t *rc;
@@ -164,6 +171,8 @@ static screen_resource_t *screen_resource_create(mrp_resmgr_screen_t *screen,
     MRP_ASSERT(screen && zone && res && ac, "invalid argument");
     MRP_ASSERT(screen->data, "confused with data structures");
 
+    data = screen->data;
+
     zone_id = mrp_zone_get_id(zone);
     classes = screen->classes + zone_id;
 
@@ -184,7 +193,7 @@ static screen_resource_t *screen_resource_create(mrp_resmgr_screen_t *screen,
 
             resource_class_move_resource(rc, sr);
 
-            mrp_resmgr_insert_resource(screen->data, res, sr);
+            mrp_resmgr_insert_resource(data, zone, res, sr);
         }
     }
 
@@ -193,6 +202,7 @@ static screen_resource_t *screen_resource_create(mrp_resmgr_screen_t *screen,
 
 
 static void screen_resource_destroy(mrp_resmgr_screen_t *screen,
+                                    mrp_zone_t *zone,
                                     mrp_resource_t *res)
 {
     screen_resource_t *sr;
@@ -200,7 +210,7 @@ static void screen_resource_destroy(mrp_resmgr_screen_t *screen,
     MRP_ASSERT(res && screen, "invalid argument");
     MRP_ASSERT(screen->data, "confused with data structures");
 
-    if ((sr = mrp_resmgr_remove_resource(screen->data, res))) {
+    if ((sr = mrp_resmgr_remove_resource(screen->data, zone, res))) {
         mrp_list_delete(&sr->link);
         mrp_free(sr);
     }
@@ -310,7 +320,7 @@ static void get_active_screens(mrp_resmgr_screen_t *screen, mrp_zone_t *zone)
     screen->nactive[zone_id] = 0;
 
     if (screen->dbtbl == MQI_HANDLE_INVALID) {
-        screen->dbtbl = mqi_get_table_handle("active_screen");
+        screen->dbtbl = mqi_get_table_handle(ACTIVE_SCREEN_TABLE);
 
         if (screen->dbtbl == MQI_HANDLE_INVALID)
             return;
@@ -368,7 +378,7 @@ static void screen_notify(mrp_resource_event_t event,
 
     case MRP_RESOURCE_EVENT_DESTROYED:
         mrp_log_info("screen resource in zone '%s' destroyed", zone_name);
-        screen_resource_destroy(screen, res);
+        screen_resource_destroy(screen, zone, res);
         break;
 
     case MRP_RESOURCE_EVENT_ACQUIRE: