Changeset 3457Tweet

Timestamp:

May 14, 2009, 6:16:41 PM (11 years ago)

Author:

Pascal Terjan

Message:

• Adapt refresh rate dynamically and inform the server about it

Location:

neercs/trunk/src

Files:

• attach.c (modified) (2 diffs)
• main.c (modified) (2 diffs)
• neercs.h (modified) (1 diff)
• server.c (modified) (3 diffs)

neercs/trunk/src/attach.c

@@ -177 +177 @@
 int request_attach(struct screen_list* screen_list)
 {
-    char buf[32];
+    char buf[41];
     int bytes;
 
-    bytes = snprintf(buf, sizeof(buf)-1, "ATTACH %10d%c%10d",
+    bytes = snprintf(buf, sizeof(buf)-1, "ATTACH %10d %10d %10d",
                      caca_get_canvas_width(screen_list->cv),
-                     ' ',
-                     caca_get_canvas_height(screen_list->cv));
+                     caca_get_canvas_height(screen_list->cv),
+                     screen_list->delay);
     buf[bytes] = '\0';
     debug("Requesting attach: %s", buf);
@@ -445 +445 @@
 }
 
+int send_delay(struct screen_list* screen_list)
+{
+    char buf[18];
+    int bytes;
+    bytes = snprintf(buf, sizeof(buf)-1, "DELAY %10d", screen_list->delay);
+    buf[bytes] = '\0';
+    return write(screen_list->socket[SOCK_SERVER], buf, strlen(buf)) <= 0;
+}

neercs/trunk/src/main.c

@@ -180 +180 @@
                 char * buf2;
                 size_t l = 0;
+                int dt;
                 /* 0 means we have valid data but incomplete, so read the rest */
                 while(l == 0)
@@ -206 +207 @@
                 fcntl(screen_list->socket[SOCK_CLIENT], F_SETFL, O_NONBLOCK);
                 caca_refresh_display(screen_list->dp);
-                debug("refreshtime=%d", caca_get_display_time(screen_list->dp));
+                dt = caca_get_display_time(screen_list->dp);
+                debug("refreshtime=%dms (limit %d, requested %d)", dt/1000, screen_list->delay, screen_list->requested_delay);
+                /* Adjust refresh delay so that the server do not compute useless things */
+                if(dt > 2*1000*screen_list->delay)
+                {
+                    screen_list->delay*=2;
+                    send_delay(screen_list);
+                }
+                else if(dt < screen_list->delay*1000/2 &&
+                        screen_list->delay >= 2*screen_list->requested_delay)
+                {
+                    screen_list->delay/=2;
+                    send_delay(screen_list);
+                }
             }
             else if(!strncmp("CURSOR ", buf, 7))

neercs/trunk/src/neercs.h

@@ -245 +245 @@
 int start_server(struct screen_list *screen_list);
 int send_event(caca_event_t ev, struct screen_list* screen_list);
+int send_delay(struct screen_list* screen_list);
 
 /* Screens management */

neercs/trunk/src/server.c

@@ -222 +222 @@
         int quit = 0;
         ssize_t n;
-        char buf[4097];
+        char buf[128];
 
         /* Read program output */
@@ -240 +240 @@
                 caca_free_canvas(screen_list->cv);
                 screen_list->cv = caca_create_canvas(atoi(buf+7), atoi(buf+18));
+                screen_list->delay = atoi(buf+29);
                 screen_list->width  = caca_get_canvas_width(screen_list->cv);
                 screen_list->height = caca_get_canvas_height(screen_list->cv) - ((screen_list->mini*6) + (screen_list->status));
@@ -249 +250 @@
             {
                 quit = 1;
+            }
+            else if(!strncmp("DELAY ", buf, 6))
+            {
+                screen_list->delay = atoi(buf+6);
             }
             else if(!strncmp("RESIZE ", buf, 7))