Changeset 3431Tweet

Timestamp:

May 5, 2009, 6:42:08 PM (11 years ago)

Author:

Pascal Terjan

Message:

• Handle large screens

Location:

neercs/trunk

Files:

• TODO (modified) (1 diff)
• src/main.c (modified) (2 diffs)
• src/server.c (modified) (3 diffs)

neercs/trunk/TODO

@@ -3 +3 @@
  * Autolock after n seconds of screensaver
  * Autolock on detach
-- Have a way to detect that the server died when we are already connected
-- Allow people to have a window bigger than my screen
 - Improve performance

neercs/trunk/src/main.c

@@ -159 +159 @@
         char buf[128*1024];
         if(!screen_list) goto end;
-        if (screen_list->socket[SOCK_CLIENT] && (n = read(screen_list->socket[SOCK_CLIENT], buf, sizeof(buf)-1)) > 0)
+        if(screen_list->socket[SOCK_CLIENT] && (n = read(screen_list->socket[SOCK_CLIENT], buf, sizeof(buf)-1)) > 0)
         {
             buf[n] = 0;
@@ -170 +170 @@
             else if(!strncmp("REFRESH ", buf, 8))
             {
-                caca_import_memory(screen_list->cv, buf+8, n-8, "caca");
+                ssize_t l2 = 0, lb = n-8;
+                char * buf2 = NULL;
+                size_t l = caca_import_memory(screen_list->cv, buf+8, lb, "caca");
+                /* 0 means we have valid data but incomplete, so read the rest */
+                if(l == 0)
+                {
+                    buf2 = realloc(buf2, lb+l2);
+                    memcpy(buf2+l2, buf+8, lb);
+                    l2 += lb;
+                }
+                while(l == 0)
+                {
+                    fcntl(screen_list->socket[SOCK_CLIENT], F_SETFL, 0);
+                    lb = read(screen_list->socket[SOCK_CLIENT], buf, sizeof(buf)-1);
+                    if(lb < 0)
+                    {
+                        debug("Failed to read the end of the refresh message (%s)", strerror(errno));
+                        l = -1;
+                    }
+                    else
+                    {
+                        debug("Got %d more bytes", lb);
+                        buf2 = realloc(buf2, lb+l2);
+                        memcpy(buf2+l2, buf, lb);
+                        l2 += lb;
+                        l = caca_import_memory(screen_list->cv, buf2, l2, "caca");
+                    }
+                }
+                fcntl(screen_list->socket[SOCK_CLIENT], F_SETFL, O_NONBLOCK);
                 caca_refresh_display(screen_list->dp);
             }

neercs/trunk/src/server.c

@@ -24 +24 @@
 #include <signal.h>
 #include <sys/ioctl.h>
+#include <sys/socket.h>
 #include <sys/types.h>
 #include <sys/wait.h>
@@ -40 +41 @@
     if(!screen_list->socket[SOCK_CLIENT])
         connect_socket(screen_list, SOCK_CLIENT);
-    debug("Sending message (%s) to client on socket %d", msg, screen_list->socket[SOCK_CLIENT]);
+    debug("Sending message (%.8s,%d) to client on socket %d", msg, strlen(msg), screen_list->socket[SOCK_CLIENT]);
     if(!screen_list->socket[SOCK_CLIENT])
         ret = -1;
@@ -106 +107 @@
         connect_socket(screen_list, SOCK_CLIENT);
     if(screen_list->socket[SOCK_CLIENT])
-        if(write(screen_list->socket[SOCK_CLIENT], buf2, bytes+8) <= 0 && errno != EAGAIN)
-        {
-            debug("Can't refresh (%s), with %d bytes\n", strerror(errno), bytes+8);
+    {
+        size_t bufsize, towrite = bytes+8;
+        ssize_t written;
+        socklen_t optlen = sizeof(bufsize);
+        debug("Requesting refresh for %d", bytes+8);
+        getsockopt(screen_list->socket[SOCK_CLIENT], SOL_SOCKET, SO_SNDBUF,
+                   &bufsize, &optlen);
+        written = write(screen_list->socket[SOCK_CLIENT],
+                        buf2,
+                        towrite > bufsize ? bufsize : towrite);
+        if(written <= 0 && errno != EAGAIN)
+        {
+            debug("Can't refresh (%s), with %d bytes", strerror(errno), towrite);
             return -1;
         }
+        debug("Wrote %d bytes", written);
+        towrite -= written;
+        while(written > 0 && towrite > 0)
+        {
+            ssize_t n;
+            debug("Wrote %d, %d remaining", written, towrite);
+            /* Block to read the end of the message */
+            fcntl(screen_list->socket[SOCK_CLIENT], F_SETFL, 0);
+            n = write(screen_list->socket[SOCK_CLIENT],
+                      buf2 + written,
+                      towrite > bufsize ? bufsize : towrite);
+            if(n < 0)
+            {
+                debug("Can't refresh (%s), with %d bytes", strerror(errno), bytes+8);
+                return -1;
+            } 
+            written += n;
+            towrite -= n;
+        }
+        fcntl(screen_list->socket[SOCK_CLIENT], F_SETFL, O_NONBLOCK);
+    }
     free(buf);
     free(buf2);