41824 2010-07-07 18:12:41 -0700 Wire network times from ResourceLoadTiming to performance.timing 2010-07-14 13:30:23 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 41332 42091 30685 1 tonyg tonyg abarth fishd pfeldman oldest_to_newest 247916 0 tonyg 2010-07-07 18:12:41 -0700 Wire network times from ResourceLoadTiming to performance.timing for Web Timing feature 250283 1 61320 tonyg 2010-07-12 21:35:27 -0700 Created attachment 61320 Patch 250295 2 61320 fishd 2010-07-12 22:05:22 -0700 Comment on attachment 61320 Patch WebCore/page/Timing.cpp:84 + return static_cast<unsigned long long>(domainLookupStart * 1000); nit: use 1000.0 to improve readability (same nit applies elsewhere). a static helper function might also be nice: toIntegerMilliseconds(double)? R=me 250805 3 tonyg 2010-07-13 16:29:40 -0700 (In reply to comment #2) > (From update of attachment 61320 [details]) > WebCore/page/Timing.cpp:84 > + return static_cast<unsigned long long>(domainLookupStart * 1000); > nit: use 1000.0 to improve readability (same nit applies elsewhere). a > static helper function might also be nice: toIntegerMilliseconds(double)? Wow, that is so much cleaner. Thanks. > > R=me Landed r63259 250983 4 fishd 2010-07-13 23:00:08 -0700 Note: toIntegerMilliseconds probably would have been better as a file static instead of a class static. that way it will have internal linkage and be optimized away to nothing (although that might still happen in this case). class statics have external linkage by default. 251399 5 tonyg 2010-07-14 13:30:23 -0700 (In reply to comment #4) > Note: toIntegerMilliseconds probably would have been better as a file static instead of a class static. that way it will have internal linkage and be optimized away to nothing (although that might still happen in this case). class statics have external linkage by default. Great education for me. I assumed they would compile to the same thing. I'll post a follow-up patch. 61320 2010-07-12 21:35:27 -0700 2010-07-12 22:05:22 -0700 Patch bug-41824-20100712213526.patch text/plain 14888 tonyg ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCAwZTIzOTczMjI1Nzg4NmVhMjcyZTMxZjk3OWY2NmRlYjJjOWU0ZTdmLi44YzgwYzk3 NTc4OTQyZWQzYmUwZGEzOWEyYWZkOTU2NTdhMGNkNTY3IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAK KzIwMTAtMDctMTIgIFRvbnkgR2VudGlsY29yZSAgPHRvbnlnQGNocm9taXVtLm9yZz4KKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXaXJlIG5ldHdvcmsg dGltZXMgZnJvbSBSZXNvdXJjZUxvYWRUaW1pbmcgdG8gcGVyZm9ybWFuY2UudGltaW5nCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00MTgyNAorCisgICAg ICAgIEV4cGVjdGF0aW9ucyBzZXQgdG8gZmFpbCBiZWNhdXNlIC0td2ViLXRpbWluZyBkaXNhYmxl ZCBieSBkZWZhdWx0LgorCisgICAgICAgICogZmFzdC9kb20vc2NyaXB0LXRlc3RzL3dlYnRpbWlu Zy5qczoKKyAgICAgICAgKGNoZWNrVGltaW5nQmVmb3JlTG9hZCk6CisgICAgICAgIChjaGVja1dl YlRpbWluZ09uTG9hZCk6CisgICAgICAgIChjaGVja1dlYlRpbWluZ0FmdGVyTG9hZCk6CisgICAg ICAgICogZmFzdC9kb20vd2VidGltaW5nLWV4cGVjdGVkLnR4dDoKKwogMjAxMC0wNy0xMiAgQWRh bSBCYXJ0aCAgPGFiYXJ0aEB3ZWJraXQub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEVyaWMg U2VpZGVsLgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9kb20vc2NyaXB0LXRlc3RzL3dl YnRpbWluZy5qcyBiL0xheW91dFRlc3RzL2Zhc3QvZG9tL3NjcmlwdC10ZXN0cy93ZWJ0aW1pbmcu anMKaW5kZXggOTAyZDI5Y2ZmZTRkMjU1ODk5N2ZmOTVhZWJhYTZiZjAxY2U0MzZlMi4uMWJmYTVk MWNjOTBhOTNhMzQwMDYzNGZiZTkwMzljZjZmYjZjYThlMyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVz dHMvZmFzdC9kb20vc2NyaXB0LXRlc3RzL3dlYnRpbWluZy5qcworKysgYi9MYXlvdXRUZXN0cy9m YXN0L2RvbS9zY3JpcHQtdGVzdHMvd2VidGltaW5nLmpzCkBAIC00Miw2ICs0MiwxNyBAQCBmdW5j dGlvbiBjaGVja1RpbWluZ0JlZm9yZUxvYWQoKQogCiAgICAgc2hvdWxkQmVHcmVhdGVyVGhhbk9y RXF1YWwoInRpbWluZy51bmxvYWRFdmVudEVuZCIsICJ0aW1pbmcubmF2aWdhdGlvblN0YXJ0Iik7 CiAKKyAgICBzaG91bGRCZSgidGltaW5nLmRvbWFpbkxvb2t1cFN0YXJ0IiwgIjAiKTsKKyAgICBz aG91bGRCZSgidGltaW5nLmRvbWFpbkxvb2t1cEVuZCIsICIwIik7CisKKyAgICBzaG91bGRCZSgi dGltaW5nLmNvbm5lY3RTdGFydCIsICIwIik7CisgICAgc2hvdWxkQmUoInRpbWluZy5jb25uZWN0 RW5kIiwgIjAiKTsKKworICAgIHNob3VsZEJlR3JlYXRlclRoYW5PckVxdWFsKCJ0aW1pbmcucmVx dWVzdFN0YXJ0IiwgInRpbWluZy5uYXZpZ2F0aW9uU3RhcnQiKTsKKyAgICBzaG91bGRCZUdyZWF0 ZXJUaGFuT3JFcXVhbCgidGltaW5nLnJlcXVlc3RFbmQiLCAidGltaW5nLnJlcXVlc3RTdGFydCIp OworCisgICAgc2hvdWxkQmVHcmVhdGVyVGhhbk9yRXF1YWwoInRpbWluZy5yZXNwb25zZVN0YXJ0 IiwgInRpbWluZy5yZXF1ZXN0RW5kIik7CisKICAgICBzaG91bGRCZSgidGltaW5nLmxvYWRFdmVu dFN0YXJ0IiwgIjAiKTsKICAgICBzaG91bGRCZSgidGltaW5nLmxvYWRFdmVudEVuZCIsICIwIik7 CiAKQEAgLTU0LDcgKzY1LDE4IEBAIGZ1bmN0aW9uIGNoZWNrV2ViVGltaW5nT25Mb2FkKCkKIAog ICAgIHNob3VsZEJlR3JlYXRlclRoYW5PckVxdWFsKCJ0aW1pbmcudW5sb2FkRXZlbnRFbmQiLCAi dGltaW5nLm5hdmlnYXRpb25TdGFydCIpOwogCi0gICAgc2hvdWxkQmVHcmVhdGVyVGhhbk9yRXF1 YWwoInRpbWluZy5sb2FkRXZlbnRTdGFydCIsICJ0aW1pbmcudW5sb2FkRXZlbnRFbmQiKTsKKyAg ICBzaG91bGRCZSgidGltaW5nLmRvbWFpbkxvb2t1cFN0YXJ0IiwgIjAiKTsKKyAgICBzaG91bGRC ZSgidGltaW5nLmRvbWFpbkxvb2t1cEVuZCIsICIwIik7CisKKyAgICBzaG91bGRCZSgidGltaW5n LmNvbm5lY3RTdGFydCIsICIwIik7CisgICAgc2hvdWxkQmUoInRpbWluZy5jb25uZWN0RW5kIiwg IjAiKTsKKworICAgIHNob3VsZEJlR3JlYXRlclRoYW5PckVxdWFsKCJ0aW1pbmcucmVxdWVzdFN0 YXJ0IiwgInRpbWluZy5uYXZpZ2F0aW9uU3RhcnQiKTsKKyAgICBzaG91bGRCZUdyZWF0ZXJUaGFu T3JFcXVhbCgidGltaW5nLnJlcXVlc3RFbmQiLCAidGltaW5nLnJlcXVlc3RTdGFydCIpOworCisg ICAgc2hvdWxkQmVHcmVhdGVyVGhhbk9yRXF1YWwoInRpbWluZy5yZXNwb25zZVN0YXJ0IiwgInRp bWluZy5yZXF1ZXN0RW5kIik7CisKKyAgICBzaG91bGRCZUdyZWF0ZXJUaGFuT3JFcXVhbCgidGlt aW5nLmxvYWRFdmVudFN0YXJ0IiwgInRpbWluZy5yZXNwb25zZVN0YXJ0Iik7CiAgICAgc2hvdWxk QmUoInRpbWluZy5sb2FkRXZlbnRFbmQiLCAiMCIpOwogCiAgICAgc2V0VGltZW91dCgiY2hlY2tX ZWJUaW1pbmdBZnRlckxvYWQoKSIsIDApOwpAQCAtNjYsNyArODgsMTggQEAgZnVuY3Rpb24gY2hl Y2tXZWJUaW1pbmdBZnRlckxvYWQoKQogCiAgICAgc2hvdWxkQmVHcmVhdGVyVGhhbk9yRXF1YWwo InRpbWluZy51bmxvYWRFdmVudEVuZCIsICJ0aW1pbmcubmF2aWdhdGlvblN0YXJ0Iik7CiAKLSAg ICBzaG91bGRCZUdyZWF0ZXJUaGFuT3JFcXVhbCgidGltaW5nLmxvYWRFdmVudFN0YXJ0IiwgInRp bWluZy51bmxvYWRFdmVudEVuZCIpOworICAgIHNob3VsZEJlKCJ0aW1pbmcuZG9tYWluTG9va3Vw U3RhcnQiLCAiMCIpOworICAgIHNob3VsZEJlKCJ0aW1pbmcuZG9tYWluTG9va3VwRW5kIiwgIjAi KTsKKworICAgIHNob3VsZEJlKCJ0aW1pbmcuY29ubmVjdFN0YXJ0IiwgIjAiKTsKKyAgICBzaG91 bGRCZSgidGltaW5nLmNvbm5lY3RFbmQiLCAiMCIpOworCisgICAgc2hvdWxkQmVHcmVhdGVyVGhh bk9yRXF1YWwoInRpbWluZy5yZXF1ZXN0U3RhcnQiLCAidGltaW5nLm5hdmlnYXRpb25TdGFydCIp OworICAgIHNob3VsZEJlR3JlYXRlclRoYW5PckVxdWFsKCJ0aW1pbmcucmVxdWVzdEVuZCIsICJ0 aW1pbmcucmVxdWVzdFN0YXJ0Iik7CisKKyAgICBzaG91bGRCZUdyZWF0ZXJUaGFuT3JFcXVhbCgi dGltaW5nLnJlc3BvbnNlU3RhcnQiLCAidGltaW5nLnJlcXVlc3RFbmQiKTsKKworICAgIHNob3Vs ZEJlR3JlYXRlclRoYW5PckVxdWFsKCJ0aW1pbmcubG9hZEV2ZW50U3RhcnQiLCAidGltaW5nLnJl c3BvbnNlU3RhcnQiKTsKICAgICBzaG91bGRCZUdyZWF0ZXJUaGFuT3JFcXVhbCgidGltaW5nLmxv YWRFdmVudEVuZCIsICJ0aW1pbmcubG9hZEV2ZW50U3RhcnQgKyA1MCIpOwogCiAgICAgZmluaXNo SlNUZXN0KCk7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2RvbS93ZWJ0aW1pbmctZXhw ZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvZmFzdC9kb20vd2VidGltaW5nLWV4cGVjdGVkLnR4dApp bmRleCAxNzc1N2YyZWEyNGQxZWE4NTg1NjdmNjNhYWJjOTY1MThmZjNjZGI1Li4zZjkwYTUzZWM5 NGYyOTk3MzVkNDFiYTQ4NDhkNzJmOGZlMmQwMjUxIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9m YXN0L2RvbS93ZWJ0aW1pbmctZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL2Zhc3QvZG9t L3dlYnRpbWluZy1leHBlY3RlZC50eHQKQEAgLTUsMTUgKzUsMzYgQEAgT24gc3VjY2VzcywgeW91 IHdpbGwgc2VlIGEgc2VyaWVzIG9mICJQQVNTIiBtZXNzYWdlcywgZm9sbG93ZWQgYnkgIlRFU1Qg Q09NUExFVEUKIAogRkFJTCB0aW1pbmcubmF2aWdhdGlvblN0YXJ0IHNob3VsZCBiZSA+PSBvbmVI b3VyQWdvVVRDLiBXYXMgdW5kZWZpbmVkIChvZiB0eXBlIHVuZGVmaW5lZCkuCiBGQUlMIHRpbWlu Zy51bmxvYWRFdmVudEVuZCBzaG91bGQgYmUgPj0gdGltaW5nLm5hdmlnYXRpb25TdGFydC4gV2Fz IHVuZGVmaW5lZCAob2YgdHlwZSB1bmRlZmluZWQpLgorRkFJTCB0aW1pbmcuZG9tYWluTG9va3Vw U3RhcnQgc2hvdWxkIGJlIDAgKG9mIHR5cGUgbnVtYmVyKS4gV2FzIHVuZGVmaW5lZCAob2YgdHlw ZSB1bmRlZmluZWQpLgorRkFJTCB0aW1pbmcuZG9tYWluTG9va3VwRW5kIHNob3VsZCBiZSAwIChv ZiB0eXBlIG51bWJlcikuIFdhcyB1bmRlZmluZWQgKG9mIHR5cGUgdW5kZWZpbmVkKS4KK0ZBSUwg dGltaW5nLmNvbm5lY3RTdGFydCBzaG91bGQgYmUgMCAob2YgdHlwZSBudW1iZXIpLiBXYXMgdW5k ZWZpbmVkIChvZiB0eXBlIHVuZGVmaW5lZCkuCitGQUlMIHRpbWluZy5jb25uZWN0RW5kIHNob3Vs ZCBiZSAwIChvZiB0eXBlIG51bWJlcikuIFdhcyB1bmRlZmluZWQgKG9mIHR5cGUgdW5kZWZpbmVk KS4KK0ZBSUwgdGltaW5nLnJlcXVlc3RTdGFydCBzaG91bGQgYmUgPj0gdGltaW5nLm5hdmlnYXRp b25TdGFydC4gV2FzIHVuZGVmaW5lZCAob2YgdHlwZSB1bmRlZmluZWQpLgorRkFJTCB0aW1pbmcu cmVxdWVzdEVuZCBzaG91bGQgYmUgPj0gdGltaW5nLnJlcXVlc3RTdGFydC4gV2FzIHVuZGVmaW5l ZCAob2YgdHlwZSB1bmRlZmluZWQpLgorRkFJTCB0aW1pbmcucmVzcG9uc2VTdGFydCBzaG91bGQg YmUgPj0gdGltaW5nLnJlcXVlc3RFbmQuIFdhcyB1bmRlZmluZWQgKG9mIHR5cGUgdW5kZWZpbmVk KS4KIEZBSUwgdGltaW5nLmxvYWRFdmVudFN0YXJ0IHNob3VsZCBiZSAwIChvZiB0eXBlIG51bWJl cikuIFdhcyB1bmRlZmluZWQgKG9mIHR5cGUgdW5kZWZpbmVkKS4KIEZBSUwgdGltaW5nLmxvYWRF dmVudEVuZCBzaG91bGQgYmUgMCAob2YgdHlwZSBudW1iZXIpLiBXYXMgdW5kZWZpbmVkIChvZiB0 eXBlIHVuZGVmaW5lZCkuCiBGQUlMIHRpbWluZy5uYXZpZ2F0aW9uU3RhcnQgc2hvdWxkIGJlID49 IG9uZUhvdXJBZ29VVEMuIFdhcyB1bmRlZmluZWQgKG9mIHR5cGUgdW5kZWZpbmVkKS4KIEZBSUwg dGltaW5nLnVubG9hZEV2ZW50RW5kIHNob3VsZCBiZSA+PSB0aW1pbmcubmF2aWdhdGlvblN0YXJ0 LiBXYXMgdW5kZWZpbmVkIChvZiB0eXBlIHVuZGVmaW5lZCkuCi1GQUlMIHRpbWluZy5sb2FkRXZl bnRTdGFydCBzaG91bGQgYmUgPj0gdGltaW5nLnVubG9hZEV2ZW50RW5kLiBXYXMgdW5kZWZpbmVk IChvZiB0eXBlIHVuZGVmaW5lZCkuCitGQUlMIHRpbWluZy5kb21haW5Mb29rdXBTdGFydCBzaG91 bGQgYmUgMCAob2YgdHlwZSBudW1iZXIpLiBXYXMgdW5kZWZpbmVkIChvZiB0eXBlIHVuZGVmaW5l ZCkuCitGQUlMIHRpbWluZy5kb21haW5Mb29rdXBFbmQgc2hvdWxkIGJlIDAgKG9mIHR5cGUgbnVt YmVyKS4gV2FzIHVuZGVmaW5lZCAob2YgdHlwZSB1bmRlZmluZWQpLgorRkFJTCB0aW1pbmcuY29u bmVjdFN0YXJ0IHNob3VsZCBiZSAwIChvZiB0eXBlIG51bWJlcikuIFdhcyB1bmRlZmluZWQgKG9m IHR5cGUgdW5kZWZpbmVkKS4KK0ZBSUwgdGltaW5nLmNvbm5lY3RFbmQgc2hvdWxkIGJlIDAgKG9m IHR5cGUgbnVtYmVyKS4gV2FzIHVuZGVmaW5lZCAob2YgdHlwZSB1bmRlZmluZWQpLgorRkFJTCB0 aW1pbmcucmVxdWVzdFN0YXJ0IHNob3VsZCBiZSA+PSB0aW1pbmcubmF2aWdhdGlvblN0YXJ0LiBX YXMgdW5kZWZpbmVkIChvZiB0eXBlIHVuZGVmaW5lZCkuCitGQUlMIHRpbWluZy5yZXF1ZXN0RW5k IHNob3VsZCBiZSA+PSB0aW1pbmcucmVxdWVzdFN0YXJ0LiBXYXMgdW5kZWZpbmVkIChvZiB0eXBl IHVuZGVmaW5lZCkuCitGQUlMIHRpbWluZy5yZXNwb25zZVN0YXJ0IHNob3VsZCBiZSA+PSB0aW1p bmcucmVxdWVzdEVuZC4gV2FzIHVuZGVmaW5lZCAob2YgdHlwZSB1bmRlZmluZWQpLgorRkFJTCB0 aW1pbmcubG9hZEV2ZW50U3RhcnQgc2hvdWxkIGJlID49IHRpbWluZy5yZXNwb25zZVN0YXJ0LiBX YXMgdW5kZWZpbmVkIChvZiB0eXBlIHVuZGVmaW5lZCkuCiBGQUlMIHRpbWluZy5sb2FkRXZlbnRF bmQgc2hvdWxkIGJlIDAgKG9mIHR5cGUgbnVtYmVyKS4gV2FzIHVuZGVmaW5lZCAob2YgdHlwZSB1 bmRlZmluZWQpLgogRkFJTCB0aW1pbmcubmF2aWdhdGlvblN0YXJ0IHNob3VsZCBiZSA+PSBvbmVI b3VyQWdvVVRDLiBXYXMgdW5kZWZpbmVkIChvZiB0eXBlIHVuZGVmaW5lZCkuCiBGQUlMIHRpbWlu Zy51bmxvYWRFdmVudEVuZCBzaG91bGQgYmUgPj0gdGltaW5nLm5hdmlnYXRpb25TdGFydC4gV2Fz IHVuZGVmaW5lZCAob2YgdHlwZSB1bmRlZmluZWQpLgotRkFJTCB0aW1pbmcubG9hZEV2ZW50U3Rh cnQgc2hvdWxkIGJlID49IHRpbWluZy51bmxvYWRFdmVudEVuZC4gV2FzIHVuZGVmaW5lZCAob2Yg dHlwZSB1bmRlZmluZWQpLgorRkFJTCB0aW1pbmcuZG9tYWluTG9va3VwU3RhcnQgc2hvdWxkIGJl IDAgKG9mIHR5cGUgbnVtYmVyKS4gV2FzIHVuZGVmaW5lZCAob2YgdHlwZSB1bmRlZmluZWQpLgor RkFJTCB0aW1pbmcuZG9tYWluTG9va3VwRW5kIHNob3VsZCBiZSAwIChvZiB0eXBlIG51bWJlciku IFdhcyB1bmRlZmluZWQgKG9mIHR5cGUgdW5kZWZpbmVkKS4KK0ZBSUwgdGltaW5nLmNvbm5lY3RT dGFydCBzaG91bGQgYmUgMCAob2YgdHlwZSBudW1iZXIpLiBXYXMgdW5kZWZpbmVkIChvZiB0eXBl IHVuZGVmaW5lZCkuCitGQUlMIHRpbWluZy5jb25uZWN0RW5kIHNob3VsZCBiZSAwIChvZiB0eXBl IG51bWJlcikuIFdhcyB1bmRlZmluZWQgKG9mIHR5cGUgdW5kZWZpbmVkKS4KK0ZBSUwgdGltaW5n LnJlcXVlc3RTdGFydCBzaG91bGQgYmUgPj0gdGltaW5nLm5hdmlnYXRpb25TdGFydC4gV2FzIHVu ZGVmaW5lZCAob2YgdHlwZSB1bmRlZmluZWQpLgorRkFJTCB0aW1pbmcucmVxdWVzdEVuZCBzaG91 bGQgYmUgPj0gdGltaW5nLnJlcXVlc3RTdGFydC4gV2FzIHVuZGVmaW5lZCAob2YgdHlwZSB1bmRl ZmluZWQpLgorRkFJTCB0aW1pbmcucmVzcG9uc2VTdGFydCBzaG91bGQgYmUgPj0gdGltaW5nLnJl cXVlc3RFbmQuIFdhcyB1bmRlZmluZWQgKG9mIHR5cGUgdW5kZWZpbmVkKS4KK0ZBSUwgdGltaW5n LmxvYWRFdmVudFN0YXJ0IHNob3VsZCBiZSA+PSB0aW1pbmcucmVzcG9uc2VTdGFydC4gV2FzIHVu ZGVmaW5lZCAob2YgdHlwZSB1bmRlZmluZWQpLgogRkFJTCB0aW1pbmcubG9hZEV2ZW50RW5kIHNo b3VsZCBiZSA+PSB0aW1pbmcubG9hZEV2ZW50U3RhcnQgKyA1MC4gV2FzIHVuZGVmaW5lZCAob2Yg dHlwZSB1bmRlZmluZWQpLgogUEFTUyBzdWNjZXNzZnVsbHlQYXJzZWQgaXMgdHJ1ZQogCmRpZmYg LS1naXQgYS9XZWJDb3JlL0NoYW5nZUxvZyBiL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IDY0MTNk ZDlkOTRlZWQ3YjdkODFlMDczNDBhNGRiYTY0YzFkNTUwZmIuLjc1ZDg5NDAyMWYwMTlkNmQ4ZDVk YThlZTY5MmJiNGY4NmEwOGU3NjIgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBi L1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTAtMDctMTIgIFRvbnkgR2Vu dGlsY29yZSAgPHRvbnlnQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBXaXJlIG5ldHdvcmsgdGltZXMgZnJvbSBSZXNvdXJjZUxv YWRUaW1pbmcgdG8gcGVyZm9ybWFuY2UudGltaW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD00MTgyNAorCisgICAgICAgICogcGFnZS9UaW1pbmcuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6VGltaW5nOjpkb21haW5Mb29rdXBTdGFydCk6IGh0dHA6Ly9k ZXYudzMub3JnLzIwMDYvd2ViYXBpL1dlYlRpbWluZy8jbnQtZG9tYWluLWxvb2t1cHN0YXJ0Cisg ICAgICAgIChXZWJDb3JlOjpUaW1pbmc6OmRvbWFpbkxvb2t1cEVuZCk6IGh0dHA6Ly9kZXYudzMu b3JnLzIwMDYvd2ViYXBpL1dlYlRpbWluZy8jbnQtZG9tYWluLWxvb2t1cGVuZAorICAgICAgICAo V2ViQ29yZTo6VGltaW5nOjpjb25uZWN0U3RhcnQpOiBodHRwOi8vZGV2LnczLm9yZy8yMDA2L3dl YmFwaS9XZWJUaW1pbmcvI250LWNvbm5lY3Qtc3RhcnQKKyAgICAgICAgKFdlYkNvcmU6OlRpbWlu Zzo6Y29ubmVjdEVuZCk6IGh0dHA6Ly9kZXYudzMub3JnLzIwMDYvd2ViYXBpL1dlYlRpbWluZy8j bnQtY29ubmVjdC1lbmQKKyAgICAgICAgKFdlYkNvcmU6OlRpbWluZzo6cmVxdWVzdFN0YXJ0KTog aHR0cDovL2Rldi53My5vcmcvMjAwNi93ZWJhcGkvV2ViVGltaW5nLyNudC1yZXF1ZXN0LXN0YXJ0 CisgICAgICAgIChXZWJDb3JlOjpUaW1pbmc6OnJlcXVlc3RFbmQpOiBodHRwOi8vZGV2LnczLm9y Zy8yMDA2L3dlYmFwaS9XZWJUaW1pbmcvI250LXJlcXVlc3QtZW5kCisgICAgICAgIChXZWJDb3Jl OjpUaW1pbmc6OnJlc3BvbnNlU3RhcnQpOiBodHRwOi8vZGV2LnczLm9yZy8yMDA2L3dlYmFwaS9X ZWJUaW1pbmcvI250LXJlc3BvbnNlLXN0YXJ0CisgICAgICAgIChXZWJDb3JlOjpUaW1pbmc6OnJl c291cmNlTG9hZFRpbWluZyk6CisgICAgICAgICogcGFnZS9UaW1pbmcuaDoKKyAgICAgICAgKiBw YWdlL1RpbWluZy5pZGw6CisKIDIwMTAtMDctMTIgIFBhdmVsIEZlbGRtYW4gIDxwZmVsZG1hbkBj aHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgSm9zZXBoIFBlY29yYXJvLgpkaWZm IC0tZ2l0IGEvV2ViQ29yZS9wYWdlL1RpbWluZy5jcHAgYi9XZWJDb3JlL3BhZ2UvVGltaW5nLmNw cAppbmRleCBhZjAwNDQxNzg3YThjMDE3Y2QyYTNjYjNiYjgzY2Y0ZTQ2YzUwMjY2Li5mYWRiYWMw NzdkY2YzM2JhNmZjY2NlZmVlZTkyZjEzMDZlNWE0NTVjIDEwMDY0NAotLS0gYS9XZWJDb3JlL3Bh Z2UvVGltaW5nLmNwcAorKysgYi9XZWJDb3JlL3BhZ2UvVGltaW5nLmNwcApAQCAtMzMsNyArMzMs MTAgQEAKIAogI2lmIEVOQUJMRShXRUJfVElNSU5HKQogCisjaW5jbHVkZSAiRG9jdW1lbnRMb2Fk ZXIuaCIKICNpbmNsdWRlICJGcmFtZS5oIgorI2luY2x1ZGUgIlJlc291cmNlTG9hZFRpbWluZy5o IgorI2luY2x1ZGUgIlJlc291cmNlUmVzcG9uc2UuaCIKIAogbmFtZXNwYWNlIFdlYkNvcmUgewog CkBAIC02OCw2ICs3MSwxMDMgQEAgdW5zaWduZWQgbG9uZyBsb25nIFRpbWluZzo6dW5sb2FkRXZl bnRFbmQoKSBjb25zdAogICAgIHJldHVybiBzdGF0aWNfY2FzdDx1bnNpZ25lZCBsb25nIGxvbmc+ KG1fZnJhbWUtPmxvYWRlcigpLT5mcmFtZUxvYWRUaW1lbGluZSgpLT51bmxvYWRFdmVudEVuZCAq IDEwMDApOwogfQogCit1bnNpZ25lZCBsb25nIGxvbmcgVGltaW5nOjpkb21haW5Mb29rdXBTdGFy dCgpIGNvbnN0Cit7CisgICAgUmVzb3VyY2VMb2FkVGltaW5nKiB0aW1pbmcgPSByZXNvdXJjZUxv YWRUaW1pbmcoKTsKKyAgICBpZiAoIXRpbWluZykKKyAgICAgICAgcmV0dXJuIDA7CisKKyAgICBk b3VibGUgZG9tYWluTG9va3VwU3RhcnQgPSB0aW1pbmctPmRuc1N0YXJ0OworICAgIGlmIChkb21h aW5Mb29rdXBTdGFydCA8IDApCisgICAgICAgcmV0dXJuIDA7CisKKyAgICByZXR1cm4gc3RhdGlj X2Nhc3Q8dW5zaWduZWQgbG9uZyBsb25nPihkb21haW5Mb29rdXBTdGFydCAqIDEwMDApOworfQor Cit1bnNpZ25lZCBsb25nIGxvbmcgVGltaW5nOjpkb21haW5Mb29rdXBFbmQoKSBjb25zdAorewor ICAgIFJlc291cmNlTG9hZFRpbWluZyogdGltaW5nID0gcmVzb3VyY2VMb2FkVGltaW5nKCk7Cisg ICAgaWYgKCF0aW1pbmcpCisgICAgICAgIHJldHVybiAwOworCisgICAgZG91YmxlIGRvbWFpbkxv b2t1cEVuZCA9IHRpbWluZy0+ZG5zRW5kOworICAgIGlmIChkb21haW5Mb29rdXBFbmQgPCAwKQor ICAgICAgIHJldHVybiAwOworCisgICAgcmV0dXJuIHN0YXRpY19jYXN0PHVuc2lnbmVkIGxvbmcg bG9uZz4oZG9tYWluTG9va3VwRW5kICogMTAwMCk7Cit9CisKK3Vuc2lnbmVkIGxvbmcgbG9uZyBU aW1pbmc6OmNvbm5lY3RTdGFydCgpIGNvbnN0Cit7CisgICAgUmVzb3VyY2VMb2FkVGltaW5nKiB0 aW1pbmcgPSByZXNvdXJjZUxvYWRUaW1pbmcoKTsKKyAgICBpZiAoIXRpbWluZykKKyAgICAgICAg cmV0dXJuIDA7CisKKyAgICBkb3VibGUgY29ubmVjdFN0YXJ0ID0gdGltaW5nLT5jb25uZWN0U3Rh cnQ7CisgICAgaWYgKGNvbm5lY3RTdGFydCA8IDApCisgICAgICAgcmV0dXJuIDA7CisKKyAgICBy ZXR1cm4gc3RhdGljX2Nhc3Q8dW5zaWduZWQgbG9uZyBsb25nPihjb25uZWN0U3RhcnQgKiAxMDAw KTsKK30KKwordW5zaWduZWQgbG9uZyBsb25nIFRpbWluZzo6Y29ubmVjdEVuZCgpIGNvbnN0Cit7 CisgICAgUmVzb3VyY2VMb2FkVGltaW5nKiB0aW1pbmcgPSByZXNvdXJjZUxvYWRUaW1pbmcoKTsK KyAgICBpZiAoIXRpbWluZykKKyAgICAgICAgcmV0dXJuIDA7CisKKyAgICBkb3VibGUgY29ubmVj dEVuZCA9IHRpbWluZy0+Y29ubmVjdEVuZDsKKyAgICBpZiAoY29ubmVjdEVuZCA8IDApCisgICAg ICAgcmV0dXJuIDA7CisKKyAgICByZXR1cm4gc3RhdGljX2Nhc3Q8dW5zaWduZWQgbG9uZyBsb25n Pihjb25uZWN0RW5kICogMTAwMCk7Cit9CisKK3Vuc2lnbmVkIGxvbmcgbG9uZyBUaW1pbmc6OnJl cXVlc3RTdGFydCgpIGNvbnN0Cit7CisgICAgUmVzb3VyY2VMb2FkVGltaW5nKiB0aW1pbmcgPSBy ZXNvdXJjZUxvYWRUaW1pbmcoKTsKKyAgICBpZiAoIXRpbWluZykKKyAgICAgICAgcmV0dXJuIDA7 CisKKyAgICBkb3VibGUgcmVxdWVzdFN0YXJ0ID0gdGltaW5nLT5zZW5kU3RhcnQ7CisgICAgaWYg KHJlcXVlc3RTdGFydCA8IDApCisgICAgICAgcmV0dXJuIDA7CisKKyAgICByZXR1cm4gc3RhdGlj X2Nhc3Q8dW5zaWduZWQgbG9uZyBsb25nPihyZXF1ZXN0U3RhcnQgKiAxMDAwKTsKK30KKwordW5z aWduZWQgbG9uZyBsb25nIFRpbWluZzo6cmVxdWVzdEVuZCgpIGNvbnN0Cit7CisgICAgUmVzb3Vy Y2VMb2FkVGltaW5nKiB0aW1pbmcgPSByZXNvdXJjZUxvYWRUaW1pbmcoKTsKKyAgICBpZiAoIXRp bWluZykKKyAgICAgICAgcmV0dXJuIDA7CisKKyAgICBkb3VibGUgcmVxdWVzdEVuZCA9IHRpbWlu Zy0+c2VuZEVuZDsKKyAgICBpZiAocmVxdWVzdEVuZCA8IDApCisgICAgICAgcmV0dXJuIDA7CisK KyAgICByZXR1cm4gc3RhdGljX2Nhc3Q8dW5zaWduZWQgbG9uZyBsb25nPihyZXF1ZXN0RW5kICog MTAwMCk7Cit9CisKK3Vuc2lnbmVkIGxvbmcgbG9uZyBUaW1pbmc6OnJlc3BvbnNlU3RhcnQoKSBj b25zdAoreworICAgIFJlc291cmNlTG9hZFRpbWluZyogdGltaW5nID0gcmVzb3VyY2VMb2FkVGlt aW5nKCk7CisgICAgaWYgKCF0aW1pbmcpCisgICAgICAgIHJldHVybiAwOworCisgICAgLy8gRklY TUU6IFJlc3BvbnNlIHN0YXJ0IG5lZWRzIHRvIGJlIHRoZSB0aW1lIG9mIHRoZSBmaXJzdCByZWNl aXZlZCBieXRlLgorICAgIC8vIEhvd2V2ZXIsIHRoZSBSZXNvdXJjZUxvYWRUaW1pbmcgQVBJIGN1 cnJlbnRseSBvbmx5IHN1cHBvcnRzIHRoZSB0aW1lCisgICAgLy8gdGhlIGxhc3QgaGVhZGVyIGJ5 dGUgd2FzIHJlY2VpdmVkLiBGb3IgbWFueSByZXNwb25zZXMgd2l0aCByZWFzb25hYmxlCisgICAg Ly8gc2l6ZWQgY29va2llcywgdGhlIEhUVFAgaGVhZGVycyBmaXQgaW50byBhIHNpbmdsZSBwYWNr ZXQgc28gdGhpcyB0aW1lCisgICAgLy8gaXMgYmFzaWNhbGx5IGVxdWl2YWxlbnQuIEJ1dCBmb3Ig c29tZSByZXNwb25zZXMsIHBhcnRpY3VsYXJseSB0aG9zZSB3aXRoCisgICAgLy8gaGVhZGVycyBs YXJnZXIgdGhhbiBhIHNpbmdsZSBwYWNrZXQsIHRoaXMgdGltZSB3aWxsIGJlIHRvbyBsYXRlLgor ICAgIGRvdWJsZSByZXNwb25zZVN0YXJ0ID0gdGltaW5nLT5yZWNlaXZlSGVhZGVyc0VuZDsKKyAg ICBpZiAocmVzcG9uc2VTdGFydCA8IDApCisgICAgICAgcmV0dXJuIDA7CisKKyAgICByZXR1cm4g c3RhdGljX2Nhc3Q8dW5zaWduZWQgbG9uZyBsb25nPihyZXNwb25zZVN0YXJ0ICogMTAwMCk7Cit9 CisKIHVuc2lnbmVkIGxvbmcgbG9uZyBUaW1pbmc6OmxvYWRFdmVudFN0YXJ0KCkgY29uc3QKIHsK ICAgICBpZiAoIW1fZnJhbWUpCkBAIC04NCw2ICsxODQsMTUgQEAgdW5zaWduZWQgbG9uZyBsb25n IFRpbWluZzo6bG9hZEV2ZW50RW5kKCkgY29uc3QKICAgICByZXR1cm4gc3RhdGljX2Nhc3Q8dW5z aWduZWQgbG9uZyBsb25nPihtX2ZyYW1lLT5sb2FkZXIoKS0+ZnJhbWVMb2FkVGltZWxpbmUoKS0+ bG9hZEV2ZW50RW5kICogMTAwMCk7CiB9CiAKK1Jlc291cmNlTG9hZFRpbWluZyogVGltaW5nOjpy ZXNvdXJjZUxvYWRUaW1pbmcoKSBjb25zdAoreworICAgIERvY3VtZW50TG9hZGVyKiBkb2N1bWVu dExvYWRlciA9IG1fZnJhbWUtPmxvYWRlcigpLT5kb2N1bWVudExvYWRlcigpOworICAgIGlmICgh ZG9jdW1lbnRMb2FkZXIpCisgICAgICAgIHJldHVybiAwOworCisgICAgcmV0dXJuIGRvY3VtZW50 TG9hZGVyLT5yZXNwb25zZSgpLnJlc291cmNlTG9hZFRpbWluZygpOworfQorCiB9IC8vIG5hbWVz cGFjZSBXZWJDb3JlCiAKICNlbmRpZiAvLyBFTkFCTEUoV0VCX1RJTUlORykKZGlmZiAtLWdpdCBh L1dlYkNvcmUvcGFnZS9UaW1pbmcuaCBiL1dlYkNvcmUvcGFnZS9UaW1pbmcuaAppbmRleCA0N2Nl NDc4YWU3MDVhYTAxNDA3OGY4MzZmNDYxZDM2ZDcxOWQzMDRkLi4xYjY5ZWU4OWNmZTdlNjBiNzRm YTMxMmYxYWQ0Yzg1ZDkzM2I5N2E1IDEwMDY0NAotLS0gYS9XZWJDb3JlL3BhZ2UvVGltaW5nLmgK KysrIGIvV2ViQ29yZS9wYWdlL1RpbWluZy5oCkBAIC0zOSw2ICszOSw3IEBACiBuYW1lc3BhY2Ug V2ViQ29yZSB7CiAKIGNsYXNzIEZyYW1lOworY2xhc3MgUmVzb3VyY2VMb2FkVGltaW5nOwogCiBj bGFzcyBUaW1pbmcgOiBwdWJsaWMgUmVmQ291bnRlZDxUaW1pbmc+IHsKIHB1YmxpYzoKQEAgLTQ5 LDEyICs1MCwyMSBAQCBwdWJsaWM6CiAKICAgICB1bnNpZ25lZCBsb25nIGxvbmcgbmF2aWdhdGlv blN0YXJ0KCkgY29uc3Q7CiAgICAgdW5zaWduZWQgbG9uZyBsb25nIHVubG9hZEV2ZW50RW5kKCkg Y29uc3Q7CisgICAgdW5zaWduZWQgbG9uZyBsb25nIGRvbWFpbkxvb2t1cFN0YXJ0KCkgY29uc3Q7 CisgICAgdW5zaWduZWQgbG9uZyBsb25nIGRvbWFpbkxvb2t1cEVuZCgpIGNvbnN0OworICAgIHVu c2lnbmVkIGxvbmcgbG9uZyBjb25uZWN0U3RhcnQoKSBjb25zdDsKKyAgICB1bnNpZ25lZCBsb25n IGxvbmcgY29ubmVjdEVuZCgpIGNvbnN0OworICAgIHVuc2lnbmVkIGxvbmcgbG9uZyByZXF1ZXN0 U3RhcnQoKSBjb25zdDsKKyAgICB1bnNpZ25lZCBsb25nIGxvbmcgcmVxdWVzdEVuZCgpIGNvbnN0 OworICAgIHVuc2lnbmVkIGxvbmcgbG9uZyByZXNwb25zZVN0YXJ0KCkgY29uc3Q7CiAgICAgdW5z aWduZWQgbG9uZyBsb25nIGxvYWRFdmVudFN0YXJ0KCkgY29uc3Q7CiAgICAgdW5zaWduZWQgbG9u ZyBsb25nIGxvYWRFdmVudEVuZCgpIGNvbnN0OwogCiBwcml2YXRlOgogICAgIFRpbWluZyhGcmFt ZSopOwogCisgICAgUmVzb3VyY2VMb2FkVGltaW5nKiByZXNvdXJjZUxvYWRUaW1pbmcoKSBjb25z dDsKKwogICAgIEZyYW1lKiBtX2ZyYW1lOwogfTsKIApkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wYWdl L1RpbWluZy5pZGwgYi9XZWJDb3JlL3BhZ2UvVGltaW5nLmlkbAppbmRleCBkYmU5OTZlMjMzYzU4 NTMwYjY0ZjdmNjFiNGE0ZWJmYTQ1NzQ3YzdmLi4xNGM2ZjdmMzNiZjBlNzIxNWVmYzE2OGQ2YjVj YzA4YTViMzZhMjZlIDEwMDY0NAotLS0gYS9XZWJDb3JlL3BhZ2UvVGltaW5nLmlkbAorKysgYi9X ZWJDb3JlL3BhZ2UvVGltaW5nLmlkbApAQCAtMzgsMTMgKzM4LDEzIEBAIG1vZHVsZSB3aW5kb3cg ewogICAgICAgICByZWFkb25seSBhdHRyaWJ1dGUgdW5zaWduZWQgbG9uZyBsb25nIHVubG9hZEV2 ZW50RW5kOwogICAgICAgICAvLyByZWFkb25seSBhdHRyaWJ1dGUgdW5zaWduZWQgbG9uZyBsb25n IHJlZGlyZWN0U3RhcnQ7CiAgICAgICAgIC8vIHJlYWRvbmx5IGF0dHJpYnV0ZSB1bnNpZ25lZCBs b25nIGxvbmcgcmVkaXJlY3RFbmQ7Ci0gICAgICAgIC8vIHJlYWRvbmx5IGF0dHJpYnV0ZSB1bnNp Z25lZCBsb25nIGxvbmcgZG9tYWluTG9va3VwU3RhcnQ7Ci0gICAgICAgIC8vIHJlYWRvbmx5IGF0 dHJpYnV0ZSB1bnNpZ25lZCBsb25nIGxvbmcgZG9tYWluTG9va3VwRW5kOwotICAgICAgICAvLyBy ZWFkb25seSBhdHRyaWJ1dGUgdW5zaWduZWQgbG9uZyBsb25nIGNvbm5lY3RTdGFydDsKLSAgICAg ICAgLy8gcmVhZG9ubHkgYXR0cmlidXRlIHVuc2lnbmVkIGxvbmcgbG9uZyBjb25uZWN0RW5kOwot ICAgICAgICAvLyByZWFkb25seSBhdHRyaWJ1dGUgdW5zaWduZWQgbG9uZyBsb25nIHJlcXVlc3RT dGFydDsKLSAgICAgICAgLy8gcmVhZG9ubHkgYXR0cmlidXRlIHVuc2lnbmVkIGxvbmcgbG9uZyBy ZXF1ZXN0RW5kOwotICAgICAgICAvLyByZWFkb25seSBhdHRyaWJ1dGUgdW5zaWduZWQgbG9uZyBs b25nIHJlc3BvbnNlU3RhcnQ7CisgICAgICAgIHJlYWRvbmx5IGF0dHJpYnV0ZSB1bnNpZ25lZCBs b25nIGxvbmcgZG9tYWluTG9va3VwU3RhcnQ7CisgICAgICAgIHJlYWRvbmx5IGF0dHJpYnV0ZSB1 bnNpZ25lZCBsb25nIGxvbmcgZG9tYWluTG9va3VwRW5kOworICAgICAgICByZWFkb25seSBhdHRy aWJ1dGUgdW5zaWduZWQgbG9uZyBsb25nIGNvbm5lY3RTdGFydDsKKyAgICAgICAgcmVhZG9ubHkg YXR0cmlidXRlIHVuc2lnbmVkIGxvbmcgbG9uZyBjb25uZWN0RW5kOworICAgICAgICByZWFkb25s eSBhdHRyaWJ1dGUgdW5zaWduZWQgbG9uZyBsb25nIHJlcXVlc3RTdGFydDsKKyAgICAgICAgcmVh ZG9ubHkgYXR0cmlidXRlIHVuc2lnbmVkIGxvbmcgbG9uZyByZXF1ZXN0RW5kOworICAgICAgICBy ZWFkb25seSBhdHRyaWJ1dGUgdW5zaWduZWQgbG9uZyBsb25nIHJlc3BvbnNlU3RhcnQ7CiAgICAg ICAgIC8vIHJlYWRvbmx5IGF0dHJpYnV0ZSB1bnNpZ25lZCBsb25nIGxvbmcgcmVzcG9uc2VFbmQ7 CiAgICAgICAgIHJlYWRvbmx5IGF0dHJpYnV0ZSB1bnNpZ25lZCBsb25nIGxvbmcgbG9hZEV2ZW50 U3RhcnQ7CiAgICAgICAgIHJlYWRvbmx5IGF0dHJpYnV0ZSB1bnNpZ25lZCBsb25nIGxvbmcgbG9h ZEV2ZW50RW5kOwo=