170725 2017-04-11 04:25:48 -0700 [WebCore][JSC] ResourceUsageData.{timeOfNextEdenCollection,timeOfNextFullCollection} should be MonotonicTime 2017-04-11 11:39:15 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 ysuzuki ysuzuki benjamin buildbot cdumez cgarcia cmarcelo dbates keith_miller mark.lam msaboff ryanhaddad saam sam oldest_to_newest 1296350 0 ysuzuki 2017-04-11 04:25:48 -0700 ... 1296427 1 306822 ysuzuki 2017-04-11 09:18:25 -0700 Created attachment 306822 Patch 1296428 2 306823 ysuzuki 2017-04-11 09:19:15 -0700 Created attachment 306823 Patch 1296430 3 306823 ysuzuki 2017-04-11 09:22:48 -0700 Comment on attachment 306823 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=306823&action=review > Source/WebCore/page/cocoa/ResourceUsageOverlayCocoa.mm:481 > + MonotonicTime now = MonotonicTime::now(); Inside the timer, we usually use MonotonicTime. Thus, using MonotonicTime to calculate the difference should be appropriate instead of WallTime. 1296476 4 306823 sam 2017-04-11 10:39:41 -0700 Comment on attachment 306823 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=306823&action=review > Source/WTF/wtf/MonotonicTime.h:49 > + constexpr MonotonicTime() { } Want to make a few tests that test constexpr MonotonicTime? 1296488 5 306823 ysuzuki 2017-04-11 11:09:13 -0700 Comment on attachment 306823 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=306823&action=review Thanks! > Source/JavaScriptCore/heap/GCActivityCallback.cpp:81 > + return MonotonicTime::fromRawSeconds(CFRunLoopTimerGetNextFireDate(m_timer.get())); Oops, I need to change this thing to MonotonicTime::now() + (CFRunLoopTimerGetNextFireDate(m_timer.get()) - CFAbsoluteTimeGetCurrent()). >> Source/WTF/wtf/MonotonicTime.h:49 >> + constexpr MonotonicTime() { } > > Want to make a few tests that test constexpr MonotonicTime? Added. 1296497 6 ysuzuki 2017-04-11 11:25:48 -0700 Committed r215241: <http://trac.webkit.org/changeset/215241> 1296501 7 ryanhaddad 2017-04-11 11:34:21 -0700 (In reply to Yusuke Suzuki from comment #6) > Committed r215241: <http://trac.webkit.org/changeset/215241> This change broke macOS and iOS builds: https://build.webkit.org/builders/Apple%20Sierra%20Release%20%28Build%29/builds/694 https://build.webkit.org/builders/Apple%20iOS%2010%20Release%20%28Build%29/builds/543 1296502 8 ysuzuki 2017-04-11 11:39:15 -0700 Committed r215244: <http://trac.webkit.org/changeset/215244> 306822 2017-04-11 09:18:25 -0700 2017-04-11 09:19:13 -0700 Patch bug-170725-20170412011824.patch text/plain 13473 ysuzuki U3VidmVyc2lvbiBSZXZpc2lvbjogMjE1MjMyCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCAy NjczYjZlMTU3NjJlMDBjMzYyZmY0NDc2ZWQ2Nzk3ODNjMTEzMDg5Li5lZjU2OTQyMWY3MmNkMjlk NGUxMmEzYTQ4OGM4ZDliMzVlNzhkNmFjIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs NSArMSwxOCBAQAogMjAxNy0wNC0xMSAgWXVzdWtlIFN1enVraSAgPHV0YXRhbmUudGVhQGdtYWls LmNvbT4KIAorICAgICAgICBbV2ViQ29yZV1bSlNDXSBSZXNvdXJjZVVzYWdlRGF0YS57dGltZU9m TmV4dEVkZW5Db2xsZWN0aW9uLHRpbWVPZk5leHRGdWxsQ29sbGVjdGlvbn0gc2hvdWxkIGJlIE1v bm90b25pY1RpbWUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTE3MDcyNQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIFRoaXMgcGF0Y2ggbWFrZXMgR0NBY3Rpdml0eUNhbGxiYWNrIHJldHVybiBNb25vdG9uaWNU aW1lIGluc3RlYWQgb2YgcmF3IGRvdWJsZSB2YWx1ZS4KKworICAgICAgICAqIGhlYXAvR0NBY3Rp dml0eUNhbGxiYWNrLmNwcDoKKyAgICAgICAgKEpTQzo6R0NBY3Rpdml0eUNhbGxiYWNrOjpuZXh0 RmlyZVRpbWUpOgorICAgICAgICAqIGhlYXAvR0NBY3Rpdml0eUNhbGxiYWNrLmg6CisKKzIwMTct MDQtMTEgIFl1c3VrZSBTdXp1a2kgIDx1dGF0YW5lLnRlYUBnbWFpbC5jb20+CisKICAgICAgICAg VW5yZXZpZXdlZCwgYnVpbGQgZml4IGZvciBXaW5kb3dzIGFmdGVyIHIyMTUyMjggcGFydCAyCiAg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzA3MjMKIApk aWZmIC0tZ2l0IGEvU291cmNlL1dURi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV1RGL0NoYW5nZUxvZwpp bmRleCBjYjRhMTAyNGE2YzA3YzEwYzQzN2VkZDFiOTVkYmQyY2IwMjAxN2JkLi45ZjE3YmQ3MDY0 MGIwYmEzYWUzZDMzOTNjMWNhNTk1MTkzNDU1ZTMwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL0No YW5nZUxvZworKysgYi9Tb3VyY2UvV1RGL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMwIEBACiAyMDE3 LTA0LTExICBZdXN1a2UgU3V6dWtpICA8dXRhdGFuZS50ZWFAZ21haWwuY29tPgogCisgICAgICAg IFtXZWJDb3JlXVtKU0NdIFJlc291cmNlVXNhZ2VEYXRhLnt0aW1lT2ZOZXh0RWRlbkNvbGxlY3Rp b24sdGltZU9mTmV4dEZ1bGxDb2xsZWN0aW9ufSBzaG91bGQgYmUgTW9ub3RvbmljVGltZQorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTcwNzI1CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTWFrZSBNb25vdG9u aWNUaW1lIG1vcmUgY29uc3RleHByIGZyaWVuZGx5IG1haW5seSB0byBhbm5vdGF0ZSBNb25vdG9u aWNUaW1lOjpuYW4oKSBhcyBjb25zdGV4cHIuCisKKyAgICAgICAgKiB3dGYvTW9ub3RvbmljVGlt ZS5oOgorICAgICAgICAoV1RGOjpNb25vdG9uaWNUaW1lOjpNb25vdG9uaWNUaW1lKToKKyAgICAg ICAgKFdURjo6TW9ub3RvbmljVGltZTo6ZnJvbVJhd1NlY29uZHMpOgorICAgICAgICAoV1RGOjpN b25vdG9uaWNUaW1lOjppbmZpbml0eSk6CisgICAgICAgIChXVEY6Ok1vbm90b25pY1RpbWU6Om5h bik6CisgICAgICAgIChXVEY6Ok1vbm90b25pY1RpbWU6OnNlY29uZHNTaW5jZUVwb2NoKToKKyAg ICAgICAgKFdURjo6TW9ub3RvbmljVGltZTo6b3BlcmF0b3IgYm9vbCk6CisgICAgICAgIChXVEY6 Ok1vbm90b25pY1RpbWU6Om9wZXJhdG9yKyk6CisgICAgICAgIChXVEY6Ok1vbm90b25pY1RpbWU6 Om9wZXJhdG9yLSk6CisgICAgICAgIChXVEY6Ok1vbm90b25pY1RpbWU6Om9wZXJhdG9yPT0pOgor ICAgICAgICAoV1RGOjpNb25vdG9uaWNUaW1lOjpvcGVyYXRvciE9KToKKyAgICAgICAgKFdURjo6 TW9ub3RvbmljVGltZTo6b3BlcmF0b3I8KToKKyAgICAgICAgKFdURjo6TW9ub3RvbmljVGltZTo6 b3BlcmF0b3I+KToKKyAgICAgICAgKFdURjo6TW9ub3RvbmljVGltZTo6b3BlcmF0b3I8PSk6Cisg ICAgICAgIChXVEY6Ok1vbm90b25pY1RpbWU6Om9wZXJhdG9yPj0pOgorCisyMDE3LTA0LTExICBZ dXN1a2UgU3V6dWtpICA8dXRhdGFuZS50ZWFAZ21haWwuY29tPgorCiAgICAgICAgIFVucmV2aWV3 ZWQsIGJ1aWxkIGZpeCBmb3IgV2luZG93cyBwb3J0IGFmdGVyIHIyMTUyMjgKICAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3MDcyMwogCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5k ZXggZjlkZGZkODk1ZjY4OGM2OGRkNGY0NmNlMGFhMjFmYjg2MmQ5NjFhZS4uNmM0ODY0NTE5N2Q4 NGVlOGU5MTViMTAxOTM4ZGMzZjVjZjVkNzdhOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv Q2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBA CisyMDE3LTA0LTExICBZdXN1a2UgU3V6dWtpICA8dXRhdGFuZS50ZWFAZ21haWwuY29tPgorCisg ICAgICAgIFtXZWJDb3JlXVtKU0NdIFJlc291cmNlVXNhZ2VEYXRhLnt0aW1lT2ZOZXh0RWRlbkNv bGxlY3Rpb24sdGltZU9mTmV4dEZ1bGxDb2xsZWN0aW9ufSBzaG91bGQgYmUgTW9ub3RvbmljVGlt ZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTcwNzI1 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVXNlIE1v bm90b25pY1RpbWUgaW5zdGVhZCBvZiByYXcgZG91Ymxlcy4KKyAgICAgICAgQ3VycmVudGx5LCBs YXJnZSBwYXJ0IG9mIGRhdGEgc3RydWN0dXJlcyBhbmQgaGVscGVyIGZ1bmN0aW9ucyBhcmUgdGhl IHNhbWUgaW4KKyAgICAgICAgUmVzb3VyY2VVc2FnZU92ZXJsYXlDb2NvYS5tbSBhbmQgUmVzb3Vy Y2VVc2FnZU92ZXJsYXlMaW51eC5jcHAuIFRoaXMgc2hvdWxkIGJlCisgICAgICAgIHVuaWZpZWQg aW4gYSBzZXBhcmF0ZSBwYXRjaC4KKworICAgICAgICAqIHBhZ2UvUmVzb3VyY2VVc2FnZURhdGEu aDoKKyAgICAgICAgKiBwYWdlL2NvY29hL1Jlc291cmNlVXNhZ2VPdmVybGF5Q29jb2EubW06Cisg ICAgICAgIChXZWJDb3JlOjpnY1RpbWVyU3RyaW5nKToKKyAgICAgICAgKFdlYkNvcmU6OlJlc291 cmNlVXNhZ2VPdmVybGF5OjpwbGF0Zm9ybURyYXcpOgorICAgICAgICAqIHBhZ2UvbGludXgvUmVz b3VyY2VVc2FnZU92ZXJsYXlMaW51eC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpnY1RpbWVyU3Ry aW5nKToKKwogMjAxNy0wNC0xMSAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxp YS5jb20+CiAKICAgICAgICAgUkVHUkVTU0lPTihyMjE1MTUzKTogUmVxdWVzdCBBbmltYXRpb24g RnJhbWUgYnJva2VuIHdoZW4gYnVpbGRpbmcgd2l0aG91dCBSRVFVRVNUX0FOSU1BVElPTl9GUkFN RV9ESVNQTEFZX01PTklUT1IKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9oZWFw L0dDQWN0aXZpdHlDYWxsYmFjay5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaGVhcC9HQ0Fj dGl2aXR5Q2FsbGJhY2suY3BwCmluZGV4IGZiZGJkNjg0YThjNzkwZWExNWQ2M2VjYTBlZWY0MmE5 NzQyMmQxNjYuLjAzNTBlNGRiZmVlOWY5MDliMmVmNjc1ZjJlOGY4ZDU0YzMzYjUxNmYgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9oZWFwL0dDQWN0aXZpdHlDYWxsYmFjay5jcHAK KysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2hlYXAvR0NBY3Rpdml0eUNhbGxiYWNrLmNwcApA QCAtNzYsOSArNzYsOSBAQCB2b2lkIEdDQWN0aXZpdHlDYWxsYmFjazo6Y2FuY2VsVGltZXIoKQog ICAgIENGUnVuTG9vcFRpbWVyU2V0TmV4dEZpcmVEYXRlKG1fdGltZXIuZ2V0KCksIENGQWJzb2x1 dGVUaW1lR2V0Q3VycmVudCgpICsgc19kZWNhZGUuc2Vjb25kcygpKTsKIH0KIAotZG91YmxlIEdD QWN0aXZpdHlDYWxsYmFjazo6bmV4dEZpcmVUaW1lKCkKK01vbm90b25pY1RpbWUgR0NBY3Rpdml0 eUNhbGxiYWNrOjpuZXh0RmlyZVRpbWUoKQogewotICAgIHJldHVybiBDRlJ1bkxvb3BUaW1lckdl dE5leHRGaXJlRGF0ZShtX3RpbWVyLmdldCgpKTsKKyAgICByZXR1cm4gTW9ub3RvbmljVGltZTo6 ZnJvbVJhd1NlY29uZHMoQ0ZSdW5Mb29wVGltZXJHZXROZXh0RmlyZURhdGUobV90aW1lci5nZXQo KSkpOwogfQogI2Vsc2UKIHZvaWQgR0NBY3Rpdml0eUNhbGxiYWNrOjpzY2hlZHVsZVRpbWVyKFNl Y29uZHMgbmV3RGVsYXkpCkBAIC0xMDAsOSArMTAwLDcgQEAgdm9pZCBHQ0FjdGl2aXR5Q2FsbGJh Y2s6OmNhbmNlbFRpbWVyKCkKIAogZG91YmxlIEdDQWN0aXZpdHlDYWxsYmFjazo6bmV4dEZpcmVU aW1lKCkKIHsKLSAgICAvLyBGSVhNRTogU2hvdWxkIHJldHVybiBNb25vdG9uaWNUaW1lLgotICAg IC8vIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzA3MjUKLSAgICBy ZXR1cm4gKE1vbm90b25pY1RpbWU6Om5vdygpICsgbV90aW1lci5zZWNvbmRzVW50aWxGaXJlKCkp LnNlY29uZHNTaW5jZUVwb2NoKCkudmFsdWUoKTsKKyAgICByZXR1cm4gTW9ub3RvbmljVGltZTo6 bm93KCkgKyBtX3RpbWVyLnNlY29uZHNVbnRpbEZpcmUoKTsKIH0KICNlbmRpZgogCmRpZmYgLS1n aXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaGVhcC9HQ0FjdGl2aXR5Q2FsbGJhY2suaCBiL1Nv dXJjZS9KYXZhU2NyaXB0Q29yZS9oZWFwL0dDQWN0aXZpdHlDYWxsYmFjay5oCmluZGV4IDA4NTc2 Mjg4ZDZlMzc1ZDA3NjhhYjJhYWI2MDgxNWNmNmU5MzZjOWUuLjRiNDA2NzYxMGMxOTNlNTJlZTFl YmFiNzE0MjcyNWQzNjc0YTQ1ODAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9o ZWFwL0dDQWN0aXZpdHlDYWxsYmFjay5oCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9oZWFw L0dDQWN0aXZpdHlDYWxsYmFjay5oCkBAIC02MCw3ICs2MCw3IEBAIGNsYXNzIEpTX0VYUE9SVF9Q UklWQVRFIEdDQWN0aXZpdHlDYWxsYmFjayA6IHB1YmxpYyBKU1J1bkxvb3BUaW1lciB7CiAKICAg ICBzdGF0aWMgYm9vbCBzX3Nob3VsZENyZWF0ZUdDVGltZXI7CiAKLSAgICBkb3VibGUgbmV4dEZp cmVUaW1lKCk7CisgICAgTW9ub3RvbmljVGltZSBuZXh0RmlyZVRpbWUoKTsKIAogcHJvdGVjdGVk OgogICAgIHZpcnR1YWwgU2Vjb25kcyBsYXN0R0NMZW5ndGgoKSA9IDA7CmRpZmYgLS1naXQgYS9T b3VyY2UvV1RGL3d0Zi9Nb25vdG9uaWNUaW1lLmggYi9Tb3VyY2UvV1RGL3d0Zi9Nb25vdG9uaWNU aW1lLmgKaW5kZXggMTA0MmQ1MjY3ZDkzYjc3MjhjODg5MjhkODQzYWFmNjM5OGIyYTExOS4uMmRj NDdlZDJjMjYwNjhmNzMzMTk0NjkyMWJmYTgyMDA2NWQxY2I1YSAxMDA2NDQKLS0tIGEvU291cmNl L1dURi93dGYvTW9ub3RvbmljVGltZS5oCisrKyBiL1NvdXJjZS9XVEYvd3RmL01vbm90b25pY1Rp bWUuaApAQCAtNDYsMzUgKzQ2LDM0IEBAIGNsYXNzIE1vbm90b25pY1RpbWUgewogICAgIHN0YXRp YyBjb25zdCBDbG9ja1R5cGUgY2xvY2tUeXBlID0gQ2xvY2tUeXBlOjpNb25vdG9uaWM7CiAgICAg CiAgICAgLy8gVGhpcyBpcyB0aGUgZXBvY2guIFNvLCB4LnNlY29uZHNTaW5jZUVwb2NoKCkgc2hv dWxkIGJlIHRoZSBzYW1lIGFzIHggLSBNb25vdG9uaWNUaW1lKCkuCi0gICAgTW9ub3RvbmljVGlt ZSgpIHsgfQorICAgIGNvbnN0ZXhwciBNb25vdG9uaWNUaW1lKCkgeyB9CiAgICAgCiAgICAgLy8g Q2FsbCB0aGlzIGlmIHlvdSBrbm93IGZvciBzdXJlIHRoYXQgdGhlIGRvdWJsZSByZXByZXNlbnRz IHRpbWUgYWNjb3JkaW5nIHRvCiAgICAgLy8gV1RGOjptb25vdG9uaWNhbGx5SW5jcmVhc2luZ1Rp bWUoKS4gSXQgbXVzdCBiZSBpbiBzZWNvbmRzIGFuZCBpdCBtdXN0IGJlIGZyb20gdGhlIHNhbWUg dGltZQogICAgIC8vIHNvdXJjZS4KLSAgICBzdGF0aWMgTW9ub3RvbmljVGltZSBmcm9tUmF3U2Vj b25kcyhkb3VibGUgdmFsdWUpCisgICAgc3RhdGljIGNvbnN0ZXhwciBNb25vdG9uaWNUaW1lIGZy b21SYXdTZWNvbmRzKGRvdWJsZSB2YWx1ZSkKICAgICB7Ci0gICAgICAgIE1vbm90b25pY1RpbWUg cmVzdWx0OwotICAgICAgICByZXN1bHQubV92YWx1ZSA9IHZhbHVlOwotICAgICAgICByZXR1cm4g cmVzdWx0OworICAgICAgICByZXR1cm4gTW9ub3RvbmljVGltZSh2YWx1ZSk7CiAgICAgfQogICAg IAogICAgIFdURl9FWFBPUlRfUFJJVkFURSBzdGF0aWMgTW9ub3RvbmljVGltZSBub3coKTsKICAg ICAKLSAgICBzdGF0aWMgTW9ub3RvbmljVGltZSBpbmZpbml0eSgpIHsgcmV0dXJuIGZyb21SYXdT ZWNvbmRzKHN0ZDo6bnVtZXJpY19saW1pdHM8ZG91YmxlPjo6aW5maW5pdHkoKSk7IH0KKyAgICBz dGF0aWMgY29uc3RleHByIE1vbm90b25pY1RpbWUgaW5maW5pdHkoKSB7IHJldHVybiBmcm9tUmF3 U2Vjb25kcyhzdGQ6Om51bWVyaWNfbGltaXRzPGRvdWJsZT46OmluZmluaXR5KCkpOyB9CisgICAg c3RhdGljIGNvbnN0ZXhwciBNb25vdG9uaWNUaW1lIG5hbigpIHsgcmV0dXJuIGZyb21SYXdTZWNv bmRzKHN0ZDo6bnVtZXJpY19saW1pdHM8ZG91YmxlPjo6cXVpZXRfTmFOKCkpOyB9CiAKLSAgICBT ZWNvbmRzIHNlY29uZHNTaW5jZUVwb2NoKCkgY29uc3QgeyByZXR1cm4gU2Vjb25kcyhtX3ZhbHVl KTsgfQorICAgIGNvbnN0ZXhwciBTZWNvbmRzIHNlY29uZHNTaW5jZUVwb2NoKCkgY29uc3QgeyBy ZXR1cm4gU2Vjb25kcyhtX3ZhbHVlKTsgfQogICAgIAogICAgIE1vbm90b25pY1RpbWUgYXBwcm94 aW1hdGVNb25vdG9uaWNUaW1lKCkgY29uc3QgeyByZXR1cm4gKnRoaXM7IH0KICAgICBXVEZfRVhQ T1JUX1BSSVZBVEUgV2FsbFRpbWUgYXBwcm94aW1hdGVXYWxsVGltZSgpIGNvbnN0OwogICAgIAot ICAgIGV4cGxpY2l0IG9wZXJhdG9yIGJvb2woKSBjb25zdCB7IHJldHVybiAhIW1fdmFsdWU7IH0K KyAgICBleHBsaWNpdCBjb25zdGV4cHIgb3BlcmF0b3IgYm9vbCgpIGNvbnN0IHsgcmV0dXJuICEh bV92YWx1ZTsgfQogICAgIAotICAgIE1vbm90b25pY1RpbWUgb3BlcmF0b3IrKFNlY29uZHMgb3Ro ZXIpIGNvbnN0CisgICAgY29uc3RleHByIE1vbm90b25pY1RpbWUgb3BlcmF0b3IrKFNlY29uZHMg b3RoZXIpIGNvbnN0CiAgICAgewogICAgICAgICByZXR1cm4gZnJvbVJhd1NlY29uZHMobV92YWx1 ZSArIG90aGVyLnZhbHVlKCkpOwogICAgIH0KICAgICAKLSAgICBNb25vdG9uaWNUaW1lIG9wZXJh dG9yLShTZWNvbmRzIG90aGVyKSBjb25zdAorICAgIGNvbnN0ZXhwciBNb25vdG9uaWNUaW1lIG9w ZXJhdG9yLShTZWNvbmRzIG90aGVyKSBjb25zdAogICAgIHsKICAgICAgICAgcmV0dXJuIGZyb21S YXdTZWNvbmRzKG1fdmFsdWUgLSBvdGhlci52YWx1ZSgpKTsKICAgICB9CkBAIC04Niw3ICs4NSw3 IEBAIGNsYXNzIE1vbm90b25pY1RpbWUgewogICAgIAogICAgIC8vIFRpbWUgaXMgYSBzY2FsYXIg YW5kIHNjYWxhcnMgY2FuIGJlIG5lZ2F0ZWQgYXMgdGhpcyBjb3VsZCBhcmlzZSBmcm9tIGFsZ2Vi cmFpYwogICAgIC8vIHRyYW5zZm9ybWF0aW9ucy4gU28sIHdlIGFsbG93IGl0LgotICAgIE1vbm90 b25pY1RpbWUgb3BlcmF0b3ItKCkgY29uc3QKKyAgICBjb25zdGV4cHIgTW9ub3RvbmljVGltZSBv cGVyYXRvci0oKSBjb25zdAogICAgIHsKICAgICAgICAgcmV0dXJuIGZyb21SYXdTZWNvbmRzKC1t X3ZhbHVlKTsKICAgICB9CkBAIC0xMDEsMzcgKzEwMCwzNyBAQCBjbGFzcyBNb25vdG9uaWNUaW1l IHsKICAgICAgICAgcmV0dXJuICp0aGlzID0gKnRoaXMgLSBvdGhlcjsKICAgICB9CiAgICAgCi0g ICAgU2Vjb25kcyBvcGVyYXRvci0oTW9ub3RvbmljVGltZSBvdGhlcikgY29uc3QKKyAgICBjb25z dGV4cHIgU2Vjb25kcyBvcGVyYXRvci0oTW9ub3RvbmljVGltZSBvdGhlcikgY29uc3QKICAgICB7 CiAgICAgICAgIHJldHVybiBTZWNvbmRzKG1fdmFsdWUgLSBvdGhlci5tX3ZhbHVlKTsKICAgICB9 CiAgICAgCi0gICAgYm9vbCBvcGVyYXRvcj09KE1vbm90b25pY1RpbWUgb3RoZXIpIGNvbnN0Cisg ICAgY29uc3RleHByIGJvb2wgb3BlcmF0b3I9PShNb25vdG9uaWNUaW1lIG90aGVyKSBjb25zdAog ICAgIHsKICAgICAgICAgcmV0dXJuIG1fdmFsdWUgPT0gb3RoZXIubV92YWx1ZTsKICAgICB9CiAg ICAgCi0gICAgYm9vbCBvcGVyYXRvciE9KE1vbm90b25pY1RpbWUgb3RoZXIpIGNvbnN0CisgICAg Y29uc3RleHByIGJvb2wgb3BlcmF0b3IhPShNb25vdG9uaWNUaW1lIG90aGVyKSBjb25zdAogICAg IHsKICAgICAgICAgcmV0dXJuIG1fdmFsdWUgIT0gb3RoZXIubV92YWx1ZTsKICAgICB9CiAgICAg Ci0gICAgYm9vbCBvcGVyYXRvcjwoTW9ub3RvbmljVGltZSBvdGhlcikgY29uc3QKKyAgICBjb25z dGV4cHIgYm9vbCBvcGVyYXRvcjwoTW9ub3RvbmljVGltZSBvdGhlcikgY29uc3QKICAgICB7CiAg ICAgICAgIHJldHVybiBtX3ZhbHVlIDwgb3RoZXIubV92YWx1ZTsKICAgICB9CiAgICAgCi0gICAg Ym9vbCBvcGVyYXRvcj4oTW9ub3RvbmljVGltZSBvdGhlcikgY29uc3QKKyAgICBjb25zdGV4cHIg Ym9vbCBvcGVyYXRvcj4oTW9ub3RvbmljVGltZSBvdGhlcikgY29uc3QKICAgICB7CiAgICAgICAg IHJldHVybiBtX3ZhbHVlID4gb3RoZXIubV92YWx1ZTsKICAgICB9CiAgICAgCi0gICAgYm9vbCBv cGVyYXRvcjw9KE1vbm90b25pY1RpbWUgb3RoZXIpIGNvbnN0CisgICAgY29uc3RleHByIGJvb2wg b3BlcmF0b3I8PShNb25vdG9uaWNUaW1lIG90aGVyKSBjb25zdAogICAgIHsKICAgICAgICAgcmV0 dXJuIG1fdmFsdWUgPD0gb3RoZXIubV92YWx1ZTsKICAgICB9CiAgICAgCi0gICAgYm9vbCBvcGVy YXRvcj49KE1vbm90b25pY1RpbWUgb3RoZXIpIGNvbnN0CisgICAgY29uc3RleHByIGJvb2wgb3Bl cmF0b3I+PShNb25vdG9uaWNUaW1lIG90aGVyKSBjb25zdAogICAgIHsKICAgICAgICAgcmV0dXJu IG1fdmFsdWUgPj0gb3RoZXIubV92YWx1ZTsKICAgICB9CkBAIC0xMzksNiArMTM4LDExIEBAIGNs YXNzIE1vbm90b25pY1RpbWUgewogICAgIFdURl9FWFBPUlRfUFJJVkFURSB2b2lkIGR1bXAoUHJp bnRTdHJlYW0mKSBjb25zdDsKIAogcHJpdmF0ZToKKyAgICBjb25zdGV4cHIgTW9ub3RvbmljVGlt ZShkb3VibGUgcmF3VmFsdWUpCisgICAgICAgIDogbV92YWx1ZShyYXdWYWx1ZSkKKyAgICB7Cisg ICAgfQorCiAgICAgZG91YmxlIG1fdmFsdWUgeyAwIH07CiB9OwogCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9wYWdlL1Jlc291cmNlVXNhZ2VEYXRhLmggYi9Tb3VyY2UvV2ViQ29yZS9wYWdl L1Jlc291cmNlVXNhZ2VEYXRhLmgKaW5kZXggNzIzNjk2ZjE1NDI0NmMwOTAwMjZkZDRkMmZlNDEw YjA1YjU1ZmEyYS4uMDJjM2JhMTQ4M2MyNjJmMjIzNDc5NTI4YjFlNmZlOGEyMmQzMDdkMCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9SZXNvdXJjZVVzYWdlRGF0YS5oCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3BhZ2UvUmVzb3VyY2VVc2FnZURhdGEuaApAQCAtMjgsNiArMjgsNyBAQAog I2lmIEVOQUJMRShSRVNPVVJDRV9VU0FHRSkKIAogI2luY2x1ZGUgPGFycmF5PgorI2luY2x1ZGUg PHd0Zi9Nb25vdG9uaWNUaW1lLmg+CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIApAQCAtNjgsOCAr NjksOCBAQCBzdHJ1Y3QgUmVzb3VyY2VVc2FnZURhdGEgewogICAgIHNpemVfdCB0b3RhbERpcnR5 U2l6ZSB7IDAgfTsKICAgICBzaXplX3QgdG90YWxFeHRlcm5hbFNpemUgeyAwIH07CiAgICAgc3Rk OjphcnJheTxNZW1vcnlDYXRlZ29yeUluZm8sIE1lbW9yeUNhdGVnb3J5OjpOdW1iZXJPZkNhdGVn b3JpZXM+IGNhdGVnb3JpZXM7Ci0gICAgZG91YmxlIHRpbWVPZk5leHRFZGVuQ29sbGVjdGlvbiB7 IDAgfTsKLSAgICBkb3VibGUgdGltZU9mTmV4dEZ1bGxDb2xsZWN0aW9uIHsgMCB9OworICAgIE1v bm90b25pY1RpbWUgdGltZU9mTmV4dEVkZW5Db2xsZWN0aW9uIHsgTW9ub3RvbmljVGltZTo6bmFu KCkgfTsKKyAgICBNb25vdG9uaWNUaW1lIHRpbWVPZk5leHRGdWxsQ29sbGVjdGlvbiB7IE1vbm90 b25pY1RpbWU6Om5hbigpIH07CiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL2NvY29hL1Jlc291cmNlVXNhZ2VPdmVybGF5Q29jb2Eu bW0gYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL2NvY29hL1Jlc291cmNlVXNhZ2VPdmVybGF5Q29jb2Eu bW0KaW5kZXggMzY2NjAxZTM5MGNhNTEwZGM5ODljYzc0YThmNDhhZDQ1YjA4NTA4My4uNGY2MTRk YjUzYWU0MzIxYjg4NjYwMmNkOWYyZGZhN2ZmNDJlMTg5ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcGFnZS9jb2NvYS9SZXNvdXJjZVVzYWdlT3ZlcmxheUNvY29hLm1tCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BhZ2UvY29jb2EvUmVzb3VyY2VVc2FnZU92ZXJsYXlDb2NvYS5tbQpAQCAtMTU0 LDggKzE1NCw4IEBAIHN0cnVjdCBIaXN0b3JpY1Jlc291cmNlVXNhZ2VEYXRhIHsKICAgICBSaW5n QnVmZmVyPHNpemVfdD4gdG90YWxFeHRlcm5hbFNpemU7CiAgICAgUmluZ0J1ZmZlcjxzaXplX3Q+ IGdjSGVhcFNpemU7CiAgICAgc3RkOjphcnJheTxIaXN0b3JpY01lbW9yeUNhdGVnb3J5SW5mbywg TWVtb3J5Q2F0ZWdvcnk6Ok51bWJlck9mQ2F0ZWdvcmllcz4gY2F0ZWdvcmllczsKLSAgICBkb3Vi bGUgdGltZU9mTmV4dEVkZW5Db2xsZWN0aW9uIHsgMCB9OwotICAgIGRvdWJsZSB0aW1lT2ZOZXh0 RnVsbENvbGxlY3Rpb24geyAwIH07CisgICAgTW9ub3RvbmljVGltZSB0aW1lT2ZOZXh0RWRlbkNv bGxlY3Rpb24geyBNb25vdG9uaWNUaW1lOjpuYW4oKSB9OworICAgIE1vbm90b25pY1RpbWUgdGlt ZU9mTmV4dEZ1bGxDb2xsZWN0aW9uIHsgTW9ub3RvbmljVGltZTo6bmFuKCkgfTsKIH07CiAKIEhp c3RvcmljUmVzb3VyY2VVc2FnZURhdGE6Okhpc3RvcmljUmVzb3VyY2VVc2FnZURhdGEoKQpAQCAt NDMzLDExICs0MzMsMTEgQEAgc3RhdGljIFN0cmluZyBmb3JtYXRCeXRlTnVtYmVyKHNpemVfdCBu dW1iZXIpCiAgICAgcmV0dXJuIFN0cmluZzo6Zm9ybWF0KCIlbHUiLCBudW1iZXIpOwogfQogCi1z dGF0aWMgU3RyaW5nIGdjVGltZXJTdHJpbmcoZG91YmxlIHRpbWVyRmlyZURhdGUsIGRvdWJsZSBu b3cpCitzdGF0aWMgU3RyaW5nIGdjVGltZXJTdHJpbmcoTW9ub3RvbmljVGltZSB0aW1lckZpcmVE YXRlLCBNb25vdG9uaWNUaW1lIG5vdykKIHsKLSAgICBpZiAoIXRpbWVyRmlyZURhdGUpCisgICAg aWYgKHN0ZDo6aXNuYW4odGltZXJGaXJlRGF0ZSkpCiAgICAgICAgIHJldHVybiBBU0NJSUxpdGVy YWwoIltub3Qgc2NoZWR1bGVkXSIpOwotICAgIHJldHVybiBTdHJpbmc6OmZvcm1hdCgiJWciLCB0 aW1lckZpcmVEYXRlIC0gbm93KTsKKyAgICByZXR1cm4gU3RyaW5nOjpmb3JtYXQoIiVnIiwgKHRp bWVyRmlyZURhdGUgLSBub3cpLnNlY29uZHMoKSk7CiB9CiAKIHZvaWQgUmVzb3VyY2VVc2FnZU92 ZXJsYXk6OnBsYXRmb3JtRHJhdyhDR0NvbnRleHRSZWYgY29udGV4dCkKQEAgLTQ3OCw3ICs0Nzgs NyBAQCB2b2lkIFJlc291cmNlVXNhZ2VPdmVybGF5OjpwbGF0Zm9ybURyYXcoQ0dDb250ZXh0UmVm IGNvbnRleHQpCiAgICAgfQogICAgIHkgLT0gNTsKIAotICAgIGRvdWJsZSBub3cgPSBXVEY6OmN1 cnJlbnRUaW1lKCk7CisgICAgTW9ub3RvbmljVGltZSBub3cgPSBNb25vdG9uaWNUaW1lOjpub3co KTsKICAgICBzaG93VGV4dChjb250ZXh0LCAxMCwgeSArIDEwLCBjb2xvckZvckxhYmVscywgU3Ry aW5nOjpmb3JtYXQoIiAgICBFZGVuIEdDOiAlcyIsIGdjVGltZXJTdHJpbmcoZGF0YS50aW1lT2ZO ZXh0RWRlbkNvbGxlY3Rpb24sIG5vdykuYXNjaWkoKS5kYXRhKCkpKTsKICAgICBzaG93VGV4dChj b250ZXh0LCAxMCwgeSArIDIwLCBjb2xvckZvckxhYmVscywgU3RyaW5nOjpmb3JtYXQoIiAgICBG dWxsIEdDOiAlcyIsIGdjVGltZXJTdHJpbmcoZGF0YS50aW1lT2ZOZXh0RnVsbENvbGxlY3Rpb24s IG5vdykuYXNjaWkoKS5kYXRhKCkpKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFn ZS9saW51eC9SZXNvdXJjZVVzYWdlT3ZlcmxheUxpbnV4LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3Bh Z2UvbGludXgvUmVzb3VyY2VVc2FnZU92ZXJsYXlMaW51eC5jcHAKaW5kZXggY2ZmNjNlMDBlYTAy ZDI5OGI0YmZhNGM5N2JjYzliOTgwNDAxZmQ4My4uZGQ3OGNhMDJmNmVjYzYzNTZiMmJkNDYxMDc1 OWQ1OWY3YjE5YTQ1MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9saW51eC9SZXNv dXJjZVVzYWdlT3ZlcmxheUxpbnV4LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL2xpbnV4 L1Jlc291cmNlVXNhZ2VPdmVybGF5TGludXguY3BwCkBAIC01OSwxMSArNTksMTEgQEAgc3RhdGlj IFN0cmluZyBmb3JtYXRCeXRlTnVtYmVyKHNpemVfdCBudW1iZXIpCiAgICAgcmV0dXJuIFN0cmlu Zzo6Zm9ybWF0KCIlbHUiLCBudW1iZXIpOwogfQogCi1zdGF0aWMgU3RyaW5nIGdjVGltZXJTdHJp bmcoZG91YmxlIHRpbWVyRmlyZURhdGUsIGRvdWJsZSBub3cpCitzdGF0aWMgU3RyaW5nIGdjVGlt ZXJTdHJpbmcoTW9ub3RvbmljVGltZSB0aW1lckZpcmVEYXRlLCBNb25vdG9uaWNUaW1lIG5vdykK IHsKLSAgICBpZiAoIXRpbWVyRmlyZURhdGUpCisgICAgaWYgKHN0ZDo6aXNuYW4odGltZXJGaXJl RGF0ZSkpCiAgICAgICAgIHJldHVybiBBU0NJSUxpdGVyYWwoIltub3Qgc2NoZWR1bGVkXSIpOwot ICAgIHJldHVybiBTdHJpbmc6OmZvcm1hdCgiJWciLCB0aW1lckZpcmVEYXRlIC0gbm93KTsKKyAg ICByZXR1cm4gU3RyaW5nOjpmb3JtYXQoIiVnIiwgKHRpbWVyRmlyZURhdGUgLSBub3cpLnNlY29u ZHMoKSk7CiB9CiAKIHN0YXRpYyBjb25zdCBmbG9hdCBnRm9udFNpemUgPSAxNDsKQEAgLTExMiw3 ICsxMTIsNyBAQCBjbGFzcyBSZXNvdXJjZVVzYWdlT3ZlcmxheVBhaW50ZXIgZmluYWwgOiBwdWJs aWMgR3JhcGhpY3NMYXllckNsaWVudCB7CiAgICAgICAgIGNvbnRleHQuZHJhd1RleHQobV90ZXh0 Rm9udCwgVGV4dFJ1bihzdHJpbmcpLCBwb3NpdGlvbik7CiAgICAgICAgIHBvc2l0aW9uLm1vdmUo MCwgZ0ZvbnRTaXplICsgMik7CiAKLSAgICAgICAgZG91YmxlIG5vdyA9IFdURjo6Y3VycmVudFRp bWUoKTsKKyAgICAgICAgTW9ub3RvbmljVGltZSBub3cgPSBNb25vdG9uaWNUaW1lOjpub3coKTsK ICAgICAgICAgc3RyaW5nID0gIkVkZW4gR0M6ICIgKyBnY1RpbWVyU3RyaW5nKGdEYXRhLnRpbWVP Zk5leHRFZGVuQ29sbGVjdGlvbiwgbm93KTsKICAgICAgICAgY29udGV4dC5kcmF3VGV4dChtX3Rl eHRGb250LCBUZXh0UnVuKHN0cmluZyksIHBvc2l0aW9uKTsKICAgICAgICAgcG9zaXRpb24ubW92 ZSgwLCBnRm9udFNpemUgKyAyKTsK 306823 2017-04-11 09:19:15 -0700 2017-04-11 10:39:41 -0700 Patch bug-170725-20170412011913.patch text/plain 13562 ysuzuki U3VidmVyc2lvbiBSZXZpc2lvbjogMjE1MjMyCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCAy NjczYjZlMTU3NjJlMDBjMzYyZmY0NDc2ZWQ2Nzk3ODNjMTEzMDg5Li5lZjU2OTQyMWY3MmNkMjlk NGUxMmEzYTQ4OGM4ZDliMzVlNzhkNmFjIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs NSArMSwxOCBAQAogMjAxNy0wNC0xMSAgWXVzdWtlIFN1enVraSAgPHV0YXRhbmUudGVhQGdtYWls LmNvbT4KIAorICAgICAgICBbV2ViQ29yZV1bSlNDXSBSZXNvdXJjZVVzYWdlRGF0YS57dGltZU9m TmV4dEVkZW5Db2xsZWN0aW9uLHRpbWVPZk5leHRGdWxsQ29sbGVjdGlvbn0gc2hvdWxkIGJlIE1v bm90b25pY1RpbWUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTE3MDcyNQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIFRoaXMgcGF0Y2ggbWFrZXMgR0NBY3Rpdml0eUNhbGxiYWNrIHJldHVybiBNb25vdG9uaWNU aW1lIGluc3RlYWQgb2YgcmF3IGRvdWJsZSB2YWx1ZS4KKworICAgICAgICAqIGhlYXAvR0NBY3Rp dml0eUNhbGxiYWNrLmNwcDoKKyAgICAgICAgKEpTQzo6R0NBY3Rpdml0eUNhbGxiYWNrOjpuZXh0 RmlyZVRpbWUpOgorICAgICAgICAqIGhlYXAvR0NBY3Rpdml0eUNhbGxiYWNrLmg6CisKKzIwMTct MDQtMTEgIFl1c3VrZSBTdXp1a2kgIDx1dGF0YW5lLnRlYUBnbWFpbC5jb20+CisKICAgICAgICAg VW5yZXZpZXdlZCwgYnVpbGQgZml4IGZvciBXaW5kb3dzIGFmdGVyIHIyMTUyMjggcGFydCAyCiAg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzA3MjMKIApk aWZmIC0tZ2l0IGEvU291cmNlL1dURi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV1RGL0NoYW5nZUxvZwpp bmRleCBjYjRhMTAyNGE2YzA3YzEwYzQzN2VkZDFiOTVkYmQyY2IwMjAxN2JkLi45ZjE3YmQ3MDY0 MGIwYmEzYWUzZDMzOTNjMWNhNTk1MTkzNDU1ZTMwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL0No YW5nZUxvZworKysgYi9Tb3VyY2UvV1RGL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMwIEBACiAyMDE3 LTA0LTExICBZdXN1a2UgU3V6dWtpICA8dXRhdGFuZS50ZWFAZ21haWwuY29tPgogCisgICAgICAg IFtXZWJDb3JlXVtKU0NdIFJlc291cmNlVXNhZ2VEYXRhLnt0aW1lT2ZOZXh0RWRlbkNvbGxlY3Rp b24sdGltZU9mTmV4dEZ1bGxDb2xsZWN0aW9ufSBzaG91bGQgYmUgTW9ub3RvbmljVGltZQorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTcwNzI1CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTWFrZSBNb25vdG9u aWNUaW1lIG1vcmUgY29uc3RleHByIGZyaWVuZGx5IG1haW5seSB0byBhbm5vdGF0ZSBNb25vdG9u aWNUaW1lOjpuYW4oKSBhcyBjb25zdGV4cHIuCisKKyAgICAgICAgKiB3dGYvTW9ub3RvbmljVGlt ZS5oOgorICAgICAgICAoV1RGOjpNb25vdG9uaWNUaW1lOjpNb25vdG9uaWNUaW1lKToKKyAgICAg ICAgKFdURjo6TW9ub3RvbmljVGltZTo6ZnJvbVJhd1NlY29uZHMpOgorICAgICAgICAoV1RGOjpN b25vdG9uaWNUaW1lOjppbmZpbml0eSk6CisgICAgICAgIChXVEY6Ok1vbm90b25pY1RpbWU6Om5h bik6CisgICAgICAgIChXVEY6Ok1vbm90b25pY1RpbWU6OnNlY29uZHNTaW5jZUVwb2NoKToKKyAg ICAgICAgKFdURjo6TW9ub3RvbmljVGltZTo6b3BlcmF0b3IgYm9vbCk6CisgICAgICAgIChXVEY6 Ok1vbm90b25pY1RpbWU6Om9wZXJhdG9yKyk6CisgICAgICAgIChXVEY6Ok1vbm90b25pY1RpbWU6 Om9wZXJhdG9yLSk6CisgICAgICAgIChXVEY6Ok1vbm90b25pY1RpbWU6Om9wZXJhdG9yPT0pOgor ICAgICAgICAoV1RGOjpNb25vdG9uaWNUaW1lOjpvcGVyYXRvciE9KToKKyAgICAgICAgKFdURjo6 TW9ub3RvbmljVGltZTo6b3BlcmF0b3I8KToKKyAgICAgICAgKFdURjo6TW9ub3RvbmljVGltZTo6 b3BlcmF0b3I+KToKKyAgICAgICAgKFdURjo6TW9ub3RvbmljVGltZTo6b3BlcmF0b3I8PSk6Cisg ICAgICAgIChXVEY6Ok1vbm90b25pY1RpbWU6Om9wZXJhdG9yPj0pOgorCisyMDE3LTA0LTExICBZ dXN1a2UgU3V6dWtpICA8dXRhdGFuZS50ZWFAZ21haWwuY29tPgorCiAgICAgICAgIFVucmV2aWV3 ZWQsIGJ1aWxkIGZpeCBmb3IgV2luZG93cyBwb3J0IGFmdGVyIHIyMTUyMjgKICAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3MDcyMwogCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5k ZXggZjlkZGZkODk1ZjY4OGM2OGRkNGY0NmNlMGFhMjFmYjg2MmQ5NjFhZS4uNmM0ODY0NTE5N2Q4 NGVlOGU5MTViMTAxOTM4ZGMzZjVjZjVkNzdhOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv Q2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBA CisyMDE3LTA0LTExICBZdXN1a2UgU3V6dWtpICA8dXRhdGFuZS50ZWFAZ21haWwuY29tPgorCisg ICAgICAgIFtXZWJDb3JlXVtKU0NdIFJlc291cmNlVXNhZ2VEYXRhLnt0aW1lT2ZOZXh0RWRlbkNv bGxlY3Rpb24sdGltZU9mTmV4dEZ1bGxDb2xsZWN0aW9ufSBzaG91bGQgYmUgTW9ub3RvbmljVGlt ZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTcwNzI1 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVXNlIE1v bm90b25pY1RpbWUgaW5zdGVhZCBvZiByYXcgZG91Ymxlcy4KKyAgICAgICAgQ3VycmVudGx5LCBs YXJnZSBwYXJ0IG9mIGRhdGEgc3RydWN0dXJlcyBhbmQgaGVscGVyIGZ1bmN0aW9ucyBhcmUgdGhl IHNhbWUgaW4KKyAgICAgICAgUmVzb3VyY2VVc2FnZU92ZXJsYXlDb2NvYS5tbSBhbmQgUmVzb3Vy Y2VVc2FnZU92ZXJsYXlMaW51eC5jcHAuIFRoaXMgc2hvdWxkIGJlCisgICAgICAgIHVuaWZpZWQg aW4gYSBzZXBhcmF0ZSBwYXRjaC4KKworICAgICAgICAqIHBhZ2UvUmVzb3VyY2VVc2FnZURhdGEu aDoKKyAgICAgICAgKiBwYWdlL2NvY29hL1Jlc291cmNlVXNhZ2VPdmVybGF5Q29jb2EubW06Cisg ICAgICAgIChXZWJDb3JlOjpnY1RpbWVyU3RyaW5nKToKKyAgICAgICAgKFdlYkNvcmU6OlJlc291 cmNlVXNhZ2VPdmVybGF5OjpwbGF0Zm9ybURyYXcpOgorICAgICAgICAqIHBhZ2UvbGludXgvUmVz b3VyY2VVc2FnZU92ZXJsYXlMaW51eC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpnY1RpbWVyU3Ry aW5nKToKKwogMjAxNy0wNC0xMSAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxp YS5jb20+CiAKICAgICAgICAgUkVHUkVTU0lPTihyMjE1MTUzKTogUmVxdWVzdCBBbmltYXRpb24g RnJhbWUgYnJva2VuIHdoZW4gYnVpbGRpbmcgd2l0aG91dCBSRVFVRVNUX0FOSU1BVElPTl9GUkFN RV9ESVNQTEFZX01PTklUT1IKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9oZWFw L0dDQWN0aXZpdHlDYWxsYmFjay5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaGVhcC9HQ0Fj dGl2aXR5Q2FsbGJhY2suY3BwCmluZGV4IGZiZGJkNjg0YThjNzkwZWExNWQ2M2VjYTBlZWY0MmE5 NzQyMmQxNjYuLmJiZTY2YTNiZjU4NDYyMGFhN2U3ODIzMGI2Yzk1OTQxYmE4YjdhMjIgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9oZWFwL0dDQWN0aXZpdHlDYWxsYmFjay5jcHAK KysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2hlYXAvR0NBY3Rpdml0eUNhbGxiYWNrLmNwcApA QCAtNzYsOSArNzYsOSBAQCB2b2lkIEdDQWN0aXZpdHlDYWxsYmFjazo6Y2FuY2VsVGltZXIoKQog ICAgIENGUnVuTG9vcFRpbWVyU2V0TmV4dEZpcmVEYXRlKG1fdGltZXIuZ2V0KCksIENGQWJzb2x1 dGVUaW1lR2V0Q3VycmVudCgpICsgc19kZWNhZGUuc2Vjb25kcygpKTsKIH0KIAotZG91YmxlIEdD QWN0aXZpdHlDYWxsYmFjazo6bmV4dEZpcmVUaW1lKCkKK01vbm90b25pY1RpbWUgR0NBY3Rpdml0 eUNhbGxiYWNrOjpuZXh0RmlyZVRpbWUoKQogewotICAgIHJldHVybiBDRlJ1bkxvb3BUaW1lckdl dE5leHRGaXJlRGF0ZShtX3RpbWVyLmdldCgpKTsKKyAgICByZXR1cm4gTW9ub3RvbmljVGltZTo6 ZnJvbVJhd1NlY29uZHMoQ0ZSdW5Mb29wVGltZXJHZXROZXh0RmlyZURhdGUobV90aW1lci5nZXQo KSkpOwogfQogI2Vsc2UKIHZvaWQgR0NBY3Rpdml0eUNhbGxiYWNrOjpzY2hlZHVsZVRpbWVyKFNl Y29uZHMgbmV3RGVsYXkpCkBAIC05OCwxMSArOTgsOSBAQCB2b2lkIEdDQWN0aXZpdHlDYWxsYmFj azo6Y2FuY2VsVGltZXIoKQogICAgIG1fdGltZXIuc3RhcnRPbmVTaG90KHNfZGVjYWRlKTsKIH0K IAotZG91YmxlIEdDQWN0aXZpdHlDYWxsYmFjazo6bmV4dEZpcmVUaW1lKCkKK01vbm90b25pY1Rp bWUgR0NBY3Rpdml0eUNhbGxiYWNrOjpuZXh0RmlyZVRpbWUoKQogewotICAgIC8vIEZJWE1FOiBT aG91bGQgcmV0dXJuIE1vbm90b25pY1RpbWUuCi0gICAgLy8gaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTE3MDcyNQotICAgIHJldHVybiAoTW9ub3RvbmljVGltZTo6bm93 KCkgKyBtX3RpbWVyLnNlY29uZHNVbnRpbEZpcmUoKSkuc2Vjb25kc1NpbmNlRXBvY2goKS52YWx1 ZSgpOworICAgIHJldHVybiBNb25vdG9uaWNUaW1lOjpub3coKSArIG1fdGltZXIuc2Vjb25kc1Vu dGlsRmlyZSgpOwogfQogI2VuZGlmCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9oZWFwL0dDQWN0aXZpdHlDYWxsYmFjay5oIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2hlYXAv R0NBY3Rpdml0eUNhbGxiYWNrLmgKaW5kZXggMDg1NzYyODhkNmUzNzVkMDc2OGFiMmFhYjYwODE1 Y2Y2ZTkzNmM5ZS4uNGI0MDY3NjEwYzE5M2U1MmVlMWViYWI3MTQyNzI1ZDM2NzRhNDU4MCAxMDA2 NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2hlYXAvR0NBY3Rpdml0eUNhbGxiYWNrLmgK KysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2hlYXAvR0NBY3Rpdml0eUNhbGxiYWNrLmgKQEAg LTYwLDcgKzYwLDcgQEAgY2xhc3MgSlNfRVhQT1JUX1BSSVZBVEUgR0NBY3Rpdml0eUNhbGxiYWNr IDogcHVibGljIEpTUnVuTG9vcFRpbWVyIHsKIAogICAgIHN0YXRpYyBib29sIHNfc2hvdWxkQ3Jl YXRlR0NUaW1lcjsKIAotICAgIGRvdWJsZSBuZXh0RmlyZVRpbWUoKTsKKyAgICBNb25vdG9uaWNU aW1lIG5leHRGaXJlVGltZSgpOwogCiBwcm90ZWN0ZWQ6CiAgICAgdmlydHVhbCBTZWNvbmRzIGxh c3RHQ0xlbmd0aCgpID0gMDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvd3RmL01vbm90b25pY1Rp bWUuaCBiL1NvdXJjZS9XVEYvd3RmL01vbm90b25pY1RpbWUuaAppbmRleCAxMDQyZDUyNjdkOTNi NzcyOGM4ODkyOGQ4NDNhYWY2Mzk4YjJhMTE5Li4yZGM0N2VkMmMyNjA2OGY3MzMxOTQ2OTIxYmZh ODIwMDY1ZDFjYjVhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL3d0Zi9Nb25vdG9uaWNUaW1lLmgK KysrIGIvU291cmNlL1dURi93dGYvTW9ub3RvbmljVGltZS5oCkBAIC00NiwzNSArNDYsMzQgQEAg Y2xhc3MgTW9ub3RvbmljVGltZSB7CiAgICAgc3RhdGljIGNvbnN0IENsb2NrVHlwZSBjbG9ja1R5 cGUgPSBDbG9ja1R5cGU6Ok1vbm90b25pYzsKICAgICAKICAgICAvLyBUaGlzIGlzIHRoZSBlcG9j aC4gU28sIHguc2Vjb25kc1NpbmNlRXBvY2goKSBzaG91bGQgYmUgdGhlIHNhbWUgYXMgeCAtIE1v bm90b25pY1RpbWUoKS4KLSAgICBNb25vdG9uaWNUaW1lKCkgeyB9CisgICAgY29uc3RleHByIE1v bm90b25pY1RpbWUoKSB7IH0KICAgICAKICAgICAvLyBDYWxsIHRoaXMgaWYgeW91IGtub3cgZm9y IHN1cmUgdGhhdCB0aGUgZG91YmxlIHJlcHJlc2VudHMgdGltZSBhY2NvcmRpbmcgdG8KICAgICAv LyBXVEY6Om1vbm90b25pY2FsbHlJbmNyZWFzaW5nVGltZSgpLiBJdCBtdXN0IGJlIGluIHNlY29u ZHMgYW5kIGl0IG11c3QgYmUgZnJvbSB0aGUgc2FtZSB0aW1lCiAgICAgLy8gc291cmNlLgotICAg IHN0YXRpYyBNb25vdG9uaWNUaW1lIGZyb21SYXdTZWNvbmRzKGRvdWJsZSB2YWx1ZSkKKyAgICBz dGF0aWMgY29uc3RleHByIE1vbm90b25pY1RpbWUgZnJvbVJhd1NlY29uZHMoZG91YmxlIHZhbHVl KQogICAgIHsKLSAgICAgICAgTW9ub3RvbmljVGltZSByZXN1bHQ7Ci0gICAgICAgIHJlc3VsdC5t X3ZhbHVlID0gdmFsdWU7Ci0gICAgICAgIHJldHVybiByZXN1bHQ7CisgICAgICAgIHJldHVybiBN b25vdG9uaWNUaW1lKHZhbHVlKTsKICAgICB9CiAgICAgCiAgICAgV1RGX0VYUE9SVF9QUklWQVRF IHN0YXRpYyBNb25vdG9uaWNUaW1lIG5vdygpOwogICAgIAotICAgIHN0YXRpYyBNb25vdG9uaWNU aW1lIGluZmluaXR5KCkgeyByZXR1cm4gZnJvbVJhd1NlY29uZHMoc3RkOjpudW1lcmljX2xpbWl0 czxkb3VibGU+OjppbmZpbml0eSgpKTsgfQorICAgIHN0YXRpYyBjb25zdGV4cHIgTW9ub3Rvbmlj VGltZSBpbmZpbml0eSgpIHsgcmV0dXJuIGZyb21SYXdTZWNvbmRzKHN0ZDo6bnVtZXJpY19saW1p dHM8ZG91YmxlPjo6aW5maW5pdHkoKSk7IH0KKyAgICBzdGF0aWMgY29uc3RleHByIE1vbm90b25p Y1RpbWUgbmFuKCkgeyByZXR1cm4gZnJvbVJhd1NlY29uZHMoc3RkOjpudW1lcmljX2xpbWl0czxk b3VibGU+OjpxdWlldF9OYU4oKSk7IH0KIAotICAgIFNlY29uZHMgc2Vjb25kc1NpbmNlRXBvY2go KSBjb25zdCB7IHJldHVybiBTZWNvbmRzKG1fdmFsdWUpOyB9CisgICAgY29uc3RleHByIFNlY29u ZHMgc2Vjb25kc1NpbmNlRXBvY2goKSBjb25zdCB7IHJldHVybiBTZWNvbmRzKG1fdmFsdWUpOyB9 CiAgICAgCiAgICAgTW9ub3RvbmljVGltZSBhcHByb3hpbWF0ZU1vbm90b25pY1RpbWUoKSBjb25z dCB7IHJldHVybiAqdGhpczsgfQogICAgIFdURl9FWFBPUlRfUFJJVkFURSBXYWxsVGltZSBhcHBy b3hpbWF0ZVdhbGxUaW1lKCkgY29uc3Q7CiAgICAgCi0gICAgZXhwbGljaXQgb3BlcmF0b3IgYm9v bCgpIGNvbnN0IHsgcmV0dXJuICEhbV92YWx1ZTsgfQorICAgIGV4cGxpY2l0IGNvbnN0ZXhwciBv cGVyYXRvciBib29sKCkgY29uc3QgeyByZXR1cm4gISFtX3ZhbHVlOyB9CiAgICAgCi0gICAgTW9u b3RvbmljVGltZSBvcGVyYXRvcisoU2Vjb25kcyBvdGhlcikgY29uc3QKKyAgICBjb25zdGV4cHIg TW9ub3RvbmljVGltZSBvcGVyYXRvcisoU2Vjb25kcyBvdGhlcikgY29uc3QKICAgICB7CiAgICAg ICAgIHJldHVybiBmcm9tUmF3U2Vjb25kcyhtX3ZhbHVlICsgb3RoZXIudmFsdWUoKSk7CiAgICAg fQogICAgIAotICAgIE1vbm90b25pY1RpbWUgb3BlcmF0b3ItKFNlY29uZHMgb3RoZXIpIGNvbnN0 CisgICAgY29uc3RleHByIE1vbm90b25pY1RpbWUgb3BlcmF0b3ItKFNlY29uZHMgb3RoZXIpIGNv bnN0CiAgICAgewogICAgICAgICByZXR1cm4gZnJvbVJhd1NlY29uZHMobV92YWx1ZSAtIG90aGVy LnZhbHVlKCkpOwogICAgIH0KQEAgLTg2LDcgKzg1LDcgQEAgY2xhc3MgTW9ub3RvbmljVGltZSB7 CiAgICAgCiAgICAgLy8gVGltZSBpcyBhIHNjYWxhciBhbmQgc2NhbGFycyBjYW4gYmUgbmVnYXRl ZCBhcyB0aGlzIGNvdWxkIGFyaXNlIGZyb20gYWxnZWJyYWljCiAgICAgLy8gdHJhbnNmb3JtYXRp b25zLiBTbywgd2UgYWxsb3cgaXQuCi0gICAgTW9ub3RvbmljVGltZSBvcGVyYXRvci0oKSBjb25z dAorICAgIGNvbnN0ZXhwciBNb25vdG9uaWNUaW1lIG9wZXJhdG9yLSgpIGNvbnN0CiAgICAgewog ICAgICAgICByZXR1cm4gZnJvbVJhd1NlY29uZHMoLW1fdmFsdWUpOwogICAgIH0KQEAgLTEwMSwz NyArMTAwLDM3IEBAIGNsYXNzIE1vbm90b25pY1RpbWUgewogICAgICAgICByZXR1cm4gKnRoaXMg PSAqdGhpcyAtIG90aGVyOwogICAgIH0KICAgICAKLSAgICBTZWNvbmRzIG9wZXJhdG9yLShNb25v dG9uaWNUaW1lIG90aGVyKSBjb25zdAorICAgIGNvbnN0ZXhwciBTZWNvbmRzIG9wZXJhdG9yLShN b25vdG9uaWNUaW1lIG90aGVyKSBjb25zdAogICAgIHsKICAgICAgICAgcmV0dXJuIFNlY29uZHMo bV92YWx1ZSAtIG90aGVyLm1fdmFsdWUpOwogICAgIH0KICAgICAKLSAgICBib29sIG9wZXJhdG9y PT0oTW9ub3RvbmljVGltZSBvdGhlcikgY29uc3QKKyAgICBjb25zdGV4cHIgYm9vbCBvcGVyYXRv cj09KE1vbm90b25pY1RpbWUgb3RoZXIpIGNvbnN0CiAgICAgewogICAgICAgICByZXR1cm4gbV92 YWx1ZSA9PSBvdGhlci5tX3ZhbHVlOwogICAgIH0KICAgICAKLSAgICBib29sIG9wZXJhdG9yIT0o TW9ub3RvbmljVGltZSBvdGhlcikgY29uc3QKKyAgICBjb25zdGV4cHIgYm9vbCBvcGVyYXRvciE9 KE1vbm90b25pY1RpbWUgb3RoZXIpIGNvbnN0CiAgICAgewogICAgICAgICByZXR1cm4gbV92YWx1 ZSAhPSBvdGhlci5tX3ZhbHVlOwogICAgIH0KICAgICAKLSAgICBib29sIG9wZXJhdG9yPChNb25v dG9uaWNUaW1lIG90aGVyKSBjb25zdAorICAgIGNvbnN0ZXhwciBib29sIG9wZXJhdG9yPChNb25v dG9uaWNUaW1lIG90aGVyKSBjb25zdAogICAgIHsKICAgICAgICAgcmV0dXJuIG1fdmFsdWUgPCBv dGhlci5tX3ZhbHVlOwogICAgIH0KICAgICAKLSAgICBib29sIG9wZXJhdG9yPihNb25vdG9uaWNU aW1lIG90aGVyKSBjb25zdAorICAgIGNvbnN0ZXhwciBib29sIG9wZXJhdG9yPihNb25vdG9uaWNU aW1lIG90aGVyKSBjb25zdAogICAgIHsKICAgICAgICAgcmV0dXJuIG1fdmFsdWUgPiBvdGhlci5t X3ZhbHVlOwogICAgIH0KICAgICAKLSAgICBib29sIG9wZXJhdG9yPD0oTW9ub3RvbmljVGltZSBv dGhlcikgY29uc3QKKyAgICBjb25zdGV4cHIgYm9vbCBvcGVyYXRvcjw9KE1vbm90b25pY1RpbWUg b3RoZXIpIGNvbnN0CiAgICAgewogICAgICAgICByZXR1cm4gbV92YWx1ZSA8PSBvdGhlci5tX3Zh bHVlOwogICAgIH0KICAgICAKLSAgICBib29sIG9wZXJhdG9yPj0oTW9ub3RvbmljVGltZSBvdGhl cikgY29uc3QKKyAgICBjb25zdGV4cHIgYm9vbCBvcGVyYXRvcj49KE1vbm90b25pY1RpbWUgb3Ro ZXIpIGNvbnN0CiAgICAgewogICAgICAgICByZXR1cm4gbV92YWx1ZSA+PSBvdGhlci5tX3ZhbHVl OwogICAgIH0KQEAgLTEzOSw2ICsxMzgsMTEgQEAgY2xhc3MgTW9ub3RvbmljVGltZSB7CiAgICAg V1RGX0VYUE9SVF9QUklWQVRFIHZvaWQgZHVtcChQcmludFN0cmVhbSYpIGNvbnN0OwogCiBwcml2 YXRlOgorICAgIGNvbnN0ZXhwciBNb25vdG9uaWNUaW1lKGRvdWJsZSByYXdWYWx1ZSkKKyAgICAg ICAgOiBtX3ZhbHVlKHJhd1ZhbHVlKQorICAgIHsKKyAgICB9CisKICAgICBkb3VibGUgbV92YWx1 ZSB7IDAgfTsKIH07CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUmVzb3VyY2VV c2FnZURhdGEuaCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUmVzb3VyY2VVc2FnZURhdGEuaAppbmRl eCA3MjM2OTZmMTU0MjQ2YzA5MDAyNmRkNGQyZmU0MTBiMDViNTVmYTJhLi4wMmMzYmExNDgzYzI2 MmYyMjM0Nzk1MjhiMWU2ZmU4YTIyZDMwN2QwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9w YWdlL1Jlc291cmNlVXNhZ2VEYXRhLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9SZXNvdXJj ZVVzYWdlRGF0YS5oCkBAIC0yOCw2ICsyOCw3IEBACiAjaWYgRU5BQkxFKFJFU09VUkNFX1VTQUdF KQogCiAjaW5jbHVkZSA8YXJyYXk+CisjaW5jbHVkZSA8d3RmL01vbm90b25pY1RpbWUuaD4KIAog bmFtZXNwYWNlIFdlYkNvcmUgewogCkBAIC02OCw4ICs2OSw4IEBAIHN0cnVjdCBSZXNvdXJjZVVz YWdlRGF0YSB7CiAgICAgc2l6ZV90IHRvdGFsRGlydHlTaXplIHsgMCB9OwogICAgIHNpemVfdCB0 b3RhbEV4dGVybmFsU2l6ZSB7IDAgfTsKICAgICBzdGQ6OmFycmF5PE1lbW9yeUNhdGVnb3J5SW5m bywgTWVtb3J5Q2F0ZWdvcnk6Ok51bWJlck9mQ2F0ZWdvcmllcz4gY2F0ZWdvcmllczsKLSAgICBk b3VibGUgdGltZU9mTmV4dEVkZW5Db2xsZWN0aW9uIHsgMCB9OwotICAgIGRvdWJsZSB0aW1lT2ZO ZXh0RnVsbENvbGxlY3Rpb24geyAwIH07CisgICAgTW9ub3RvbmljVGltZSB0aW1lT2ZOZXh0RWRl bkNvbGxlY3Rpb24geyBNb25vdG9uaWNUaW1lOjpuYW4oKSB9OworICAgIE1vbm90b25pY1RpbWUg dGltZU9mTmV4dEZ1bGxDb2xsZWN0aW9uIHsgTW9ub3RvbmljVGltZTo6bmFuKCkgfTsKIH07CiAK IH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uv Y29jb2EvUmVzb3VyY2VVc2FnZU92ZXJsYXlDb2NvYS5tbSBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uv Y29jb2EvUmVzb3VyY2VVc2FnZU92ZXJsYXlDb2NvYS5tbQppbmRleCAzNjY2MDFlMzkwY2E1MTBk Yzk4OWNjNzRhOGY0OGFkNDViMDg1MDgzLi40ZjYxNGRiNTNhZTQzMjFiODg2NjAyY2Q5ZjJkZmE3 ZmY0MmUxODlkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL2NvY29hL1Jlc291cmNl VXNhZ2VPdmVybGF5Q29jb2EubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9jb2NvYS9SZXNv dXJjZVVzYWdlT3ZlcmxheUNvY29hLm1tCkBAIC0xNTQsOCArMTU0LDggQEAgc3RydWN0IEhpc3Rv cmljUmVzb3VyY2VVc2FnZURhdGEgewogICAgIFJpbmdCdWZmZXI8c2l6ZV90PiB0b3RhbEV4dGVy bmFsU2l6ZTsKICAgICBSaW5nQnVmZmVyPHNpemVfdD4gZ2NIZWFwU2l6ZTsKICAgICBzdGQ6OmFy cmF5PEhpc3RvcmljTWVtb3J5Q2F0ZWdvcnlJbmZvLCBNZW1vcnlDYXRlZ29yeTo6TnVtYmVyT2ZD YXRlZ29yaWVzPiBjYXRlZ29yaWVzOwotICAgIGRvdWJsZSB0aW1lT2ZOZXh0RWRlbkNvbGxlY3Rp b24geyAwIH07Ci0gICAgZG91YmxlIHRpbWVPZk5leHRGdWxsQ29sbGVjdGlvbiB7IDAgfTsKKyAg ICBNb25vdG9uaWNUaW1lIHRpbWVPZk5leHRFZGVuQ29sbGVjdGlvbiB7IE1vbm90b25pY1RpbWU6 Om5hbigpIH07CisgICAgTW9ub3RvbmljVGltZSB0aW1lT2ZOZXh0RnVsbENvbGxlY3Rpb24geyBN b25vdG9uaWNUaW1lOjpuYW4oKSB9OwogfTsKIAogSGlzdG9yaWNSZXNvdXJjZVVzYWdlRGF0YTo6 SGlzdG9yaWNSZXNvdXJjZVVzYWdlRGF0YSgpCkBAIC00MzMsMTEgKzQzMywxMSBAQCBzdGF0aWMg U3RyaW5nIGZvcm1hdEJ5dGVOdW1iZXIoc2l6ZV90IG51bWJlcikKICAgICByZXR1cm4gU3RyaW5n Ojpmb3JtYXQoIiVsdSIsIG51bWJlcik7CiB9CiAKLXN0YXRpYyBTdHJpbmcgZ2NUaW1lclN0cmlu Zyhkb3VibGUgdGltZXJGaXJlRGF0ZSwgZG91YmxlIG5vdykKK3N0YXRpYyBTdHJpbmcgZ2NUaW1l clN0cmluZyhNb25vdG9uaWNUaW1lIHRpbWVyRmlyZURhdGUsIE1vbm90b25pY1RpbWUgbm93KQog ewotICAgIGlmICghdGltZXJGaXJlRGF0ZSkKKyAgICBpZiAoc3RkOjppc25hbih0aW1lckZpcmVE YXRlKSkKICAgICAgICAgcmV0dXJuIEFTQ0lJTGl0ZXJhbCgiW25vdCBzY2hlZHVsZWRdIik7Ci0g ICAgcmV0dXJuIFN0cmluZzo6Zm9ybWF0KCIlZyIsIHRpbWVyRmlyZURhdGUgLSBub3cpOworICAg IHJldHVybiBTdHJpbmc6OmZvcm1hdCgiJWciLCAodGltZXJGaXJlRGF0ZSAtIG5vdykuc2Vjb25k cygpKTsKIH0KIAogdm9pZCBSZXNvdXJjZVVzYWdlT3ZlcmxheTo6cGxhdGZvcm1EcmF3KENHQ29u dGV4dFJlZiBjb250ZXh0KQpAQCAtNDc4LDcgKzQ3OCw3IEBAIHZvaWQgUmVzb3VyY2VVc2FnZU92 ZXJsYXk6OnBsYXRmb3JtRHJhdyhDR0NvbnRleHRSZWYgY29udGV4dCkKICAgICB9CiAgICAgeSAt PSA1OwogCi0gICAgZG91YmxlIG5vdyA9IFdURjo6Y3VycmVudFRpbWUoKTsKKyAgICBNb25vdG9u aWNUaW1lIG5vdyA9IE1vbm90b25pY1RpbWU6Om5vdygpOwogICAgIHNob3dUZXh0KGNvbnRleHQs IDEwLCB5ICsgMTAsIGNvbG9yRm9yTGFiZWxzLCBTdHJpbmc6OmZvcm1hdCgiICAgIEVkZW4gR0M6 ICVzIiwgZ2NUaW1lclN0cmluZyhkYXRhLnRpbWVPZk5leHRFZGVuQ29sbGVjdGlvbiwgbm93KS5h c2NpaSgpLmRhdGEoKSkpOwogICAgIHNob3dUZXh0KGNvbnRleHQsIDEwLCB5ICsgMjAsIGNvbG9y Rm9yTGFiZWxzLCBTdHJpbmc6OmZvcm1hdCgiICAgIEZ1bGwgR0M6ICVzIiwgZ2NUaW1lclN0cmlu ZyhkYXRhLnRpbWVPZk5leHRGdWxsQ29sbGVjdGlvbiwgbm93KS5hc2NpaSgpLmRhdGEoKSkpOwog CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL2xpbnV4L1Jlc291cmNlVXNhZ2VPdmVy bGF5TGludXguY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9saW51eC9SZXNvdXJjZVVzYWdlT3Zl cmxheUxpbnV4LmNwcAppbmRleCBjZmY2M2UwMGVhMDJkMjk4YjRiZmE0Yzk3YmNjOWI5ODA0MDFm ZDgzLi5kZDc4Y2EwMmY2ZWNjNjM1NmIyYmQ0NjEwNzU5ZDU5ZjdiMTlhNDUxIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9wYWdlL2xpbnV4L1Jlc291cmNlVXNhZ2VPdmVybGF5TGludXguY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvbGludXgvUmVzb3VyY2VVc2FnZU92ZXJsYXlMaW51 eC5jcHAKQEAgLTU5LDExICs1OSwxMSBAQCBzdGF0aWMgU3RyaW5nIGZvcm1hdEJ5dGVOdW1iZXIo c2l6ZV90IG51bWJlcikKICAgICByZXR1cm4gU3RyaW5nOjpmb3JtYXQoIiVsdSIsIG51bWJlcik7 CiB9CiAKLXN0YXRpYyBTdHJpbmcgZ2NUaW1lclN0cmluZyhkb3VibGUgdGltZXJGaXJlRGF0ZSwg ZG91YmxlIG5vdykKK3N0YXRpYyBTdHJpbmcgZ2NUaW1lclN0cmluZyhNb25vdG9uaWNUaW1lIHRp bWVyRmlyZURhdGUsIE1vbm90b25pY1RpbWUgbm93KQogewotICAgIGlmICghdGltZXJGaXJlRGF0 ZSkKKyAgICBpZiAoc3RkOjppc25hbih0aW1lckZpcmVEYXRlKSkKICAgICAgICAgcmV0dXJuIEFT Q0lJTGl0ZXJhbCgiW25vdCBzY2hlZHVsZWRdIik7Ci0gICAgcmV0dXJuIFN0cmluZzo6Zm9ybWF0 KCIlZyIsIHRpbWVyRmlyZURhdGUgLSBub3cpOworICAgIHJldHVybiBTdHJpbmc6OmZvcm1hdCgi JWciLCAodGltZXJGaXJlRGF0ZSAtIG5vdykuc2Vjb25kcygpKTsKIH0KIAogc3RhdGljIGNvbnN0 IGZsb2F0IGdGb250U2l6ZSA9IDE0OwpAQCAtMTEyLDcgKzExMiw3IEBAIGNsYXNzIFJlc291cmNl VXNhZ2VPdmVybGF5UGFpbnRlciBmaW5hbCA6IHB1YmxpYyBHcmFwaGljc0xheWVyQ2xpZW50IHsK ICAgICAgICAgY29udGV4dC5kcmF3VGV4dChtX3RleHRGb250LCBUZXh0UnVuKHN0cmluZyksIHBv c2l0aW9uKTsKICAgICAgICAgcG9zaXRpb24ubW92ZSgwLCBnRm9udFNpemUgKyAyKTsKIAotICAg ICAgICBkb3VibGUgbm93ID0gV1RGOjpjdXJyZW50VGltZSgpOworICAgICAgICBNb25vdG9uaWNU aW1lIG5vdyA9IE1vbm90b25pY1RpbWU6Om5vdygpOwogICAgICAgICBzdHJpbmcgPSAiRWRlbiBH QzogIiArIGdjVGltZXJTdHJpbmcoZ0RhdGEudGltZU9mTmV4dEVkZW5Db2xsZWN0aW9uLCBub3cp OwogICAgICAgICBjb250ZXh0LmRyYXdUZXh0KG1fdGV4dEZvbnQsIFRleHRSdW4oc3RyaW5nKSwg cG9zaXRpb24pOwogICAgICAgICBwb3NpdGlvbi5tb3ZlKDAsIGdGb250U2l6ZSArIDIpOwo=