Changeset 3529f148 in mainline for uspace/srv

Timestamp:

2020-03-06T19:14:20Z (6 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Children:

13b4504

Parents:

06599a1

git-author:

Matthieu Riolo <matthieu.riolo@…> (2020-02-29 11:22:13)

git-committer:

Matthieu Riolo <matthieu.riolo@…> (2020-03-06 19:14:20)

Message:

Adding types task_wait_flag_t and ipc_start_flag_t which replaces makros

Location:

uspace/srv

Files:

• sysman/connection_ctl.c (modified) (2 diffs)
• sysman/sm_task.c (modified) (2 diffs)
• sysman/units/unit_mnt.c (modified) (2 diffs)
• taskman/event.c (modified) (7 diffs)
• taskman/event.h (modified) (1 diff)
• taskman/main.c (modified) (1 diff)

uspace/srv/sysman/connection_ctl.c

@@ -104 +104 @@
         }
 
-        int flags = ipc_get_arg1(icall);
+        ipc_start_flag_t flags = ipc_get_arg1(icall);
         sysman_log(LVL_DEBUG2, "%s(%s, %x)", __func__, unit_name, flags);
 
@@ -144 +144 @@
 
         unit_handle_t handle = ipc_get_arg1(icall);
-        sysarg_t flags = ipc_get_arg2(icall);
-        sysman_log(LVL_DEBUG2, "%s(%p, %" SCNuPTR ", %i)", __func__, icall->cap_handle, flags, state);
+        ipc_start_flag_t flags = ipc_get_arg2(icall);
+        sysman_log(LVL_DEBUG2, "%s(%p, %u, %i)", __func__, icall->cap_handle, flags, state);
 
         unit_t *unit = repo_find_unit_by_handle(handle);

uspace/srv/sysman/sm_task.c

@@ -41 +41 @@
 struct sm_task_event {
         task_id_t task_id;
-        int flags;
+        task_wait_flag_t flags;
         task_exit_t texit;
         int retval;
@@ -51 +51 @@
  * @note This function runs in separate fibril (not same as event loop).
  */
-static void sm_task_event_handler(task_id_t tid, int flags, task_exit_t texit,
+static void sm_task_event_handler(task_id_t tid, task_wait_flag_t flags, task_exit_t texit,
     int retval)
 {

uspace/srv/sysman/units/unit_mnt.c

@@ -54 +54 @@
         char *device;
         char *options;
-        unsigned int flags;
+        ipc_start_flag_t flags;
         unsigned int instance;
 
@@ -208 +208 @@
          */
 
-        mnt_data.flags |= u_mnt->blocking ? IPC_FLAG_BLOCKING : 0;
-        mnt_data.flags |= u_mnt->autostart ? IPC_AUTOSTART : 0;
+        mnt_data.flags |= u_mnt->blocking ? true : 0;
+        mnt_data.flags |= u_mnt->autostart ? true : 0;
         mnt_data.unit = unit;
 

uspace/srv/taskman/event.c

@@ -50 +50 @@
         task_id_t waiter_id;  /**< Task ID who waits. */
         ipc_call_t *icall;  /**< Call ID waiting for the event. */
-        int flags;            /**< Wait flags. */
+        task_wait_flag_t flags; /**< Wait flags. */
 } pending_wait_t;
 
@@ -67 +67 @@
 }
 
-static int event_flags(task_t *task)
-{
-        int flags = 0;
+static task_wait_flag_t event_flags(task_t *task)
+{
+        task_wait_flag_t flags = TASK_WAIT_NONE;
         if (task->retval_type == RVAL_SET) {
                 flags |= TASK_WAIT_RETVAL;
@@ -88 +88 @@
 static void event_notify(task_t *sender, async_sess_t *sess)
 {
-        int flags = event_flags(sender);
-        if (flags == 0) {
+        task_wait_flag_t flags = event_flags(sender);
+        if (flags == TASK_WAIT_NONE) {
                 return;
         }
@@ -114 +114 @@
 static void event_notify_all(task_t *sender)
 {
-        int flags = event_flags(sender);
-        if (flags == 0) {
+        task_wait_flag_t flags = event_flags(sender);
+        if (flags == TASK_WAIT_NONE) {
                 return;
         }
@@ -140 +140 @@
                         continue; // TODO really when does this happen?
                 }
-                int notify_flags = event_flags(t);
+                task_wait_flag_t notify_flags = event_flags(t);
 
                 /*
@@ -146 +146 @@
                  * thus it can be never present in rest flags.
                  */
-                int rest = (~notify_flags & pr->flags) & ~TASK_WAIT_RETVAL;
+                task_wait_flag_t rest = (~notify_flags & pr->flags) & ~TASK_WAIT_RETVAL;
                 rest &= ~TASK_WAIT_BOTH;
-                int match = notify_flags & pr->flags;
+                bool match = notify_flags & pr->flags;
                 // TODO why do I even accept such calls?
                 bool answer = !(pr->icall->flags & IPC_CALL_NOTIF);
@@ -233 +233 @@
 }
 
-void wait_for_task(task_id_t id, int flags, ipc_call_t *icall,
+void wait_for_task(task_id_t id, task_wait_flag_t flags, ipc_call_t *icall,
     task_id_t waiter_id)
 {

uspace/srv/taskman/event.h

@@ -44 +44 @@
     ipc_call_t *);
 extern void dump_events(task_id_t, ipc_call_t *);
-extern void wait_for_task(task_id_t, int, ipc_call_t *, task_id_t);
+extern void wait_for_task(task_id_t, task_wait_flag_t, ipc_call_t *, task_id_t);
 extern errno_t task_set_retval(task_id_t, int, bool);
 

uspace/srv/taskman/main.c

@@ -97 +97 @@
 
         /* After forward we can dispose all session-related resources */
-        async_hangup(sess_ref->sess);
+        //async_hangup(sess_ref->sess);
         free(sess_ref);