X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-test.git;a=blobdiff_plain;f=pctb%2Fpages.c;h=58cb306b436f9c3d76937396e763e81fd50aa07f;hp=dfa9108537bbf7b5a9c19d507a443f6caa13851c;hb=0584d4dc42b7f9e75878b5281dde05f35e2f4365;hpb=b4e128efc860c4416fe913abe97b190404e866dd diff --git a/pctb/pages.c b/pctb/pages.c index dfa9108..58cb306 100644 --- a/pctb/pages.c +++ b/pctb/pages.c @@ -37,6 +37,10 @@ #include #include +#include +#include +#include + CanonImage *page_images[MAX_PAGES]; int npages; RgbImage *page0_rgbimage; @@ -50,6 +54,9 @@ static struct timeval tv_startup; static unsigned wwidth, wheight; static int max_relevant_y= -1; +static XImage *shmim; +static XShmSegmentInfo shminfo; + DEBUG_DEFINE_DEBUGF(pages) #define xassert(what) \ @@ -70,7 +77,7 @@ void screenshot_startup(void) { /*---------- pager ----------*/ -typedef XImage Snapshot; +typedef RgbImage Snapshot; static double last_input; static const double min_update_allowance= 0.25; @@ -193,36 +200,109 @@ static void send_pgdown_torestore(void) { } static void free_snapshot(Snapshot **io) { - if (*io) XDestroyImage(*io); + free(*io); *io= 0; } +#define SAMPLEMASK 0xfful + +typedef struct { + int lshift, rshift; +} ShMask; + +static void compute_shift_mask(ShMask *sm, unsigned long ximage_mask) { + sm->lshift= 0; + sm->rshift= 0; + + for (;;) { + if (ximage_mask <= (SAMPLEMASK>>1)) { + sm->lshift++; ximage_mask <<= 1; + } else if (ximage_mask > SAMPLEMASK) { + sm->rshift++; ximage_mask >>= 1; + } else { + break; + } + assert(!(sm->lshift && sm->rshift)); + } + assert(sm->lshift < LONG_BIT); + assert(sm->rshift < LONG_BIT); +} + +static void rtimestamp(double *t, const char *wh) { + double n= timestamp(); + debugf("PAGING INTERVAL %f %s\n", n-*t, wh); + *t= n; +} + static void snapshot(Snapshot **output) { - free_snapshot(output); + XImage *im_use, *im_free=0; + + ShMask shiftmasks[3]; debugf("PAGING snapshot\n"); - timestamp(); - *output= XGetImage(disp,id, 0,0, wwidth,wheight, AllPlanes, ZPixmap); - timestamp(); + double begin= timestamp(); + if (shmim) { + xassert( XShmGetImage(disp,id,shmim, 0,0, AllPlanes) ); + rtimestamp(&begin, "XShmGetImage"); + + size_t dsz= shmim->bytes_per_line * shmim->height; + im_use= im_free= mmalloc(sizeof(*im_use) + dsz); + *im_free= *shmim; + im_free->data= (void*)(im_free+1); + memcpy(im_free->data, shmim->data, dsz); + rtimestamp(&begin, "mmalloc/memcpy"); + } else { + xassert( im_use= im_free= + XGetImage(disp,id, 0,0, wwidth,wheight, AllPlanes, ZPixmap) ); + rtimestamp(&begin, "XGetImage"); + } + +#define COMPUTE_SHIFT_MASK(ix, rgb) \ + compute_shift_mask(&shiftmasks[ix], im_use->rgb##_mask) + COMPUTE_SHIFT_MASK(0, red); + COMPUTE_SHIFT_MASK(1, green); + COMPUTE_SHIFT_MASK(2, blue); + + if (!*output) + *output= alloc_rgb_image(wwidth, wheight); + + rtimestamp(&begin, "compute_shift_masks+alloc_rgb_image"); + + int x,y,i; + unsigned char *op= (*output)->data; + for (y=0; y> shiftmasks[i].rshift) + & SAMPLEMASK; + *op++= sample; + } + } + } + rtimestamp(&begin,"w*h*XGetPixel"); + if (im_free) + XDestroyImage(im_free); + + rtimestamp(&begin,"XDestroyImage"); check_not_disturbed(); debugf("PAGING snapshot done.\n"); } static int identical(const Snapshot *a, const Snapshot *b) { - if (!(a->width == b->width && - a->height == b->height && - a->bytes_per_line == b->bytes_per_line && - a->format == b->format)) + if (!(a->w == b->w && + a->h == b->h)) return 0; - int compare_to= a->height; + int compare_to= a->h; if (max_relevant_y && compare_to > max_relevant_y) compare_to= max_relevant_y; - return !memcmp(a->data, b->data, a->bytes_per_line * compare_to); + return !memcmp(a->data, b->data, a->w * 3 * compare_to); } static void wait_for_stability(Snapshot **output, @@ -321,6 +401,56 @@ static void raise_and_get_details(void) { fatal("YPP client window is implausibly small?"); check_client_window_all_on_screen(); + + int shm= XShmQueryExtension(disp); + shm=0; + if (shm) { + xassert( shmim= XShmCreateImage(disp, attr.visual, attr.depth, ZPixmap, + 0,&shminfo, wwidth,wheight) ); + + sigset_t oldset, all; + sigfillset(&all); + sysassert(! sigprocmask(SIG_BLOCK,&all,&oldset) ); + + int pfd[2]; + pid_t cleaner; + sysassert(! pipe(pfd) ); + sysassert( (cleaner= fork()) != -1 ); + if (!cleaner) { + sysassert(! close(pfd[1]) ); + for (;;) { + int r= read(pfd[0], &shminfo.shmid, sizeof(shminfo.shmid)); + if (!r) exit(0); + if (r==sizeof(shminfo.shmid)) break; + assert(r==-1 && errno==EINTR); + } + for (;;) { + char bc; + int r= read(pfd[0],&bc,1); + if (r>=0) break; + assert(r==-1 && errno==EINTR); + } + sysassert(! shmctl(shminfo.shmid,IPC_RMID,0) ); + exit(0); + } + sysassert(! close(pfd[0]) ); + + sysassert(! sigprocmask(SIG_SETMASK,&oldset,0) ); + + assert(shmim->height == wheight); + sysassert( (shminfo.shmid= + shmget(IPC_PRIVATE, shmim->bytes_per_line * wheight, + IPC_CREAT|0600)) >= 0 ); + + sysassert( write(pfd[1],&shminfo.shmid,sizeof(shminfo.shmid)) == + sizeof(shminfo.shmid) ); + sysassert( shminfo.shmaddr= shmat(shminfo.shmid,0,0) ); + shmim->data= shminfo.shmaddr; + shminfo.readOnly= False; + xassert( XShmAttach(disp,&shminfo) ); + + close(pfd[1]); /* causes IPC_RMID */ + } } static void set_focus_commodity(void) { @@ -349,54 +479,20 @@ static void set_focus_commodity(void) { debugf("PAGING raise_and_set_focus done.\n"); } -#define SAMPLEMASK 0xfful - -typedef struct { - int lshift, rshift; -} ShMask; - -static void compute_shift_mask(ShMask *sm, unsigned long ximage_mask) { - sm->lshift= 0; - sm->rshift= 0; - - for (;;) { - if (ximage_mask <= (SAMPLEMASK>>1)) { - sm->lshift++; ximage_mask <<= 1; - } else if (ximage_mask > SAMPLEMASK) { - sm->rshift++; ximage_mask >>= 1; - } else { - break; - } - assert(!(sm->lshift && sm->rshift)); - } - assert(sm->lshift < LONG_BIT); - assert(sm->rshift < LONG_BIT); -} - static CanonImage *convert_page(Snapshot *sn, RgbImage *ri) { - ShMask shiftmasks[3]; CanonImage *im; fprintf(screenshot_file, "P6\n" "%d %d\n" - "255\n", sn->width, sn->height); - -#define COMPUTE_SHIFT_MASK(ix, rgb) \ - compute_shift_mask(&shiftmasks[ix], sn->rgb##_mask) - COMPUTE_SHIFT_MASK(0, red); - COMPUTE_SHIFT_MASK(1, green); - COMPUTE_SHIFT_MASK(2, blue); + "255\n", sn->w, sn->h); - CANONICALISE_IMAGE(im, sn->width, sn->height, { - long xrgb= XGetPixel(sn, x, y); + CANONICALISE_IMAGE(im, sn->w, sn->h, { int i; rgb= 0; for (i=0; i<3; i++) { rgb <<= 8; - unsigned long sample= - ((xrgb << shiftmasks[i].lshift) - >> shiftmasks[i].rshift) & SAMPLEMASK; + unsigned long sample= RI_PIXEL(sn,x,y)[i]; rgb |= sample; fputc(sample, screenshot_file); } @@ -417,6 +513,22 @@ static void prepare_ypp_client(void) { /* find the window and check it's on the right kind of screen */ raise_and_get_details(); wait_for_stability(¤t,0,0, "checking current YPP client screen..."); + +#if 1 +timestamp(); +snapshot(¤t); +snapshot(¤t); +snapshot(¤t); +snapshot(¤t); +snapshot(¤t); +snapshot(¤t); +snapshot(¤t); +snapshot(¤t); +snapshot(¤t); +snapshot(¤t); +timestamp(); +#endif + test= convert_page(current, 0); find_structure(test, &max_relevant_y); check_correct_commodities(); @@ -483,7 +595,7 @@ void take_one_screenshot(void) { prepare_ypp_client(); wait_for_stability(¤t,0,0, "taking screenshot..."); - page0_rgbimage= alloc_rgb_image(current->width, current->height); + page0_rgbimage= alloc_rgb_image(current->w, current->h); page_images[0]= convert_page(current, 0); npages= 1; progress_log("collected single screenshot.");