X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fafm-user-daemon.c;h=1459dde2418d77d670f7b5bc3f514cc3b8d384e7;hb=ce714369c64051d5307ef7ac9af2c53b6edfbb4a;hp=4990ff7740e0ebafd49fab12ac88dfad4ccb3a4c;hpb=658c4a1fe18f6dee5063f899a449ea7020c99828;p=src%2Fapp-framework-main.git diff --git a/src/afm-user-daemon.c b/src/afm-user-daemon.c index 4990ff7..1459dde 100644 --- a/src/afm-user-daemon.c +++ b/src/afm-user-daemon.c @@ -19,16 +19,46 @@ #include #include #include +#include #include #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"; + +static void usage() +{ + printf( + "usage: %s [-q] [-v] [-r rootdir]... [-a appdir]...\n" + "\n" + " -a appdir adds an application directory\n" + " -r rootdir adds a root directory of applications\n" + " -d run as a daemon\n" + " -q quiet\n" + " -v verbose\n" + "\n", + appname + ); +} + +static struct option options[] = { + { "root", required_argument, NULL, 'r' }, + { "application", required_argument, NULL, 'a' }, + { "daemon", no_argument, NULL, 'd' }, + { "quiet", no_argument, NULL, 'q' }, + { "verbose", no_argument, NULL, 'v' }, + { "help", no_argument, NULL, 'h' }, + { NULL, 0, NULL, 0 } +}; 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\""; @@ -63,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) @@ -87,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 { @@ -101,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() @@ -157,34 +189,102 @@ static int daemonize() int main(int ac, char **av) { - LOGAUTH("afm-main-daemon"); + int i, daemon = 0; + + LOGAUTH(appname); + + /* first interpretation of arguments */ + while ((i = getopt_long(ac, av, "hdqvr:a:", options, NULL)) >= 0) { + switch (i) { + case 'h': + usage(); + return 0; + case 'q': + if (verbosity) + verbosity--; + break; + case 'v': + verbosity++; + break; + case 'd': + daemon = 1; + break; + case 'r': + break; + case 'a': + break; + case ':': + ERROR("missing argument value"); + return 1; + default: + ERROR("unrecognized option"); + return 1; + } + } /* init random generator */ 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; } - if (af_db_update_applications(afdb)) { - ERROR("af_update_applications failed"); + + /* second interpretation of arguments */ + optind = 1; + while ((i = getopt_long(ac, av, "hdqvr:a:", options, NULL)) >= 0) { + switch (i) { + case 'r': + if (afm_db_add_root(afdb, optarg)) { + ERROR("can't add root %s", optarg); + return 1; + } + break; + case 'a': + if (afm_db_add_application(afdb, optarg)) { + ERROR("can't add application %s", optarg); + return 1; + } + break; + } + } + + /* update the database */ + if (afm_db_update_applications(afdb)) { + ERROR("afm_update_applications failed"); + return 1; + } + + if (daemon && daemonize()) { + ERROR("daemonization failed"); + 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; @@ -210,5 +310,3 @@ int main(int ac, char **av) return 0; } - -