138831 2014-11-18 04:19:48 -0800 [GTK] Use GMainLoopSource in WebKitTestRunner 2014-12-16 01:48:21 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED Gtk P2 Normal --- 139124 1 cgarcia webkit-unassigned ap clopez commit-queue gustavo pnormand svillar oldest_to_newest 1049453 0 cgarcia 2014-11-18 04:19:48 -0800 Instead of g_timeout_add(). 1049454 1 241782 cgarcia 2014-11-18 04:21:54 -0800 Created attachment 241782 Patch 1051215 2 241782 svillar 2014-11-28 00:38:54 -0800 Comment on attachment 241782 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=241782&action=review > Tools/WebKitTestRunner/gtk/TestControllerGtk.cpp:70 > + }, std::chrono::duration_cast<std::chrono::microseconds>(std::chrono::duration<double>(timeout))); I think you forgot to remove the timeoutCallback static function now that you have the lambda. 1051261 3 cgarcia 2014-11-28 08:37:56 -0800 (In reply to comment #2) > Comment on attachment 241782 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=241782&action=review > > > Tools/WebKitTestRunner/gtk/TestControllerGtk.cpp:70 > > + }, std::chrono::duration_cast<std::chrono::microseconds>(std::chrono::duration<double>(timeout))); > > I think you forgot to remove the timeoutCallback static function now that > you have the lambda. Right! 1051262 4 cgarcia 2014-11-28 08:39:28 -0800 Committed r176566: <http://trac.webkit.org/changeset/176566> 1051418 5 clopez 2014-12-01 05:33:19 -0800 (In reply to comment #4) > Committed r176566: <http://trac.webkit.org/changeset/176566> This broke the performance bot. Reported here: https://bugs.webkit.org/show_bug.cgi?id=139122 1051424 6 commit-queue 2014-12-01 06:33:40 -0800 Re-opened since this is blocked by bug 139124 1051433 7 clopez 2014-12-01 06:51:37 -0800 I reverted r176566 on r176591 <https://trac.webkit.org/r176591> after talking with Carlos Garcia. 1053129 8 cgarcia 2014-12-07 06:06:19 -0800 (In reply to comment #7) > I reverted r176566 on r176591 <https://trac.webkit.org/r176591> after > talking with Carlos Garcia. Ok, I forgot to handle the case of no-timeout :-P. I'll land a right version. 1053130 9 cgarcia 2014-12-07 06:07:43 -0800 Committed r176921: <http://trac.webkit.org/changeset/176921> 1055711 10 241782 ap 2014-12-15 12:55:10 -0800 Comment on attachment 241782 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=241782&action=review > Tools/WebKitTestRunner/InjectedBundle/gtk/TestRunnerGtk.cpp:52 > + m_waitToDumpWatchdogTimer.scheduleAfterDelay("[WTR] waitToDumpWatchdogTimerCallback", [this] { waitToDumpWatchdogTimerFired(); }, > + std::chrono::duration_cast<std::chrono::microseconds>(std::chrono::duration<double>(waitToDumpWatchdogTimerInterval))); waitToDumpWatchdogTimerInterval is 30, for 30 seconds. Is the cast to microseconds the right one here? > Tools/WebKitTestRunner/gtk/TestControllerGtk.cpp:71 > gtk_main(); Ditto, why microseconds? 1055954 11 cgarcia 2014-12-16 01:48:21 -0800 (In reply to comment #10) > Comment on attachment 241782 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=241782&action=review > > > Tools/WebKitTestRunner/InjectedBundle/gtk/TestRunnerGtk.cpp:52 > > + m_waitToDumpWatchdogTimer.scheduleAfterDelay("[WTR] waitToDumpWatchdogTimerCallback", [this] { waitToDumpWatchdogTimerFired(); }, > > + std::chrono::duration_cast<std::chrono::microseconds>(std::chrono::duration<double>(waitToDumpWatchdogTimerInterval))); > > waitToDumpWatchdogTimerInterval is 30, for 30 seconds. Is the cast to > microseconds the right one here? Yes, the scheduleAfterDelay() version that receives the delay in microseconds creates a glib source using microseconds. For this particular case we could use milliseconds, but we moved all sources using a double value to microseconds to avoid truncations (we had cases in which timers were scheduled immediately because the conversion to milliseconds was 0, see bug #137782). > > Tools/WebKitTestRunner/gtk/TestControllerGtk.cpp:71 > > gtk_main(); > > Ditto, why microseconds? 241782 2014-11-18 04:21:54 -0800 2014-11-28 00:38:54 -0800 Patch wtr-main-loop-source.diff text/plain 4732 cgarcia ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCA4ZDY5 OGFkLi44MjA1MDNjIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTQtMTEtMTggIENhcmxvcyBHYXJjaWEgQ2FtcG9z ICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgorCisgICAgICAgIFtHVEtdIFVzZSBHTWFpbkxvb3BTb3Vy Y2UgaW4gV2ViS2l0VGVzdFJ1bm5lcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTM4ODMxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgKiBXZWJLaXRUZXN0UnVubmVyL0luamVjdGVkQnVuZGxlL1Rlc3RSdW5u ZXIuaDoKKyAgICAgICAgKiBXZWJLaXRUZXN0UnVubmVyL0luamVjdGVkQnVuZGxlL2d0ay9UZXN0 UnVubmVyR3RrLmNwcDoKKyAgICAgICAgKFdUUjo6VGVzdFJ1bm5lcjo6cGxhdGZvcm1Jbml0aWFs aXplKToKKyAgICAgICAgKFdUUjo6VGVzdFJ1bm5lcjo6aW52YWxpZGF0ZVdhaXRUb0R1bXBXYXRj aGRvZ1RpbWVyKToKKyAgICAgICAgKFdUUjo6VGVzdFJ1bm5lcjo6aW5pdGlhbGl6ZVdhaXRUb0R1 bXBXYXRjaGRvZ1RpbWVySWZOZWVkZWQpOgorICAgICAgICAoV1RSOjp3YWl0VG9EdW1wV2F0Y2hk b2dUaW1lckNhbGxiYWNrKTogRGVsZXRlZC4KKyAgICAgICAgKiBXZWJLaXRUZXN0UnVubmVyL2d0 ay9UZXN0Q29udHJvbGxlckd0ay5jcHA6CisgICAgICAgIChXVFI6OlRlc3RDb250cm9sbGVyOjpu b3RpZnlEb25lKToKKyAgICAgICAgKFdUUjo6VGVzdENvbnRyb2xsZXI6OnBsYXRmb3JtUnVuVW50 aWwpOgorICAgICAgICAoV1RSOjpjYW5jZWxUaW1lb3V0KTogRGVsZXRlZC4KKwogMjAxNC0xMS0x MyAgRGFuIEJlcm5zdGVpbiAgPG1pdHpAYXBwbGUuY29tPgogCiAgICAgICAgIFBvbGljeSBjbGll bnQgbm90IGNhbGxlZCBmb3IgbmF2aWdhdGlvbnMgdGhyb3VnaCB0aGUgcGFnZSBjYWNoZQpkaWZm IC0tZ2l0IGEvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9JbmplY3RlZEJ1bmRsZS9UZXN0UnVubmVy LmggYi9Ub29scy9XZWJLaXRUZXN0UnVubmVyL0luamVjdGVkQnVuZGxlL1Rlc3RSdW5uZXIuaApp bmRleCBlMjFmZmYzLi41ZDIzMmRkIDEwMDY0NAotLS0gYS9Ub29scy9XZWJLaXRUZXN0UnVubmVy L0luamVjdGVkQnVuZGxlL1Rlc3RSdW5uZXIuaAorKysgYi9Ub29scy9XZWJLaXRUZXN0UnVubmVy L0luamVjdGVkQnVuZGxlL1Rlc3RSdW5uZXIuaApAQCAtMzgsNyArMzgsOCBAQAogI2luY2x1ZGUg PENvcmVGb3VuZGF0aW9uL0NGUnVuTG9vcC5oPgogdHlwZWRlZiBSZXRhaW5QdHI8Q0ZSdW5Mb29w VGltZXJSZWY+IFBsYXRmb3JtVGltZXJSZWY7CiAjZWxpZiBQTEFURk9STShHVEspCi10eXBlZGVm IHVuc2lnbmVkIGludCBQbGF0Zm9ybVRpbWVyUmVmOworI2luY2x1ZGUgPHd0Zi9nb2JqZWN0L0dN YWluTG9vcFNvdXJjZS5oPgordHlwZWRlZiBHTWFpbkxvb3BTb3VyY2UgUGxhdGZvcm1UaW1lclJl ZjsKICNlbGlmIFBMQVRGT1JNKEVGTCkKIHR5cGVkZWYgRWNvcmVfVGltZXIqIFBsYXRmb3JtVGlt ZXJSZWY7CiAjZW5kaWYKZGlmZiAtLWdpdCBhL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvSW5qZWN0 ZWRCdW5kbGUvZ3RrL1Rlc3RSdW5uZXJHdGsuY3BwIGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9J bmplY3RlZEJ1bmRsZS9ndGsvVGVzdFJ1bm5lckd0ay5jcHAKaW5kZXggMjU0Mzc0OC4uODUwZTcz NyAxMDA2NDQKLS0tIGEvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9JbmplY3RlZEJ1bmRsZS9ndGsv VGVzdFJ1bm5lckd0ay5jcHAKKysrIGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9JbmplY3RlZEJ1 bmRsZS9ndGsvVGVzdFJ1bm5lckd0ay5jcHAKQEAgLTM0LDMzICszNCwyMiBAQAogCiBuYW1lc3Bh Y2UgV1RSIHsKIAotc3RhdGljIGdib29sZWFuIHdhaXRUb0R1bXBXYXRjaGRvZ1RpbWVyQ2FsbGJh Y2soZ3BvaW50ZXIpCi17Ci0gICAgSW5qZWN0ZWRCdW5kbGU6OnNoYXJlZCgpLnRlc3RSdW5uZXIo KS0+d2FpdFRvRHVtcFdhdGNoZG9nVGltZXJGaXJlZCgpOwotICAgIHJldHVybiBGQUxTRTsKLX0K LQogdm9pZCBUZXN0UnVubmVyOjpwbGF0Zm9ybUluaXRpYWxpemUoKQogewotICAgIG1fd2FpdFRv RHVtcFdhdGNoZG9nVGltZXIgPSAwOwogfQogCiB2b2lkIFRlc3RSdW5uZXI6OmludmFsaWRhdGVX YWl0VG9EdW1wV2F0Y2hkb2dUaW1lcigpCiB7Ci0gICAgaWYgKCFtX3dhaXRUb0R1bXBXYXRjaGRv Z1RpbWVyKQotICAgICAgICByZXR1cm47Ci0gICAgZ19zb3VyY2VfcmVtb3ZlKG1fd2FpdFRvRHVt cFdhdGNoZG9nVGltZXIpOwotICAgIG1fd2FpdFRvRHVtcFdhdGNoZG9nVGltZXIgPSAwOworICAg IG1fd2FpdFRvRHVtcFdhdGNoZG9nVGltZXIuY2FuY2VsKCk7CiB9CiAKIHZvaWQgVGVzdFJ1bm5l cjo6aW5pdGlhbGl6ZVdhaXRUb0R1bXBXYXRjaGRvZ1RpbWVySWZOZWVkZWQoKQogewotICAgIGlm IChtX3dhaXRUb0R1bXBXYXRjaGRvZ1RpbWVyKQorICAgIGlmIChtX3dhaXRUb0R1bXBXYXRjaGRv Z1RpbWVyLmlzU2NoZWR1bGVkKCkpCiAgICAgICAgIHJldHVybjsKIAotICAgIG1fd2FpdFRvRHVt cFdhdGNoZG9nVGltZXIgPSBnX3RpbWVvdXRfYWRkKHdhaXRUb0R1bXBXYXRjaGRvZ1RpbWVySW50 ZXJ2YWwgKiAxMDAwLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIHdhaXRUb0R1bXBXYXRjaGRvZ1RpbWVyQ2FsbGJhY2ssIDApOwotICAgIGdfc291cmNlX3Nl dF9uYW1lX2J5X2lkKG1fd2FpdFRvRHVtcFdhdGNoZG9nVGltZXIsICJbV2ViS2l0XSB3YWl0VG9E dW1wV2F0Y2hkb2dUaW1lckNhbGxiYWNrIik7CisgICAgbV93YWl0VG9EdW1wV2F0Y2hkb2dUaW1l ci5zY2hlZHVsZUFmdGVyRGVsYXkoIltXVFJdIHdhaXRUb0R1bXBXYXRjaGRvZ1RpbWVyQ2FsbGJh Y2siLCBbdGhpc10geyB3YWl0VG9EdW1wV2F0Y2hkb2dUaW1lckZpcmVkKCk7IH0sCisgICAgICAg IHN0ZDo6Y2hyb25vOjpkdXJhdGlvbl9jYXN0PHN0ZDo6Y2hyb25vOjptaWNyb3NlY29uZHM+KHN0 ZDo6Y2hyb25vOjpkdXJhdGlvbjxkb3VibGU+KHdhaXRUb0R1bXBXYXRjaGRvZ1RpbWVySW50ZXJ2 YWwpKSk7CiB9CiAKIEpTUmV0YWluUHRyPEpTU3RyaW5nUmVmPiBUZXN0UnVubmVyOjpwYXRoVG9M b2NhbFJlc291cmNlKEpTU3RyaW5nUmVmIHVybCkKZGlmZiAtLWdpdCBhL1Rvb2xzL1dlYktpdFRl c3RSdW5uZXIvZ3RrL1Rlc3RDb250cm9sbGVyR3RrLmNwcCBiL1Rvb2xzL1dlYktpdFRlc3RSdW5u ZXIvZ3RrL1Rlc3RDb250cm9sbGVyR3RrLmNwcAppbmRleCBlNWNiNzFlLi4zZTM3NWZjIDEwMDY0 NAotLS0gYS9Ub29scy9XZWJLaXRUZXN0UnVubmVyL2d0ay9UZXN0Q29udHJvbGxlckd0ay5jcHAK KysrIGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9ndGsvVGVzdENvbnRyb2xsZXJHdGsuY3BwCkBA IC0yOSwyNSArMjksMTggQEAKIAogI2luY2x1ZGUgPGd0ay9ndGsuaD4KICNpbmNsdWRlIDx3dGYv UGxhdGZvcm0uaD4KKyNpbmNsdWRlIDx3dGYvZ29iamVjdC9HTWFpbkxvb3BTb3VyY2UuaD4KICNp bmNsdWRlIDx3dGYvZ29iamVjdC9HVW5pcXVlUHRyLmg+CiAjaW5jbHVkZSA8d3RmL3RleHQvV1RG U3RyaW5nLmg+CiAKIG5hbWVzcGFjZSBXVFIgewogCi1zdGF0aWMgZ3VpbnQgZ1RpbWVvdXRTb3Vy Y2VJZCA9IDA7Ci0KLXN0YXRpYyB2b2lkIGNhbmNlbFRpbWVvdXQoKQotewotICAgIGlmICghZ1Rp bWVvdXRTb3VyY2VJZCkKLSAgICAgICAgcmV0dXJuOwotICAgIGdfc291cmNlX3JlbW92ZShnVGlt ZW91dFNvdXJjZUlkKTsKLSAgICBnVGltZW91dFNvdXJjZUlkID0gMDsKLX0KK3N0YXRpYyBHTWFp bkxvb3BTb3VyY2UgdGltZW91dFNvdXJjZTsKIAogdm9pZCBUZXN0Q29udHJvbGxlcjo6bm90aWZ5 RG9uZSgpCiB7CiAgICAgZ3RrX21haW5fcXVpdCgpOwotICAgIGNhbmNlbFRpbWVvdXQoKTsKKyAg ICB0aW1lb3V0U291cmNlLmNhbmNlbCgpOwogfQogCiB2b2lkIFRlc3RDb250cm9sbGVyOjpwbGF0 Zm9ybUluaXRpYWxpemUoKQpAQCAtNzEsMTEgKzY0LDEwIEBAIHZvaWQgVGVzdENvbnRyb2xsZXI6 OnBsYXRmb3JtV2lsbFJ1blRlc3QoY29uc3QgVGVzdEludm9jYXRpb24mKQogCiB2b2lkIFRlc3RD b250cm9sbGVyOjpwbGF0Zm9ybVJ1blVudGlsKGJvb2wmLCBkb3VibGUgdGltZW91dCkKIHsKLSAg ICBjYW5jZWxUaW1lb3V0KCk7Ci0gICAgaWYgKHRpbWVvdXQgIT0gbV9ub1RpbWVvdXQpIHsKLSAg ICAgICAgZ1RpbWVvdXRTb3VyY2VJZCA9IGdfdGltZW91dF9hZGQodGltZW91dCAqIDEwMDAsIHRp bWVvdXRDYWxsYmFjaywgMCk7Ci0gICAgICAgIGdfc291cmNlX3NldF9uYW1lX2J5X2lkKGdUaW1l b3V0U291cmNlSWQsICJbV2ViS2l0XSB0aW1lb3V0Q2FsbGJhY2siKTsKLSAgICB9CisgICAgdGlt ZW91dFNvdXJjZS5zY2hlZHVsZUFmdGVyRGVsYXkoIltXVFJdIFRlc3QgdGltZW91dCBzb3VyY2Ui LCBbXSB7CisgICAgICAgIGZwcmludGYoc3RkZXJyLCAiRkFJTDogVGVzdENvbnRyb2xsZXJSdW5M b29wIHRpbWVkIG91dC5cbiIpOworICAgICAgICBndGtfbWFpbl9xdWl0KCk7CisgICAgfSwgc3Rk OjpjaHJvbm86OmR1cmF0aW9uX2Nhc3Q8c3RkOjpjaHJvbm86Om1pY3Jvc2Vjb25kcz4oc3RkOjpj aHJvbm86OmR1cmF0aW9uPGRvdWJsZT4odGltZW91dCkpKTsKICAgICBndGtfbWFpbigpOwogfQog Cg==