refactoring and moving forward

[src/app-framework-main.git] / src / afm-user-daemon.c

diff --git a/src/afm-user-daemon.c b/src/afm-user-daemon.c
index 346c58b..1459dde 100644 (file)
--- a/src/afm-user-daemon.c
+++ b/src/afm-user-daemon.c
@@ -25,8 +25,9 @@
 
 #include "verbose.h"
 #include "utils-jbus.h"
-#include "af-db.h"
-#include "af-run.h"
+#include "afm.h"
+#include "afm-db.h"
+#include "afm-run.h"
 
 static const char appname[] = "afm-user-daemon";
 
@@ -56,7 +57,8 @@ static struct option options[] = {
 };
 
 static struct jbus *jbus;
-static struct af_db *afdb;
+static struct jbus *jbusys;
+static struct afm_db *afdb;
 
 const char error_nothing[] = "[]";
 const char error_bad_request[] = "\"bad request\"";
@@ -91,17 +93,17 @@ static void reply_status(struct jreq *jreq, int status)
 
 static void on_runnables(struct jreq *jreq, struct json_object *obj)
 {
-       struct json_object *resp = af_db_application_list(afdb);
+       struct json_object *resp = afm_db_application_list(afdb);
        jbus_reply_j(jreq, resp);
-       json_object_put(obj);
+       json_object_put(resp);
 }
 
 static void on_detail(struct jreq *jreq, struct json_object *obj)
 {
        const char *appid = getappid(obj);
-       struct json_object *resp = af_db_get_application_public(afdb, appid);
+       struct json_object *resp = afm_db_get_application_public(afdb, appid);
        reply(jreq, resp, error_not_found);
-       json_object_put(obj);
+       json_object_put(resp);
 }
 
 static void on_start(struct jreq *jreq, struct json_object *obj)
@@ -115,11 +117,11 @@ static void on_start(struct jreq *jreq, struct json_object *obj)
        if (appid == NULL)
                jbus_reply_error_s(jreq, error_bad_request);
        else {
-               appli = af_db_get_application(afdb, appid);
+               appli = afm_db_get_application(afdb, appid);
                if (appli == NULL)
                        jbus_reply_error_s(jreq, error_not_found);
                else {
-                       runid = af_run_start(appli);
+                       runid = afm_run_start(appli);
                        if (runid <= 0)
                                jbus_reply_error_s(jreq, error_cant_start);
                        else {
@@ -129,48 +131,50 @@ static void on_start(struct jreq *jreq, struct json_object *obj)
                        }
                }
        }
-       json_object_put(obj);
 }
 
 static void on_stop(struct jreq *jreq, struct json_object *obj)
 {
        int runid = getrunid(obj);
-       int status = af_run_stop(runid);
+       int status = afm_run_stop(runid);
        reply_status(jreq, status);
-       json_object_put(obj);
 }
 
 static void on_continue(struct jreq *jreq, struct json_object *obj)
 {
        int runid = getrunid(obj);
-       int status = af_run_continue(runid);
+       int status = afm_run_continue(runid);
        reply_status(jreq, status);
-       json_object_put(obj);
 }
 
 static void on_terminate(struct jreq *jreq, struct json_object *obj)
 {
        int runid = getrunid(obj);
-       int status = af_run_terminate(runid);
+       int status = afm_run_terminate(runid);
        reply_status(jreq, status);
-       json_object_put(obj);
 }
 
 static void on_runners(struct jreq *jreq, struct json_object *obj)
 {
-       struct json_object *resp = af_run_list();
+       struct json_object *resp = afm_run_list();
        jbus_reply_j(jreq, resp);
        json_object_put(resp);
-       json_object_put(obj);
 }
 
 static void on_state(struct jreq *jreq, struct json_object *obj)
 {
        int runid = getrunid(obj);
-       struct json_object *resp = af_run_state(runid);
+       struct json_object *resp = afm_run_state(runid);
        reply(jreq, resp, error_not_found);
        json_object_put(resp);
-       json_object_put(obj);
+}
+
+static void on_signal_changed(struct json_object *obj)
+{
+       /* update the database */
+       afm_db_update_applications(afdb);
+       /* propagate now */
+       jbus_send_signal_j(jbus, "changed", obj);
 }
 
 static int daemonize()
@@ -222,18 +226,18 @@ int main(int ac, char **av)
        srandom((unsigned int)time(NULL));
 
        /* init runners */
-       if (af_run_init()) {
-               ERROR("af_run_init failed");
+       if (afm_run_init()) {
+               ERROR("afm_run_init failed");
                return 1;
        }
 
        /* init framework */
-       afdb = af_db_create();
+       afdb = afm_db_create();
        if (!afdb) {
-               ERROR("af_create failed");
+               ERROR("afm_create failed");
                return 1;
        }
-       if (af_db_add_root(afdb, FWK_APP_DIR)) {
+       if (afm_db_add_root(afdb, FWK_APP_DIR)) {
                ERROR("can't add root %s", FWK_APP_DIR);
                return 1;
        }
@@ -243,13 +247,13 @@ int main(int ac, char **av)
        while ((i = getopt_long(ac, av, "hdqvr:a:", options, NULL)) >= 0) {
                switch (i) {
                case 'r':
-                       if (af_db_add_root(afdb, optarg)) {
+                       if (afm_db_add_root(afdb, optarg)) {
                                ERROR("can't add root %s", optarg);
                                return 1;
                        }
                        break;
                case 'a':
-                       if (af_db_add_application(afdb, optarg)) {
+                       if (afm_db_add_application(afdb, optarg)) {
                                 ERROR("can't add application %s", optarg);
                                 return 1;
                         }
@@ -258,8 +262,8 @@ int main(int ac, char **av)
        }
 
        /* update the database */
-       if (af_db_update_applications(afdb)) {
-               ERROR("af_update_applications failed");
+       if (afm_db_update_applications(afdb)) {
+               ERROR("afm_update_applications failed");
                return 1;
        }
 
@@ -268,8 +272,19 @@ int main(int ac, char **av)
                return 1;
        }
 
+       /* init observers */
+       jbusys = create_jbus(0, AFM_SYSTEM_DBUS_PATH);
+       if (!jbusys) {
+               ERROR("create_jbus failed for system");
+               return 1;
+       }
+       if(jbus_on_signal_j(jbusys, "changed", on_signal_changed)) {
+               ERROR("adding signal observer failed");
+               return 1;
+       }
+
        /* init service */
-       jbus = create_jbus(1, "/org/AGL/afmMain");
+       jbus = create_jbus(1, AFM_USER_DBUS_PATH);
        if (!jbus) {
                ERROR("create_jbus failed");
                return 1;