chiark
/
gitweb
/
~yarrgweb
/
ypp-sc-tools.web-live.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
show time taken by XGetImage, too
[ypp-sc-tools.web-live.git]
/
pctb
/
pages.c
diff --git
a/pctb/pages.c
b/pctb/pages.c
index 80f176ad567da72d6e87e6bda2b3aaba0ac0a714..0a175ee56054b461121e3ee5ef5bc52aa6744a02 100644
(file)
--- a/
pctb/pages.c
+++ b/
pctb/pages.c
@@
-243,6
+243,7
@@
static void snapshot(Snapshot **output) {
double begin= timestamp();
if (shmim) {
double begin= timestamp();
if (shmim) {
+ rtimestamp(&begin, "XShmGetImage before");
xassert( XShmGetImage(disp,id,shmim, 0,0, AllPlanes) );
rtimestamp(&begin, "XShmGetImage");
xassert( XShmGetImage(disp,id,shmim, 0,0, AllPlanes) );
rtimestamp(&begin, "XShmGetImage");
@@
-253,6
+254,7
@@
static void snapshot(Snapshot **output) {
memcpy(im_free->data, shmim->data, dsz);
rtimestamp(&begin, "mmalloc/memcpy");
} else {
memcpy(im_free->data, shmim->data, dsz);
rtimestamp(&begin, "mmalloc/memcpy");
} else {
+ rtimestamp(&begin, "XGetImage before");
xassert( im_use= im_free=
XGetImage(disp,id, 0,0, wwidth,wheight, AllPlanes, ZPixmap) );
rtimestamp(&begin, "XGetImage");
xassert( im_use= im_free=
XGetImage(disp,id, 0,0, wwidth,wheight, AllPlanes, ZPixmap) );
rtimestamp(&begin, "XGetImage");
@@
-402,7
+404,7
@@
static void raise_and_get_details(void) {
check_client_window_all_on_screen();
int shm= XShmQueryExtension(disp);
check_client_window_all_on_screen();
int shm= XShmQueryExtension(disp);
-
shm=0
;
+
debugf("PAGING shm=%d\n",shm)
;
if (shm) {
xassert( shmim= XShmCreateImage(disp, attr.visual, attr.depth, ZPixmap,
0,&shminfo, wwidth,wheight) );
if (shm) {
xassert( shmim= XShmCreateImage(disp, attr.visual, attr.depth, ZPixmap,
0,&shminfo, wwidth,wheight) );
@@
-513,28
+515,18
@@
static void prepare_ypp_client(void) {
raise_and_get_details();
wait_for_stability(¤t,0,0, "checking current YPP client screen...");
raise_and_get_details();
wait_for_stability(¤t,0,0, "checking current YPP client screen...");
-#if 0
-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();
test= convert_page(current, 0);
find_structure(test, &max_relevant_y);
check_correct_commodities();
+ Rect sunshine= find_sunshine_widget();
+
+ progress("poking client...");
+ mouse_1_updown((sunshine.tl.x + sunshine.br.x) / 2,
+ (sunshine.tl.y*9 + sunshine.br.y) / 10);
+
free(test);
free(test);
- free_snapshot(¤t);
-
progress("requesting status informatio
n...");
+
wait_for_stability(¤t,0,0, "checking basic YPP client scree
n...");
mouse_1_updown(250, wheight-10);
mouse_1_updown_here();
mouse_1_updown_here();
mouse_1_updown(250, wheight-10);
mouse_1_updown_here();
mouse_1_updown_here();
@@
-544,7
+536,11
@@
timestamp();
send_key(XK_w);
send_key(XK_Return);
sync_after_input();
send_key(XK_w);
send_key(XK_Return);
sync_after_input();
- sysassert(! usleep(1000000) );
+
+ Snapshot *status=0;
+ wait_for_stability(&status,current,0, "awaiting status information...");
+ free_snapshot(¤t);
+ free_snapshot(&status);
}
void take_screenshots(void) {
}
void take_screenshots(void) {