Changeset 504d103 in mainline

Timestamp:

2019-08-17T13:48:39Z (5 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Children:

8fab3f6

Parents:

95d4280a

git-author:

Michal Koutný <xm.koutny+hos@…> (2015-12-04 16:57:19)

git-committer:

Matthieu Riolo <matthieu.riolo@…> (2019-08-17 13:48:39)

Message:

sysman: Call starting by name appropriately
Conflicts:

uspace/srv/devman/driver.c

Location:

uspace

Files:

• lib/c/include/ipc/sysman.h (modified) (1 diff)
• lib/sysman/include/sysman/ctl.h (modified) (1 diff)
• lib/sysman/src/ctl.c (modified) (1 diff)
• srv/devman/driver.c (modified) (1 diff)
• srv/locsrv/locsrv.c (modified) (1 diff)
• srv/sysman/connection_ctl.c (modified) (2 diffs)
• srv/vfs/vfs_ops.c (modified) (1 diff)

uspace/lib/c/include/ipc/sysman.h

@@ -45 +45 @@
         SYSMAN_BROKER_EXP_REMOVED,
         SYSMAN_CTL_UNIT_HANDLE,
-        SYSMAN_CTL_UNIT_START,
+        SYSMAN_CTL_UNIT_START_BY_NAME,
         SYSMAN_CTL_UNIT_STOP,
         SYSMAN_CTL_GET_UNITS,

uspace/lib/sysman/include/sysman/ctl.h

@@ -35 +35 @@
 int sysman_unit_handle(const char *, unit_handle_t *);
 
-int sysman_unit_start(const char *, int);
+int sysman_unit_start_by_name(const char *, int);
 int sysman_unit_stop(unit_handle_t, int);
 

uspace/lib/sysman/src/ctl.c

@@ -64 +64 @@
  * TODO convert to name->handle API
  */
-int sysman_unit_start(const char *unit_name, int flags)
+int sysman_unit_start_by_name(const char *unit_name, int flags)
 {
         async_exch_t *exch = sysman_exchange_begin(SYSMAN_PORT_CTL);
 
-        aid_t req = async_send_1(exch, SYSMAN_CTL_UNIT_START, flags, NULL);
+        aid_t req = async_send_1(exch, SYSMAN_CTL_UNIT_START_BY_NAME, flags, NULL);
         sysarg_t rc = async_data_write_start(exch, unit_name, str_size(unit_name));
         sysman_exchange_end(exch);

uspace/srv/devman/driver.c

@@ -348 +348 @@
         /*
          * Non-blocking asynchronous request to start a driver
-         * FIXME See note about sysman_unit_start non-blocking (asynchronous)
+         * FIXME See note about sysman_unit_start_by_name non-blocking (asynchronous)
          *       API
          */
         int flags = 0;
-        rc = sysman_unit_start(unit_name, flags);
+        rc = sysman_unit_start_by_name(unit_name, flags);
         free(unit_name);
 

uspace/srv/locsrv/locsrv.c

@@ -384 +384 @@
         }
 
-        rc = sysman_unit_start(unit_name, IPC_FLAG_BLOCKING);
+        rc = sysman_unit_start_by_name(unit_name, IPC_FLAG_BLOCKING);
         free(unit_name);
         return rc;

uspace/srv/sysman/connection_ctl.c

@@ -91 +91 @@
 }
 
-static void sysman_unit_start(ipc_callid_t iid, ipc_call_t *icall)
+static void sysman_unit_start_by_name(ipc_callid_t iid, ipc_call_t *icall)
 {
         char *unit_name = NULL;
@@ -286 +286 @@
                         sysman_unit_handle(callid, &call);
                         break;
-                case SYSMAN_CTL_UNIT_START:
-                        sysman_unit_start(callid, &call);
+                case SYSMAN_CTL_UNIT_START_BY_NAME:
+                        sysman_unit_start_by_name(callid, &call);
                         break;
                 case SYSMAN_CTL_UNIT_STOP:

uspace/srv/vfs/vfs_ops.c

@@ -225 +225 @@
         }
 
-        rc = sysman_unit_start(unit_name, IPC_FLAG_BLOCKING);
+        rc = sysman_unit_start_by_name(unit_name, IPC_FLAG_BLOCKING);
 
         free(unit_name);