Changeset 5f5d375 in mainline

Timestamp:

2024-10-08T15:12:03Z (3 days 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.

Location:

uspace/srv/hid/remcons

Files:

• remcons.c (modified) (4 diffs)
• user.c (modified) (13 diffs)
• user.h (modified) (1 diff)

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);

uspace/srv/hid/remcons/user.c

@@ -97 +97 @@
 
         fibril_condvar_initialize(&user->refcount_cv);
-        fibril_mutex_initialize(&user->guard);
+        fibril_mutex_initialize(&user->send_lock);
+        fibril_mutex_initialize(&user->recv_lock);
         user->task_finished = false;
         user->socket_closed = false;
@@ -151 +152 @@
 
         telnet_user_t *tmp = user;
-        fibril_mutex_lock(&tmp->guard);
+        fibril_mutex_lock(&tmp->recv_lock);
         user->locsrv_connection_count++;
 
@@ -163 +164 @@
         }
 
-        fibril_mutex_unlock(&tmp->guard);
+        fibril_mutex_unlock(&tmp->recv_lock);
 
         fibril_mutex_unlock(&users_guard);
@@ -176 +177 @@
 void telnet_user_notify_client_disconnected(telnet_user_t *user)
 {
-        fibril_mutex_lock(&user->guard);
+        fibril_mutex_lock(&user->recv_lock);
         assert(user->locsrv_connection_count > 0);
         user->locsrv_connection_count--;
         fibril_condvar_signal(&user->refcount_cv);
-        fibril_mutex_unlock(&user->guard);
+        fibril_mutex_unlock(&user->recv_lock);
 }
 
@@ -189 +190 @@
 bool telnet_user_is_zombie(telnet_user_t *user)
 {
-        fibril_mutex_lock(&user->guard);
+        fibril_mutex_lock(&user->recv_lock);
         bool zombie = user->socket_closed || user->task_finished;
-        fibril_mutex_unlock(&user->guard);
+        fibril_mutex_unlock(&user->recv_lock);
 
         return zombie;
@@ -401 +402 @@
 {
         uint8_t *bp = (uint8_t *)buf;
-        fibril_mutex_lock(&user->guard);
+        fibril_mutex_lock(&user->recv_lock);
 
         assert(size > 0);
@@ -417 +418 @@
                             &next_byte);
                         if (rc != EOK) {
-                                fibril_mutex_unlock(&user->guard);
+                                fibril_mutex_unlock(&user->recv_lock);
                                 return rc;
                         }
@@ -453 +454 @@
         } while (size > 0 && (telnet_user_byte_avail(user) || *nread == 0));
 
-        fibril_mutex_unlock(&user->guard);
+        fibril_mutex_unlock(&user->recv_lock);
         return EOK;
 }
@@ -534 +535 @@
     size_t size)
 {
-        fibril_mutex_lock(&user->guard);
+        fibril_mutex_lock(&user->send_lock);
 
         errno_t rc = telnet_user_send_data_locked(user, data, size);
 
-        fibril_mutex_unlock(&user->guard);
+        fibril_mutex_unlock(&user->send_lock);
 
         return rc;
@@ -552 +553 @@
     size_t size)
 {
-        fibril_mutex_lock(&user->guard);
+        fibril_mutex_lock(&user->send_lock);
 
         errno_t rc = telnet_user_send_raw_locked(user, data, size);
 
-        fibril_mutex_unlock(&user->guard);
+        fibril_mutex_unlock(&user->send_lock);
 
         return rc;
@@ -577 +578 @@
         errno_t rc;
 
-        fibril_mutex_lock(&user->guard);
+        fibril_mutex_lock(&user->send_lock);
         rc = telnet_user_flush_locked(user);
-        fibril_mutex_unlock(&user->guard);
+        fibril_mutex_unlock(&user->send_lock);
         return rc;
 }
@@ -592 +593 @@
 void telnet_user_update_cursor_x(telnet_user_t *user, int new_x)
 {
-        fibril_mutex_lock(&user->guard);
+        fibril_mutex_lock(&user->send_lock);
         if (user->cursor_x - 1 == new_x) {
                 char data = '\b';
@@ -599 +600 @@
         }
         user->cursor_x = new_x;
-        fibril_mutex_unlock(&user->guard);
+        fibril_mutex_unlock(&user->send_lock);
 
 }

uspace/srv/hid/remcons/user.h

@@ -52 +52 @@
 /** Representation of a connected (human) user. */
 typedef struct {
-        /** Mutex guarding the whole structure. */
-        fibril_mutex_t guard;
+        /** Synchronize send operations */
+        fibril_mutex_t send_lock;
+        /** Synchronize receive operations */
+        fibril_mutex_t recv_lock;
         /** Callback functions */
         telnet_cb_t *cb;