Changeset 870f78c in mainline

Timestamp:

2013-09-12T14:34:35Z (11 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

f9f45e7

Parents:

47b27b40

Message:

rfb: Do not hold lock while sending framebuffer update

File:

• uspace/srv/hid/rfb/rfb.c (modified) (8 diffs)

uspace/srv/hid/rfb/rfb.c

@@ -301 +301 @@
 }
 
-static int rfb_send_palette(int conn_sd, rfb_t *rfb)
+static void *rfb_send_palette_message(rfb_t *rfb, size_t *psize)
 {
         size_t size = sizeof(rfb_set_color_map_entries_t) +
@@ -308 +308 @@
         void *buf = malloc(size);
         if (buf == NULL)
-                return ENOMEM;
+                return NULL;
         
         void *pos = buf;
@@ -327 +327 @@
         }
         
-        int rc = send(conn_sd, buf, size, 0);
-        free(buf);
-        
-        return rc;
+        *psize = size;
+        return buf;
 }
 
@@ -481 +479 @@
 static int rfb_send_framebuffer_update(rfb_t *rfb, int conn_sd, bool incremental)
 {
+        fibril_mutex_lock(&rfb->lock);
         if (!incremental || !rfb->damage_valid) {
                 rfb->damage_rect.x = 0;
@@ -496 +495 @@
         
         void *buf = malloc(buf_size);
-        if (buf == NULL)
+        if (buf == NULL) {
+                fibril_mutex_unlock(&rfb->lock);
                 return ENOMEM;
+        }
         memset(buf, 0, buf_size);
         
@@ -522 +523 @@
         rfb_rectangle_to_be(rect, rect);
         
+        rfb->damage_valid = false;
+        
+        size_t send_palette_size = 0;
+        void *send_palette = NULL;
+        
         if (!rfb->pixel_format.true_color) {
-                int rc = rfb_send_palette(conn_sd, rfb);
+                send_palette = rfb_send_palette_message(rfb, &send_palette_size);
+                if (send_palette == NULL) {
+                        free(buf);
+                        fibril_mutex_unlock(&rfb->lock);
+                        return ENOMEM;
+                }
+        }
+        
+        fibril_mutex_unlock(&rfb->lock);
+        
+        if (!rfb->pixel_format.true_color) {
+                int rc = send(conn_sd, send_palette, send_palette_size, 0);
                 if (rc != EOK) {
                         free(buf);
@@ -532 +549 @@
         int rc = send(conn_sd, buf, buf_size, 0);
         free(buf);
-        rfb->damage_valid = false;
+        
         return rc;
 }
@@ -694 +711 @@
                         log_msg(LOG_DEFAULT, LVL_DEBUG2,
                             "Received FramebufferUpdateRequest message");
-                        fibril_mutex_lock(&rfb->lock);
                         rfb_send_framebuffer_update(rfb, conn_sd, fbur.incremental);
-                        fibril_mutex_unlock(&rfb->lock);
                         break;
                 case RFB_CMSG_KEY_EVENT: