chiark / gitweb /
"trusting" pager collector - do not confirm lack of motion, but do wait 0.5s each...
authorIan Jackson <ian@liberator.relativity.greenend.org.uk>
Sat, 6 Jun 2009 12:38:46 +0000 (13:38 +0100)
committerIan Jackson <ian@liberator.relativity.greenend.org.uk>
Sat, 6 Jun 2009 12:38:46 +0000 (13:38 +0100)
pctb/pages.c

index 14d0be2..3969038 100644 (file)
@@ -56,38 +56,6 @@ static CanonImage *single_page(void) {
 }
 #endif
 
 }
 #endif
 
-static void raise_and_set_focus(void) {
-  int r;
-  XWindowAttributes attr;
-  int xpos,ypos, evbase,errbase,majver,minver;
-  unsigned width,height,bd,depth;
-  Window dummy;
-  
-  fprintf(stderr,"PAGING raise_and_set_focus\n");
-
-  r= XTestQueryExtension(disp, &evbase,&errbase,&majver,&minver);
-  eassert(r==True);
-
-  r= XRaiseWindow(disp, id);  eassert(r);
-
-  r= XGetWindowAttributes(disp, id, &attr);  eassert(r);
-  r= XGetGeometry(disp,id, &attr.root,&xpos,&ypos,&width,&height, &bd,&depth);
-  eassert(r);
-
-  r= XTranslateCoordinates(disp, id,attr.root, 160,160, &xpos,&ypos,
-                          &dummy);
-  eassert(r);
-
-  int screen= XScreenNumberOfScreen(attr.screen);
-  XTestFakeMotionEvent(disp,screen, xpos, ypos, 0);
-
-  XTestFakeButtonEvent(disp,1,1, 50);
-  XTestFakeButtonEvent(disp,1,0, 50);
-  r= XSync(disp, False);  eassert(r);
-
-  fprintf(stderr,"PAGING raise_and_set_focus done.\n");
-}
-
 /*---------- pager ----------*/
 
 typedef struct {
 /*---------- pager ----------*/
 
 typedef struct {
@@ -95,45 +63,55 @@ typedef struct {
   unsigned char d[];
 } Snapshot;
 
   unsigned char d[];
 } Snapshot;
 
-static void send_key(KeySym sym) {
+static size_t snapshot_alloc= 1024;
+static double last_input;
+static const double min_update_allowance= 0.5;
+
+static double timestamp(void) {
+  struct timeval tv;
+  int r;
+  
+  r= gettimeofday(&tv,0);  eassert(!r);
+  double t= (tv.tv_sec - tv_startup.tv_sec) +
+            (tv.tv_usec - tv_startup.tv_usec) * 1e-6;
+  fprintf(stderr,"%f\n",t);
+  return t;
+}
+static void delay(double need_sleep) {
   int r;
   int r;
+  fprintf(stderr,"PAGING     delay %f\n",need_sleep);
+  r= usleep(need_sleep * 1e6);  eassert(!r);
+}
+
+static void sync_after_input(void) {
+  int r;
+  r= XSync(disp, False);  eassert(r);
+  last_input= timestamp();
+}
+
+static void send_key(KeySym sym) {
   XTestFakeKeyEvent(disp, keycode(sym),1, 10);
   XTestFakeKeyEvent(disp, keycode(sym),0, 10);
   XTestFakeKeyEvent(disp, keycode(sym),1, 10);
   XTestFakeKeyEvent(disp, keycode(sym),0, 10);
-  r= XSync(disp, False);  eassert(r);
 }
 
 static void send_pgup_many(void) {
   int i;
 }
 
 static void send_pgup_many(void) {
   int i;
-  fprintf(stderr,"PAGING   PageUp\n");
   for (i=0; i<25; i++)
     send_key(XK_Prior);
   for (i=0; i<25; i++)
     send_key(XK_Prior);
+  fprintf(stderr,"PAGING   PageUp x %d\n",i);
+  sync_after_input();
 }
 static void send_pgdown(void) {
 }
 static void send_pgdown(void) {
-  fprintf(stderr,"PAGING   PageDown\n");
   send_key(XK_Next);
   send_key(XK_Next);
+  fprintf(stderr,"PAGING   PageDown\n");
+  sync_after_input();
 }
 
 }
 
-static double timestamp(void) {
-  struct timeval tv;
-  int r;
-  
-  r= gettimeofday(&tv,0);  eassert(!r);
-  double t= (tv.tv_sec - tv_startup.tv_sec) +
-            (tv.tv_usec - tv_startup.tv_usec) * 1e-6;
-  fprintf(stderr,"%f\n",t);
-  return t;
-}
-
-static double worst_snapshot= 0.050;
-static double worst_stabilise= 0.100;
-static size_t snapshot_alloc= 1024;
-
 static void snapshot(Snapshot **output) {
   char *cmd;
   int r;
   
   free(*output);  *output=0;
 static void snapshot(Snapshot **output) {
   char *cmd;
   int r;
   
   free(*output);  *output=0;
-  double a= timestamp();
 
   fprintf(stderr,"PAGING   snapshot\n");
 
 
   fprintf(stderr,"PAGING   snapshot\n");
 
@@ -166,20 +144,7 @@ static void snapshot(Snapshot **output) {
   *output= realloc(*output, sizeof(**output) + snapshot_alloc);
   eassert(*output);
   
   *output= realloc(*output, sizeof(**output) + snapshot_alloc);
   eassert(*output);
   
-  double b= timestamp();
-  double it_took= b-a;
-  if (it_took > worst_snapshot)
-    worst_snapshot= it_took;
-
-  fprintf(stderr,"PAGING   snapshot took=%f len=%ld\n",
-         it_took, (long)used);
-}
-
-static void snapshot_idle(void) {
-  int r;
-  r= usleep(worst_snapshot * 1e6 * 0.5);
-  /* spend no more than 2/3 of our time constantly snapshotting */
-  eassert(!r);
+  fprintf(stderr,"PAGING   snapshot len=%ld\n", (long)used);
 }
 
 static int identical(const Snapshot *a, const Snapshot *b) {
 }
 
 static int identical(const Snapshot *a, const Snapshot *b) {
@@ -194,58 +159,76 @@ static void wait_for_stability(Snapshot **output,
   /* waits longer if we're going to return an image identical to previously
    * if previously==0, all images are considered identical to it */
 
   /* waits longer if we're going to return an image identical to previously
    * if previously==0, all images are considered identical to it */
 
-  double when_started= timestamp();
-  double last_change= when_started;
-  double it_took= -1;
-
   fprintf(stderr,"PAGING  wait_for_stability"
   fprintf(stderr,"PAGING  wait_for_stability"
-         "  worst_snapshot=%f worst_stabilise=%f  previously=%p\n",
-         worst_snapshot, worst_stabilise, previously);
+         "  last_input=%f previously=%p\n",
+         last_input, previously);
 
   for (;;) {
     double at_snapshot= timestamp();
 
   for (;;) {
     double at_snapshot= timestamp();
+    double need_sleep= min_update_allowance - (at_snapshot - last_input);
+    if (need_sleep > 0) { delay(need_sleep); continue; }
+
     snapshot(output);
     snapshot(output);
-    double right_now= timestamp();
-
-    if (!last) {
-      fprintf(stderr,"PAGING  wait_for_stability first...\n");
-      last_change= when_started= right_now;
-      last=*output; *output=0;
-    } else if (!identical(*output,last)) {
-      fprintf(stderr,"PAGING  wait_for_stability changed...\n");
-      last_change= right_now;
-      free(last); last=*output; *output=0;
-      it_took= -1;
-    } else {
-      if (it_took<0)
-       it_took= at_snapshot - when_started;
-
-      double threshold= worst_stabilise + worst_snapshot;
-      if (!previously || identical(*output,previously))
-       threshold *= 2;  threshold += 1.5;
-
-      double stable_for= right_now - last_change;
-      fprintf(stderr,"PAGING  wait_for_stability"
-             "  worst_snapshot=%f worst_stabilise=%f"
-             "  it_took=%f stable_for=%f threshold=%f...\n",
-             worst_snapshot, worst_stabilise,
-             it_took, stable_for, threshold);
-      
-      if (stable_for > threshold)
-       break;
+
+    if (!with_keypress &&
+       !(previously && identical(*output,previously))) {
+      fprintf(stderr,"PAGING  wait_for_stability  simple\n");
+      break;
+    }
+
+    if (last && identical(*output,last)) {
+      fprintf(stderr,"PAGING  wait_for_stability  stabilised\n");
+      break;
     }
     }
+    
+    fprintf(stderr,"PAGING  wait_for_stability  retry\n");
+
+    free(last); last=*output; *output=0;
+
     if (with_keypress)
       with_keypress();
     if (with_keypress)
       with_keypress();
-    snapshot_idle();
-  }
 
 
-  if (!with_keypress && it_took > worst_stabilise)
-    worst_stabilise= it_took;
+    delay(0.5);
+  }
 
   free(last);
   fprintf(stderr,"PAGING  wait_for_stability done.\n");
 }
 
 
   free(last);
   fprintf(stderr,"PAGING  wait_for_stability done.\n");
 }
 
+static void raise_and_set_focus(void) {
+  int r;
+  XWindowAttributes attr;
+  int xpos,ypos, evbase,errbase,majver,minver;
+  unsigned width,height,bd,depth;
+  Window dummy;
+  
+  fprintf(stderr,"PAGING raise_and_set_focus\n");
+
+  r= XTestQueryExtension(disp, &evbase,&errbase,&majver,&minver);
+  eassert(r==True);
+
+  r= XRaiseWindow(disp, id);  eassert(r);
+
+  r= XGetWindowAttributes(disp, id, &attr);  eassert(r);
+  r= XGetGeometry(disp,id, &attr.root,&xpos,&ypos,&width,&height, &bd,&depth);
+  eassert(r);
+
+  r= XTranslateCoordinates(disp, id,attr.root, 160,160, &xpos,&ypos,
+                          &dummy);
+  eassert(r);
+
+  int screen= XScreenNumberOfScreen(attr.screen);
+  XTestFakeMotionEvent(disp,screen, xpos, ypos, 0);
+
+  XTestFakeButtonEvent(disp,1,1, 50);
+  XTestFakeButtonEvent(disp,1,0, 50);
+
+  sync_after_input();
+  fprintf(stderr,"PAGING raise_and_set_focus done.\n");
+}
+
+
+
 static void read_pages(void) {
   Snapshot *current=0, *last=0;
 
 static void read_pages(void) {
   Snapshot *current=0, *last=0;
 
@@ -259,7 +242,6 @@ static void read_pages(void) {
     fprintf(stderr,"PAGING page %d\n",npages);
     //eassert(npages < MAX_PAGES);
     //page_images[npages++]=
     fprintf(stderr,"PAGING page %d\n",npages);
     //eassert(npages < MAX_PAGES);
     //page_images[npages++]=
-    npages++;
 
     wait_for_stability(&current,last, 0);
     if (npages &&  /* first pagedown doesn't do much */
 
     wait_for_stability(&current,last, 0);
     if (npages &&  /* first pagedown doesn't do much */
@@ -271,6 +253,7 @@ static void read_pages(void) {
     free(last); last=current; current=0;
 
     send_pgdown();
     free(last); last=current; current=0;
 
     send_pgdown();
+    npages++;
   }
   fprintf(stderr,"PAGING all done.\n");
 }    
   }
   fprintf(stderr,"PAGING all done.\n");
 }