109765 2013-02-13 16:13:05 -0800 Reschedule shared CFRunLoopTimer instead of reconstructing it 2013-03-01 10:39:55 -0800 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) Unspecified Unspecified REOPENED P2 Normal --- 109856 110128 1 koivisto webkit-unassigned darin kling rniwa webkit.review.bot oldest_to_newest 832469 0 koivisto 2013-02-13 16:13:05 -0800 It is much faster to reschedule with CFRunLoopTimerSetNextFireDate than to repeatedly delete and create timers. 832481 1 188213 koivisto 2013-02-13 16:20:08 -0800 Created attachment 188213 patch 832508 2 188213 kling 2013-02-13 16:38:21 -0800 Comment on attachment 188213 patch View in context: https://bugs.webkit.org/attachment.cgi?id=188213&action=review Hilarious! r+ from me since this looks like correct use of the API to me, though you might wanna double-check with someone with more CF knowledge. > Source/WebCore/platform/mac/SharedTimerMac.mm:154 > + static CFRunLoopTimerRef timer; > + if (!timer) { You could use dispatch_once() for this block. 832556 3 koivisto 2013-02-13 17:05:52 -0800 http://trac.webkit.org/changeset/142825 833164 4 darin 2013-02-14 09:45:33 -0800 When I first implemented SharedTimer I tried using CFRunLoopTimerSetNextFireDate and it didn’t work. Maybe I did it wrong. Or maybe there were CF bugs that have since been fixed. Someone should be sure to test this on the oldest OS X and iOS versions that WebKit currently supports in case that old bug is not fixed there. 833332 5 koivisto 2013-02-14 12:48:40 -0800 (In reply to comment #4) > When I first implemented SharedTimer I tried using CFRunLoopTimerSetNextFireDate and it didn’t work. Maybe I did it wrong. Or maybe there were CF bugs that have since been fixed. Someone should be sure to test this on the oldest OS X and iOS versions that WebKit currently supports in case that old bug is not fixed there. JSC already uses CFRunLoopTimerSetNextFireDate for HeapTimer. 833355 6 webkit.review.bot 2013-02-14 13:29:03 -0800 Re-opened since this is blocked by bug 109856 833358 7 koivisto 2013-02-14 13:31:33 -0800 This caused failures in some inspector debugger tests http://build.webkit.org/results/Apple%20MountainLion%20Release%20WK2%20(Tests)/r142826%20(5930)/results.html: 833361 8 koivisto 2013-02-14 13:33:00 -0800 Maybe nested event loops are causing problems or something? 834746 9 188716 koivisto 2013-02-16 09:54:18 -0800 Created attachment 188716 patch2 try to fix the inspector debugger 834927 10 188716 kling 2013-02-16 21:28:56 -0800 Comment on attachment 188716 patch2 View in context: https://bugs.webkit.org/attachment.cgi?id=188716&action=review > Source/WebCore/platform/mac/SharedTimerMac.mm:177 > +void reinsertSharedTimer() > +{ > + // For some reason the timer won't fire in a nested runloop unless it has been freshly inserted. > + CFRunLoopTimerInvalidate(globalSharedTimer); > + CFRelease(globalSharedTimer); > + globalSharedTimer = 0; > +} This function's name seems to be at odds with its contents. Where does the timer actually get re-inserted? 835002 11 koivisto 2013-02-17 10:39:33 -0800 (In reply to comment #10) > This function's name seems to be at odds with its contents. > Where does the timer actually get re-inserted? From sharedTimer(), next time the timer is accessed. This will happen from ThreadTimers::fireTimersInNestedEventLoop() right after this call. Suggestions welcome. 835041 12 188716 kling 2013-02-17 14:25:52 -0800 Comment on attachment 188716 patch2 View in context: https://bugs.webkit.org/attachment.cgi?id=188716&action=review r=me if you find a nicer color for the bikeshed. > Source/WebCore/platform/mac/SharedTimerMac.mm:171 > +void reinsertSharedTimer() I'd just prefer to call this removeFoo() instead of reinsertBar() since that's what it does. 835433 13 koivisto 2013-02-18 06:30:37 -0800 http://trac.webkit.org/changeset/143210 835533 14 webkit.review.bot 2013-02-18 09:00:53 -0800 Re-opened since this is blocked by bug 110128 835537 15 koivisto 2013-02-18 09:05:04 -0800 The bots still see some nested runloop related failures. 845297 16 188213 eric 2013-03-01 10:39:55 -0800 Comment on attachment 188213 patch Cleared Andreas Kling's review+ from obsolete attachment 188213 so that this bug does not appear in http://webkit.org/pending-commit. 188213 2013-02-13 16:20:08 -0800 2013-03-01 10:39:55 -0800 patch timer-cf-reschedule.patch text/plain 3134 koivisto SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE0MjgyMCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBACisyMDEzLTAyLTEzICBBbnR0aSBL b2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBSZXNjaGVkdWxlIHNoYXJlZCBD RlJ1bkxvb3BUaW1lciBpbnN0ZWFkIG9mIHJlY29uc3RydWN0aW5nIGl0CisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDk3NjUKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBVc2luZyBDRlJ1bkxvb3BUaW1lclNl dE5leHRGaXJlRGF0ZSBpcyBvdmVyIDJ4IGZhc3RlciB0aGFuIGRlbGV0aW5nIGFuZCByZWNvbnN0 cnVjdGluZyB0aW1lcnMuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9tYWMvU2hhcmVkVGltZXJNYWMu bW06CisgICAgICAgIChXZWJDb3JlKToKKyAgICAgICAgKFdlYkNvcmU6OlBvd2VyT2JzZXJ2ZXI6 OnJlc3RhcnRTaGFyZWRUaW1lcik6CisgICAgICAgIChXZWJDb3JlOjpzaGFyZWRUaW1lcik6Cisg ICAgICAgIChXZWJDb3JlOjpzZXRTaGFyZWRUaW1lckZpcmVJbnRlcnZhbCk6CisgICAgICAgIChX ZWJDb3JlOjpzdG9wU2hhcmVkVGltZXIpOgorCiAyMDEzLTAyLTEzICBFbGxpb3R0IFNwcmVobiAg PGVzcHJlaG5AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIEFTU0VSVCghcmVuZGVyZXIoKS0+bmVl ZHNMYXlvdXQoKSkgd2hlbiBjYWxsaW5nIEVsZW1lbnQ6OmZvY3VzKCkgd2l0aCBnZW5lcmF0ZWQg Y29udGVudApJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL1NoYXJlZFRpbWVyTWFj Lm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9TaGFyZWRUaW1l ck1hYy5tbQkocmV2aXNpb24gMTQyMjUwKQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFj L1NoYXJlZFRpbWVyTWFjLm1tCSh3b3JraW5nIGNvcHkpCkBAIC00Miw3ICs0Miw4IEBACiAKIG5h bWVzcGFjZSBXZWJDb3JlIHsKIAotc3RhdGljIENGUnVuTG9vcFRpbWVyUmVmIHNoYXJlZFRpbWVy Oworc3RhdGljIGNvbnN0IENGVGltZUludGVydmFsIGRpc3RhbnRGdXR1cmUgPSA2MCAqIDYwICog MjQgKiAzNjUgKiAxMDsgLy8gRGVjYWRlLgorCiBzdGF0aWMgdm9pZCAoKnNoYXJlZFRpbWVyRmly ZWRGdW5jdGlvbikoKTsKIHN0YXRpYyB2b2lkIHRpbWVyRmlyZWQoQ0ZSdW5Mb29wVGltZXJSZWYs IHZvaWQqKTsKIApAQCAtMTQzLDE0ICsxNDQsMjIgQEAgdm9pZCBQb3dlck9ic2VydmVyOjpyZXN0 YXJ0U2hhcmVkVGltZXIoKQogewogICAgIEFTU0VSVChDRlJ1bkxvb3BHZXRDdXJyZW50KCkgPT0g Q0ZSdW5Mb29wR2V0TWFpbigpKTsKIAotICAgIGlmICghc2hhcmVkVGltZXIpCi0gICAgICAgIHJl dHVybjsKLQogICAgIHN0b3BTaGFyZWRUaW1lcigpOwogICAgIHRpbWVyRmlyZWQoMCwgMCk7CiB9 CiAKLXN0YXRpYyBQb3dlck9ic2VydmVyKiBQb3dlck9ic2VydmVyOworc3RhdGljIENGUnVuTG9v cFRpbWVyUmVmIHNoYXJlZFRpbWVyKCkKK3sKKyAgICBzdGF0aWMgQ0ZSdW5Mb29wVGltZXJSZWYg dGltZXI7CisgICAgaWYgKCF0aW1lcikgeworICAgICAgICB0aW1lciA9IENGUnVuTG9vcFRpbWVy Q3JlYXRlKDAsIENGQWJzb2x1dGVUaW1lR2V0Q3VycmVudCgpICsgZGlzdGFudEZ1dHVyZSwgZGlz dGFudEZ1dHVyZSwgMCwgMCwgdGltZXJGaXJlZCwgMCk7CisgICAgICAgIENGUnVuTG9vcEFkZFRp bWVyKENGUnVuTG9vcEdldEN1cnJlbnQoKSwgdGltZXIsIGtDRlJ1bkxvb3BDb21tb25Nb2Rlcyk7 CisKKyAgICAgICAgc3RhdGljIFBvd2VyT2JzZXJ2ZXIqIHBvd2VyT2JzZXJ2ZXI7CisgICAgICAg IHBvd2VyT2JzZXJ2ZXIgPSBQb3dlck9ic2VydmVyOjpjcmVhdGUoKS5sZWFrUHRyKCk7CisgICAg fQorICAgIHJldHVybiB0aW1lcjsKK307CiAKIHZvaWQgc2V0U2hhcmVkVGltZXJGaXJlZEZ1bmN0 aW9uKHZvaWQgKCpmKSgpKQogewpAQCAtMTcwLDI3ICsxNzksMTMgQEAgc3RhdGljIHZvaWQgdGlt ZXJGaXJlZChDRlJ1bkxvb3BUaW1lclJlZgogdm9pZCBzZXRTaGFyZWRUaW1lckZpcmVJbnRlcnZh bChkb3VibGUgaW50ZXJ2YWwpCiB7CiAgICAgQVNTRVJUKHNoYXJlZFRpbWVyRmlyZWRGdW5jdGlv bik7Ci0KLSAgICBpZiAoc2hhcmVkVGltZXIpIHsKLSAgICAgICAgQ0ZSdW5Mb29wVGltZXJJbnZh bGlkYXRlKHNoYXJlZFRpbWVyKTsKLSAgICAgICAgQ0ZSZWxlYXNlKHNoYXJlZFRpbWVyKTsKLSAg ICB9Ci0KICAgICBDRkFic29sdXRlVGltZSBmaXJlRGF0ZSA9IENGQWJzb2x1dGVUaW1lR2V0Q3Vy cmVudCgpICsgaW50ZXJ2YWw7Ci0gICAgc2hhcmVkVGltZXIgPSBDRlJ1bkxvb3BUaW1lckNyZWF0 ZSgwLCBmaXJlRGF0ZSwgMCwgMCwgMCwgdGltZXJGaXJlZCwgMCk7Ci0gICAgQ0ZSdW5Mb29wQWRk VGltZXIoQ0ZSdW5Mb29wR2V0Q3VycmVudCgpLCBzaGFyZWRUaW1lciwga0NGUnVuTG9vcENvbW1v bk1vZGVzKTsKLSAgICAKLSAgICBpZiAoIVBvd2VyT2JzZXJ2ZXIpCi0gICAgICAgIFBvd2VyT2Jz ZXJ2ZXIgPSBQb3dlck9ic2VydmVyOjpjcmVhdGUoKS5sZWFrUHRyKCk7CisgICAgQ0ZSdW5Mb29w VGltZXJTZXROZXh0RmlyZURhdGUoc2hhcmVkVGltZXIoKSwgZmlyZURhdGUpOwogfQogCiB2b2lk IHN0b3BTaGFyZWRUaW1lcigpCiB7Ci0gICAgaWYgKHNoYXJlZFRpbWVyKSB7Ci0gICAgICAgIENG UnVuTG9vcFRpbWVySW52YWxpZGF0ZShzaGFyZWRUaW1lcik7Ci0gICAgICAgIENGUmVsZWFzZShz aGFyZWRUaW1lcik7Ci0gICAgICAgIHNoYXJlZFRpbWVyID0gMDsKLSAgICB9CisgICAgQ0ZSdW5M b29wVGltZXJTZXROZXh0RmlyZURhdGUoc2hhcmVkVGltZXIoKSwgQ0ZBYnNvbHV0ZVRpbWVHZXRD dXJyZW50KCkgKyBkaXN0YW50RnV0dXJlKTsKIH0KIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQo= 188716 2013-02-16 09:54:18 -0800 2013-02-17 14:25:51 -0800 patch2 timer-cf-reschedule-3.patch text/plain 5827 koivisto SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE0MzEwMykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMyIEBACisyMDEzLTAyLTE2ICBBbnR0aSBL b2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBSZXNjaGVkdWxlIHNoYXJlZCBD RlJ1bkxvb3BUaW1lciBpbnN0ZWFkIG9mIHJlY29uc3RydWN0aW5nIGl0CisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDk3NjUKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBVc2luZyBDRlJ1bkxvb3BUaW1lclNl dE5leHRGaXJlRGF0ZSBpcyBvdmVyIDJ4IGZhc3RlciB0aGFuIGRlbGV0aW5nIGFuZCByZWNvbnN0 cnVjdGluZyB0aW1lcnMuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9TaGFyZWRUaW1lci5oOgorICAg ICAgICAoV2ViQ29yZTo6U2hhcmVkVGltZXI6OndpbGxFbnRlck5lc3RlZEV2ZW50TG9vcCk6Cisg ICAgICAgIChXZWJDb3JlKToKKyAgICAgICAgKE1haW5UaHJlYWRTaGFyZWRUaW1lcik6CisgICAg ICAgIChXZWJDb3JlOjpNYWluVGhyZWFkU2hhcmVkVGltZXI6OndpbGxFbnRlck5lc3RlZEV2ZW50 TG9vcCk6CisgICAgICAgICogcGxhdGZvcm0vVGhyZWFkVGltZXJzLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OlRocmVhZFRpbWVyczo6ZmlyZVRpbWVyc0luTmVzdGVkRXZlbnRMb29wKToKKyAgICAg ICAgKiBwbGF0Zm9ybS9tYWMvU2hhcmVkVGltZXJNYWMubW06CisgICAgICAgIChXZWJDb3JlKToK KyAgICAgICAgKFdlYkNvcmU6OlBvd2VyT2JzZXJ2ZXI6OnJlc3RhcnRTaGFyZWRUaW1lcik6Cisg ICAgICAgIChXZWJDb3JlOjplbnN1cmVQb3dlck9ic2VydmVyKToKKyAgICAgICAgKFdlYkNvcmU6 OnNoYXJlZFRpbWVyKToKKyAgICAgICAgKFdlYkNvcmU6OnJlaW5zZXJ0U2hhcmVkVGltZXIpOgor ICAgICAgICAKKyAgICAgICAgICAgIEJlZm9yZSBlbnRlcmluZyBuZXN0ZWQgcnVubG9vcCAodXNl ZCBmb3IgaW5zcGVjdG9yIGRlYnVnZ2VyIG1vc3RseSkgcmVjb25zdHJ1Y3QgYW5kIHJlaW5zZXJ0 IHRoZSB0aW1lci4gRm9yIHNvbWUgcmVhc29uCisgICAgICAgICAgICB0aGUgdGltZXIgZG9lc24n dCBmaXJlIG90aGVyd2lzZS4KKworICAgICAgICAoV2ViQ29yZTo6c2V0U2hhcmVkVGltZXJGaXJl SW50ZXJ2YWwpOgorICAgICAgICAoV2ViQ29yZTo6c3RvcFNoYXJlZFRpbWVyKToKKwogMjAxMy0w Mi0xNiAgUm9iZXJ0IEhvZ2FuICA8cm9iZXJ0QHdlYmtpdC5vcmc+CiAKICAgICAgICAgcGVyY2Vu dGFnZSB0b3AgdmFsdWUgb2YgcG9zaXRpb246cmVsYXRpdmUgZWxlbWVudCBub3QgY2FsY3VsYXRl ZCB1c2luZyBwYXJlbnQncyBtaW4taGVpZ2h0IHVubGVzcyBoZWlnaHQgc2V0CkluZGV4OiBTb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9TaGFyZWRUaW1lci5oCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL1NoYXJlZFRpbWVyLmgJKHJldmlzaW9uIDE0MzEwMikKKysrIFNvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL1NoYXJlZFRpbWVyLmgJKHdvcmtpbmcgY29weSkKQEAgLTQ0LDYg KzQ0LDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICAvLyBUaGUgZmlyZSBpbnRlcnZh bCBpcyBpbiBzZWNvbmRzIHJlbGF0aXZlIHRvIHRoZSBjdXJyZW50IG1vbm90b25pYyBjbG9jayB0 aW1lLgogICAgICAgICB2aXJ0dWFsIHZvaWQgc2V0RmlyZUludGVydmFsKGRvdWJsZSkgPSAwOwog ICAgICAgICB2aXJ0dWFsIHZvaWQgc3RvcCgpID0gMDsKKyAgICAgICAgdmlydHVhbCB2b2lkIHdp bGxFbnRlck5lc3RlZEV2ZW50TG9vcCgpIHsgQVNTRVJUX05PVF9SRUFDSEVEKCk7IH0KICAgICB9 OwogCiAKQEAgLTUyLDcgKzUzLDkgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgIHZvaWQgc2V0 U2hhcmVkVGltZXJGaXJlZEZ1bmN0aW9uKHZvaWQgKCopKCkpOwogICAgIHZvaWQgc2V0U2hhcmVk VGltZXJGaXJlSW50ZXJ2YWwoZG91YmxlKTsKICAgICB2b2lkIHN0b3BTaGFyZWRUaW1lcigpOwot CisjaWYgUExBVEZPUk0oTUFDKQorICAgIHZvaWQgcmVpbnNlcnRTaGFyZWRUaW1lcigpOworI2Vu ZGlmCiAgICAgLy8gSW1wbGVtZW50YXRpb24gb2YgU2hhcmVkVGltZXIgZm9yIHRoZSBtYWluIHRo cmVhZC4KICAgICBjbGFzcyBNYWluVGhyZWFkU2hhcmVkVGltZXIgOiBwdWJsaWMgU2hhcmVkVGlt ZXIgewogICAgIHB1YmxpYzoKQEAgLTcwLDYgKzczLDEzIEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsK ICAgICAgICAgewogICAgICAgICAgICAgc3RvcFNoYXJlZFRpbWVyKCk7CiAgICAgICAgIH0KKwor ICAgICAgICB2aXJ0dWFsIHZvaWQgd2lsbEVudGVyTmVzdGVkRXZlbnRMb29wKCkKKyAgICAgICAg eworI2lmIFBMQVRGT1JNKE1BQykKKyAgICAgICAgICAgIHJlaW5zZXJ0U2hhcmVkVGltZXIoKTsK KyNlbmRpZgorICAgICAgICB9CiAgICAgfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpJbmRl eDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vVGhyZWFkVGltZXJzLmNwcAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9UaHJlYWRUaW1lcnMuY3BwCShyZXZpc2lvbiAxNDMx MDIpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9UaHJlYWRUaW1lcnMuY3BwCSh3b3JraW5n IGNvcHkpCkBAIC0xNDIsNiArMTQyLDcgQEAgdm9pZCBUaHJlYWRUaW1lcnM6OmZpcmVUaW1lcnNJ bk5lc3RlZEV2ZQogewogICAgIC8vIFJlc2V0IHRoZSByZWVudHJhbmN5IGd1YXJkIHNvIHRoZSB0 aW1lcnMgY2FuIGZpcmUgYWdhaW4uCiAgICAgbV9maXJpbmdUaW1lcnMgPSBmYWxzZTsKKyAgICBt X3NoYXJlZFRpbWVyLT53aWxsRW50ZXJOZXN0ZWRFdmVudExvb3AoKTsKICAgICB1cGRhdGVTaGFy ZWRUaW1lcigpOwogfQogCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvU2hhcmVk VGltZXJNYWMubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL1No YXJlZFRpbWVyTWFjLm1tCShyZXZpc2lvbiAxNDMxMDIpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9tYWMvU2hhcmVkVGltZXJNYWMubW0JKHdvcmtpbmcgY29weSkKQEAgLTQyLDcgKzQyLDcg QEAKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCi1zdGF0aWMgQ0ZSdW5Mb29wVGltZXJSZWYgc2hh cmVkVGltZXI7CitzdGF0aWMgY29uc3QgQ0ZUaW1lSW50ZXJ2YWwgZGlzdGFudEZ1dHVyZSA9IDYw ICogNjAgKiAyNCAqIDM2NSAqIDEwOyAvLyBEZWNhZGUuCiBzdGF0aWMgdm9pZCAoKnNoYXJlZFRp bWVyRmlyZWRGdW5jdGlvbikoKTsKIHN0YXRpYyB2b2lkIHRpbWVyRmlyZWQoQ0ZSdW5Mb29wVGlt ZXJSZWYsIHZvaWQqKTsKIApAQCAtMTQzLDE0ICsxNDMsMzggQEAgdm9pZCBQb3dlck9ic2VydmVy OjpyZXN0YXJ0U2hhcmVkVGltZXIoKQogewogICAgIEFTU0VSVChDRlJ1bkxvb3BHZXRDdXJyZW50 KCkgPT0gQ0ZSdW5Mb29wR2V0TWFpbigpKTsKIAotICAgIGlmICghc2hhcmVkVGltZXIpCi0gICAg ICAgIHJldHVybjsKLQogICAgIHN0b3BTaGFyZWRUaW1lcigpOwogICAgIHRpbWVyRmlyZWQoMCwg MCk7CiB9CiAKLXN0YXRpYyBQb3dlck9ic2VydmVyKiBQb3dlck9ic2VydmVyOworc3RhdGljIHZv aWQgZW5zdXJlUG93ZXJPYnNlcnZlcigpCit7CisgICAgc3RhdGljIGRpc3BhdGNoX29uY2VfdCBv bmNlVG9rZW47CisgICAgZGlzcGF0Y2hfb25jZSgmb25jZVRva2VuLCBeeworICAgICAgICBzdGF0 aWMgUG93ZXJPYnNlcnZlciogcG93ZXJPYnNlcnZlcjsKKyAgICAgICAgcG93ZXJPYnNlcnZlciA9 IFBvd2VyT2JzZXJ2ZXI6OmNyZWF0ZSgpLmxlYWtQdHIoKTsKKyAgICB9KTsKK30KKworc3RhdGlj IENGUnVuTG9vcFRpbWVyUmVmIGdsb2JhbFNoYXJlZFRpbWVyOworCitzdGF0aWMgQ0ZSdW5Mb29w VGltZXJSZWYgc2hhcmVkVGltZXIoKQoreworICAgIGlmICghZ2xvYmFsU2hhcmVkVGltZXIpIHsK KyAgICAgICAgZ2xvYmFsU2hhcmVkVGltZXIgPSBDRlJ1bkxvb3BUaW1lckNyZWF0ZSgwLCBDRkFi c29sdXRlVGltZUdldEN1cnJlbnQoKSArIGRpc3RhbnRGdXR1cmUsIGRpc3RhbnRGdXR1cmUsIDAs IDAsIHRpbWVyRmlyZWQsIDApOworICAgICAgICBDRlJ1bkxvb3BBZGRUaW1lcihDRlJ1bkxvb3BH ZXRDdXJyZW50KCksIGdsb2JhbFNoYXJlZFRpbWVyLCBrQ0ZSdW5Mb29wQ29tbW9uTW9kZXMpOwor ICAgICAgICBlbnN1cmVQb3dlck9ic2VydmVyKCk7CisgICAgfQorICAgIHJldHVybiBnbG9iYWxT aGFyZWRUaW1lcjsKK307CisKK3ZvaWQgcmVpbnNlcnRTaGFyZWRUaW1lcigpCit7CisgICAgLy8g Rm9yIHNvbWUgcmVhc29uIHRoZSB0aW1lciB3b24ndCBmaXJlIGluIGEgbmVzdGVkIHJ1bmxvb3Ag dW5sZXNzIGl0IGhhcyBiZWVuIGZyZXNobHkgaW5zZXJ0ZWQuCisgICAgQ0ZSdW5Mb29wVGltZXJJ bnZhbGlkYXRlKGdsb2JhbFNoYXJlZFRpbWVyKTsKKyAgICBDRlJlbGVhc2UoZ2xvYmFsU2hhcmVk VGltZXIpOworICAgIGdsb2JhbFNoYXJlZFRpbWVyID0gMDsKK30KIAogdm9pZCBzZXRTaGFyZWRU aW1lckZpcmVkRnVuY3Rpb24odm9pZCAoKmYpKCkpCiB7CkBAIC0xNzAsMjcgKzE5NCwxMyBAQCBz dGF0aWMgdm9pZCB0aW1lckZpcmVkKENGUnVuTG9vcFRpbWVyUmVmCiB2b2lkIHNldFNoYXJlZFRp bWVyRmlyZUludGVydmFsKGRvdWJsZSBpbnRlcnZhbCkKIHsKICAgICBBU1NFUlQoc2hhcmVkVGlt ZXJGaXJlZEZ1bmN0aW9uKTsKLQotICAgIGlmIChzaGFyZWRUaW1lcikgewotICAgICAgICBDRlJ1 bkxvb3BUaW1lckludmFsaWRhdGUoc2hhcmVkVGltZXIpOwotICAgICAgICBDRlJlbGVhc2Uoc2hh cmVkVGltZXIpOwotICAgIH0KLQogICAgIENGQWJzb2x1dGVUaW1lIGZpcmVEYXRlID0gQ0ZBYnNv bHV0ZVRpbWVHZXRDdXJyZW50KCkgKyBpbnRlcnZhbDsKLSAgICBzaGFyZWRUaW1lciA9IENGUnVu TG9vcFRpbWVyQ3JlYXRlKDAsIGZpcmVEYXRlLCAwLCAwLCAwLCB0aW1lckZpcmVkLCAwKTsKLSAg ICBDRlJ1bkxvb3BBZGRUaW1lcihDRlJ1bkxvb3BHZXRDdXJyZW50KCksIHNoYXJlZFRpbWVyLCBr Q0ZSdW5Mb29wQ29tbW9uTW9kZXMpOwotICAgIAotICAgIGlmICghUG93ZXJPYnNlcnZlcikKLSAg ICAgICAgUG93ZXJPYnNlcnZlciA9IFBvd2VyT2JzZXJ2ZXI6OmNyZWF0ZSgpLmxlYWtQdHIoKTsK KyAgICBDRlJ1bkxvb3BUaW1lclNldE5leHRGaXJlRGF0ZShzaGFyZWRUaW1lcigpLCBmaXJlRGF0 ZSk7CiB9CiAKIHZvaWQgc3RvcFNoYXJlZFRpbWVyKCkKIHsKLSAgICBpZiAoc2hhcmVkVGltZXIp IHsKLSAgICAgICAgQ0ZSdW5Mb29wVGltZXJJbnZhbGlkYXRlKHNoYXJlZFRpbWVyKTsKLSAgICAg ICAgQ0ZSZWxlYXNlKHNoYXJlZFRpbWVyKTsKLSAgICAgICAgc2hhcmVkVGltZXIgPSAwOwotICAg IH0KKyAgICBDRlJ1bkxvb3BUaW1lclNldE5leHRGaXJlRGF0ZShzaGFyZWRUaW1lcigpLCBDRkFi c29sdXRlVGltZUdldEN1cnJlbnQoKSArIGRpc3RhbnRGdXR1cmUpOwogfQogCiB9IC8vIG5hbWVz cGFjZSBXZWJDb3JlCg==