Merge branch 'master' of git://frsh-forb.git.sourceforge.net/gitroot/frsh-forb/frsh

[frescor/frsh.git] / resources / cpu_aquosa / mngr / frm_aqcpu.c

diff --git a/resources/cpu_aquosa/mngr/frm_aqcpu.c b/resources/cpu_aquosa/mngr/frm_aqcpu.c
index 743c960795ff429a65c26492f957ab840affa3ab..381ad70ad6b6aae5a8ec38f428303f875dccb29d 100644 (file)
--- a/resources/cpu_aquosa/mngr/frm_aqcpu.c
+++ b/resources/cpu_aquosa/mngr/frm_aqcpu.c
@@ -99,7 +99,7 @@ static int aqcpu_admtest(struct fres_sa_scenario *scenario, void *priv,
        return 0;
 }
 
-static const struct fres_res_manager frm = {
+static struct fres_res_manager frm = {
        .res_type = FRSH_RT_PROCESSOR,
        .res_id = FRSH_CPU_ID_DEFAULT,
        .admission_test = aqcpu_admtest,
@@ -116,6 +116,7 @@ static void
 usage(void)
 {
        printf("usage: frm_aqcpu [ options ]\n");
+       printf("  -d, --daemon [pid-file]   go to background after FORB initialization\n");
        printf("  -l, --loglevel <number>|<domain>=<number>,...\n");
 }
 
@@ -125,11 +126,17 @@ int main(int argc, char *argv[])
        int ret;
        forb_init_attr_t attr = { .orb_id = "org.frescor.frm.aqcpu" };
        int  opt;
+       bool opt_daemon = false;
+       char *opt_pidfile = NULL;
 
        ul_logreg_domain(&ulogd_frm_aqcpu);
 
-       while ((opt = getopt_long(argc, argv, "l:", &long_opts[0], NULL)) != EOF) {
+       while ((opt = getopt_long(argc, argv, "d::hl:", &long_opts[0], NULL)) != EOF) {
                switch (opt) {
+                       case 'd':
+                               opt_daemon = true;
+                               opt_pidfile = optarg;
+                               break;
                        case 'l':
                                ul_log_domain_arg2levels(optarg);
                                break;
@@ -140,9 +147,13 @@ int main(int argc, char *argv[])
                }
        }
        
+       if (opt_daemon)
+               forb_daemon_prepare(opt_pidfile);
+
        orb = forb_init(&argc, &argv, &attr);
        if (!orb) error(1, errno, "forb_init");
-       
+
+       frm.res_id = frsh_get_local_cpu_id();
        ret = frm_register_and_run(orb, &frm);
 
        if (ret != 0) {