Changeset 5f5d375 in mainline for uspace/srv/hid/remcons/remcons.c

Timestamp:

2024-10-08T15:12:03Z (8 months ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master

Children:

5e0acaa

Parents:

c7ecd290

git-author:

Jiri Svoboda <jiri@…> (2024-10-07 18:11:43)

git-committer:

Jiri Svoboda <jiri@…> (2024-10-08 15:12:03)

Message:

Split read/write lock in remcons

We do not want waiting for event to block output.

File:

• uspace/srv/hid/remcons/remcons.c (modified) (4 diffs)

uspace/srv/hid/remcons/remcons.c

@@ -540 +540 @@
                     "failed: %s.", APP_GETTERM, user->service_name, APP_SHELL,
                     str_error(rc));
-                fibril_mutex_lock(&user->guard);
+                fibril_mutex_lock(&user->recv_lock);
                 user->task_finished = true;
                 user->srvs.aborted = true;
                 fibril_condvar_signal(&user->refcount_cv);
-                fibril_mutex_unlock(&user->guard);
+                fibril_mutex_unlock(&user->recv_lock);
                 return EOK;
         }
 
-        fibril_mutex_lock(&user->guard);
+        fibril_mutex_lock(&user->recv_lock);
         user->task_id = task;
-        fibril_mutex_unlock(&user->guard);
+        fibril_mutex_unlock(&user->recv_lock);
 
         task_exit_t task_exit;
@@ -560 +560 @@
 
         /* Announce destruction. */
-        fibril_mutex_lock(&user->guard);
+        fibril_mutex_lock(&user->recv_lock);
         user->task_finished = true;
         user->srvs.aborted = true;
         fibril_condvar_signal(&user->refcount_cv);
-        fibril_mutex_unlock(&user->guard);
+        fibril_mutex_unlock(&user->recv_lock);
 
         return EOK;
@@ -728 +728 @@
 
         /* Wait for all clients to exit. */
-        fibril_mutex_lock(&user->guard);
+        fibril_mutex_lock(&user->recv_lock);
         while (!user_can_be_destroyed_no_lock(user)) {
                 if (user->task_finished) {
@@ -740 +740 @@
                         }
                 }
-                fibril_condvar_wait_timeout(&user->refcount_cv, &user->guard, 1000);
-        }
-        fibril_mutex_unlock(&user->guard);
+                fibril_condvar_wait_timeout(&user->refcount_cv, &user->recv_lock, 1000);
+        }
+        fibril_mutex_unlock(&user->recv_lock);
 
         rc = loc_service_unregister(remcons_srv, user->service_id);