Changeset 8fab3f6 in mainline

Timestamp:

2019-08-17T13:50:05Z (5 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Children:

31ef7c1

Parents:

504d103

git-author:

Michal Koutný <xm.koutny+hos@…> (2015-12-04 17:21:21)

git-committer:

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

Message:

sysctl: Add start operation

Location:

uspace

Files:

• app/sysctl/main.c (modified) (4 diffs)
• 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/sysman/connection_ctl.c (modified) (6 diffs)

uspace/app/sysctl/main.c

@@ -97 +97 @@
 }
 
+static int start(int argc, char *argv[])
+{
+        unit_handle_t handle;
+        char *unit_name = argv[1];
+
+        int rc = sysman_unit_handle(unit_name, &handle);
+        if (rc != EOK) {
+                printf("Cannot obtain handle for unit '%s' (%s).\n",
+                    unit_name, str_error(rc));
+                return rc;
+        }
+
+        rc = sysman_unit_start(handle, IPC_FLAG_BLOCKING);
+        if (rc != EOK) {
+                printf("Error when starting unit '%s' error (%s).\n",
+                    unit_name, str_error(rc));
+                return rc;
+        }
+
+        return 0;
+}
+
 static int stop(int argc, char *argv[])
 {
@@ -111 +133 @@
         rc = sysman_unit_stop(handle, IPC_FLAG_BLOCKING);
         if (rc != EOK) {
-                printf("Error when stopping unit '%s' handle (%s).\n",
+                printf("Error when stopping unit '%s' error (%s).\n",
                     unit_name, str_error(rc));
                 return rc;
@@ -121 +143 @@
 command_t commands[] = {
         { "list-units", 0, &list_units },
+        { "start",      1, &start },
         { "stop",       1, &stop },
         { 0 }
@@ -127 +150 @@
 static void print_syntax(void)
 {
-        printf("syntax:\n");
-        printf("\t%s\n", NAME);
-        // TODO update as functionality grows
+        printf("%s commands:\n", NAME);
+        for (command_t *it = commands; it->name != NULL; ++it) {
+                printf("\t%s", it->name);
+                for (int i = 0; i < it->args; ++i) {
+                        printf(" <arg%i>", i + 1);
+                }
+                printf("\n");
+        }
 }
 

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

@@ -46 +46 @@
         SYSMAN_CTL_UNIT_HANDLE,
         SYSMAN_CTL_UNIT_START_BY_NAME,
+        SYSMAN_CTL_UNIT_START,
         SYSMAN_CTL_UNIT_STOP,
         SYSMAN_CTL_GET_UNITS,

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

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

uspace/lib/sysman/src/ctl.c

@@ -78 +78 @@
 
         async_wait_for(req, &rc);
+        return rc;
+}
+
+int sysman_unit_start(unit_handle_t handle, int flags)
+{
+        async_exch_t *exch = sysman_exchange_begin(SYSMAN_PORT_CTL);
+
+        int rc = async_req_2_0(exch, SYSMAN_CTL_UNIT_START, handle, flags);
+        sysman_exchange_end(exch);
+        
         return rc;
 }

uspace/srv/sysman/connection_ctl.c

@@ -138 +138 @@
 }
 
-static void sysman_unit_stop(ipc_callid_t iid, ipc_call_t *icall)
+static void sysman_unit_operation(ipc_callid_t iid, ipc_call_t *icall,
+    unit_state_t state)
 {
         sysarg_t retval;
@@ -144 +145 @@
         unit_handle_t handle = IPC_GET_ARG1(*icall);
         int flags = IPC_GET_ARG2(*icall);
-        sysman_log(LVL_DEBUG2, "%s(%i, %x)", __func__, handle, flags);
+        sysman_log(LVL_DEBUG2, "%s(%i, %x, %i)", __func__, handle, flags, state);
 
         unit_t *unit = repo_find_unit_by_handle(handle);
@@ -153 +154 @@
 
         if (!(flags & IPC_FLAG_BLOCKING)) {
-                retval = sysman_run_job(unit, STATE_STOPPED, NULL, NULL);
+                retval = sysman_run_job(unit, state, NULL, NULL);
                 goto answer;
         }
@@ -162 +163 @@
                 goto answer;
         }
-        retval = sysman_run_job(unit, STATE_STOPPED, &answer_callback,
+        retval = sysman_run_job(unit, state, &answer_callback,
             iid_ptr);
         if (retval != EOK) {
@@ -173 +174 @@
 answer:
         async_answer_0(iid, retval);
+}
+
+static void sysman_unit_start(ipc_callid_t iid, ipc_call_t *icall)
+{
+        sysman_unit_operation(iid, icall, STATE_STARTED);
+}
+
+static void sysman_unit_stop(ipc_callid_t iid, ipc_call_t *icall)
+{
+        sysman_unit_operation(iid, icall, STATE_STOPPED);
 }
 
@@ -289 +300 @@
                         sysman_unit_start_by_name(callid, &call);
                         break;
+                case SYSMAN_CTL_UNIT_START:
+                        sysman_unit_start(callid, &call);
+                        break;
                 case SYSMAN_CTL_UNIT_STOP:
                         sysman_unit_stop(callid, &call);