Changeset dda2602 in mainline for uspace/srv/sysman/units/unit_svc.c

Timestamp:

2019-08-03T09:41:07Z (5 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Children:

dd5c623

Parents:

c0e4fc50

git-author:

Michal Koutný <xm.koutny+hos@…> (2015-05-08 11:10:06)

git-committer:

Matthieu Riolo <matthieu.riolo@…> (2019-08-03 09:41:07)

Message:

sysman: Create units to start up to compositor

• add necessary units to support basic GUI (barber, vterm)
• lacking autostart is compensated with explicit dependencies
• IPC_FLAG_AUTOSTART in compositor and locsrv fix
• paths to v* binaries
• refactored job closure creation

Conflicts:

boot/Makefile.common
uspace/app/vlaunch/vlaunch.c
uspace/srv/hid/compositor/compositor.c
uspace/srv/locsrv/locsrv.c

File:

• uspace/srv/sysman/units/unit_svc.c (modified) (5 diffs)

uspace/srv/sysman/units/unit_svc.c

@@ -39 +39 @@
 
 static config_item_t unit_configuration[] = {
-        {"ExecStart", &config_parse_string, offsetof(unit_svc_t, exec_start), NULL},
+        {"ExecStart", &util_parse_command, offsetof(unit_svc_t, exec_start), NULL},
         CONFIGURATION_ITEM_SENTINEL
 };
@@ -47 +47 @@
         unit_svc_t *u_svc = CAST_SVC(unit);
         assert(u_svc);
+        util_command_init(&u_svc->exec_start);
 }
 
@@ -54 +55 @@
         unit_svc_t *u_svc = CAST_SVC(unit);
 
-        free(u_svc->exec_start);
+        util_command_deinit(&u_svc->exec_start);
 }
 
@@ -84 +85 @@
         assert(unit->state == STATE_STOPPED);
 
-        // TODO extend the simple implementation
-        const char *args[] = {"warn", NULL};
-        int rc = task_spawnv(NULL, NULL, u_svc->exec_start, args);
+        int rc = task_spawnv(NULL, NULL, u_svc->exec_start.path,
+            u_svc->exec_start.argv);
+        sysman_log(LVL_DEBUG2, "task_spawn(%s, %s)", u_svc->exec_start.path, u_svc->exec_start.argv[0]);
         if (rc != EOK) {
                 unit->state = STATE_FAILED;
@@ -101 +102 @@
         unit->state = STATE_STARTED;
 
+        /*
+         * Workaround to see log output even after devman starts (and overrides
+         * kernel's frame buffer. It's here since devman is started as a
+         * service (however not all services are devman...).
+         */
         if (console_kcon()) {
                 sysman_log(LVL_DEBUG2, "%s: Kconsole grabbed.", __func__);