Changeset 3438 for neercs/trunkTweet

Timestamp:

May 12, 2009, 12:55:01 PM (11 years ago)

Author:

Pascal Terjan

Message:

• Avoid a memcpy and allocating 128K on the stack

Location:

neercs/trunk/src

Files:

• main.c (modified) (5 diffs)
• server.c (modified) (2 diffs)

neercs/trunk/src/main.c

@@ -83 +83 @@
     long long unsigned int last_key_time = 0;
     int mainret = -1;
-
+#define NEERCS_RECV_BUFSIZE 128*1024
+    char * buf = NULL;
 
     screen_list = create_screen_list();
@@ -157 +158 @@
         int ret = 0;
         ssize_t n;
-        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)
+        buf = malloc(NEERCS_RECV_BUFSIZE);
+        if(!buf)
+        {
+            debug("Failed to allocate memory");
+            goto end;
+        }
+        if(screen_list->socket[SOCK_CLIENT] && (n = read(screen_list->socket[SOCK_CLIENT], buf, NEERCS_RECV_BUFSIZE-1)) > 0)
         {
             buf[n] = 0;
@@ -170 +176 @@
             else if(!strncmp("REFRESH ", buf, 8))
             {
-                ssize_t l2 = 0, lb = n-8;
-                char * buf2 = NULL;
+                ssize_t l2, lb = n-8;
+                char * buf2;
                 size_t l = caca_import_memory(screen_list->cv, buf+8, lb, "caca");
+                l2 = lb;
                 /* 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)
                 {
+                    buf2 = realloc(buf, l2+8 + NEERCS_RECV_BUFSIZE);
+                    if(!buf2)
+                    {
+                        debug("Failed to allocate memory");
+                        goto end;
+                    }
+                    buf = buf2;
                     fcntl(screen_list->socket[SOCK_CLIENT], F_SETFL, 0);
-                    lb = read(screen_list->socket[SOCK_CLIENT], buf, sizeof(buf)-1);
+                    lb = read(screen_list->socket[SOCK_CLIENT], buf+l2+8, NEERCS_RECV_BUFSIZE-1);
                     if(lb < 0)
                     {
@@ -192 +200 @@
                     {
                         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");
+                        l = caca_import_memory(screen_list->cv, buf+8, l2, "caca");
                     }
                 }
@@ -233 +239 @@
     mainret = 0;
 end:
+    if(buf)
+        free(buf);
     if(screen_list)
     {

neercs/trunk/src/server.c

@@ -114 +114 @@
         getsockopt(screen_list->socket[SOCK_CLIENT], SOL_SOCKET, SO_SNDBUF,
                    &bufsize, &optlen);
+        bufsize /= 2;
+        debug("bufsize=%d", bufsize);
         written = write(screen_list->socket[SOCK_CLIENT],
                         buf2,
@@ -119 +121 @@
         if(written <= 0 && errno != EAGAIN)
         {
-            debug("Can't refresh (%s), with %d bytes", strerror(errno), towrite);
+            debug("Can't refresh (%s), with %d bytes (out of %d)", strerror(errno), towrite > bufsize ? bufsize : towrite, towrite);
             return -1;
         }