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

Timestamp:

2019-08-31T10:45:17Z (6 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Children:

102f641

Parents:

f92b315

git-author:

Matthieu Riolo <matthieu.riolo@…> (2019-08-23 22:04:34)

git-committer:

Matthieu Riolo <matthieu.riolo@…> (2019-08-31 10:45:17)

Message:

Correcting failure from previous merge

The commits from Michal Koutný from the branch system-daemon
where built on a old version of Helenos. Because of this
many types and API functions have changed. This commit
upgrades the merge code

File:

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

uspace/srv/sysman/units/unit_svc.c

@@ -32 +32 @@
 #include <stdlib.h>
 #include <task.h>
+#include <str.h>
 
 #include "log.h"
@@ -58 +59 @@
 }
 
-static int unit_svc_load(unit_t *unit, ini_configuration_t *ini_conf,
+static errno_t unit_svc_load(unit_t *unit, ini_configuration_t *ini_conf,
     text_parse_t *text_parse)
 {
@@ -76 +77 @@
 }
 
-static int unit_svc_start(unit_t *unit)
+static errno_t unit_svc_start(unit_t *unit)
 {
         unit_svc_t *u_svc = CAST_SVC(unit);
@@ -84 +85 @@
         assert(unit->state == STATE_STOPPED);
 
-        int rc = task_spawnv(&u_svc->main_task_id, NULL, u_svc->exec_start.path,
+        errno_t rc = task_spawnv(&u_svc->main_task_id, NULL, u_svc->exec_start.path,
             u_svc->exec_start.argv);
 
@@ -100 +101 @@
          */
         if (str_cmp(unit->name, "devman.svc") == 0) {
-                async_usleep(100000);
+                fibril_usleep(100000);
                 if (console_kcon()) {
                         sysman_log(LVL_DEBUG2, "%s: Kconsole grabbed.", __func__);
@@ -111 +112 @@
 }
 
-static int unit_svc_stop(unit_t *unit)
+static errno_t unit_svc_stop(unit_t *unit)
 {
         unit_svc_t *u_svc = CAST_SVC(unit);
@@ -129 +130 @@
         }
 
-        int rc = task_kill(u_svc->main_task_id);
+        errno_t rc = task_kill(u_svc->main_task_id);
 
         if (rc != EOK) {