139410 2014-12-08 12:22:55 -0800 Change WTF::currentCPUTime to return std::chrono::microseconds and get rid of currentCPUTimeMS 2014-12-08 14:16:27 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca benjamin cmarcelo commit-queue oldest_to_newest 1053480 0 andersca 2014-12-08 12:22:55 -0800 Change WTF::currentCPUTime to return std::chrono::microseconds and get rid of currentCPUTimeMS 1053481 1 242839 andersca 2014-12-08 12:23:20 -0800 Created attachment 242839 Patch 1053487 2 242840 andersca 2014-12-08 12:49:22 -0800 Created attachment 242840 Patch 1053517 3 242840 kling 2014-12-08 14:14:49 -0800 Comment on attachment 242840 Patch r=me 1053518 4 andersca 2014-12-08 14:16:27 -0800 Committed r176973: <http://trac.webkit.org/changeset/176973> 242839 2014-12-08 12:23:20 -0800 2014-12-08 12:49:20 -0800 Patch bug-139410-20141208122359.patch text/plain 11358 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTc2OTQ5CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBl NjgwOGEyNzlhNWU4NGE5NzNhNTAwMzQ2NjE1Y2M2ZTlkZTcxMTg5Li5iMWRiMmQ0YWNlOTA4ZDM4 MzJiN2JhZDliMjhlZTMxOGEwNGYzMmZjIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyMiBAQAorMjAxNC0xMi0wOCAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUu Y29tPgorCisgICAgICAgIENoYW5nZSBXVEY6OmN1cnJlbnRDUFVUaW1lIHRvIHJldHVybiBzdGQ6 OmNocm9ubzo6bWljcm9zZWNvbmRzIGFuZCBnZXQgcmlkIG9mIGN1cnJlbnRDUFVUaW1lTVMKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzOTQxMAorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogQVBJL0pTQ29u dGV4dFJlZi5jcHA6CisgICAgICAgIChKU0NvbnRleHRHcm91cFNldEV4ZWN1dGlvblRpbWVMaW1p dCk6CisgICAgICAgIChKU0NvbnRleHRHcm91cENsZWFyRXhlY3V0aW9uVGltZUxpbWl0KToKKyAg ICAgICAgKiBydW50aW1lL1dhdGNoZG9nLmNwcDoKKyAgICAgICAgKEpTQzo6V2F0Y2hkb2c6OnNl dFRpbWVMaW1pdCk6CisgICAgICAgIChKU0M6OldhdGNoZG9nOjpkaWRGaXJlKToKKyAgICAgICAg KEpTQzo6V2F0Y2hkb2c6OnN0YXJ0Q291bnRkb3duSWZOZWVkZWQpOgorICAgICAgICAoSlNDOjpX YXRjaGRvZzo6c3RhcnRDb3VudGRvd24pOgorICAgICAgICAqIHJ1bnRpbWUvV2F0Y2hkb2cuaDoK KyAgICAgICAgKiBydW50aW1lL1dhdGNoZG9nTWFjLmNwcDoKKyAgICAgICAgKEpTQzo6V2F0Y2hk b2c6OnN0YXJ0VGltZXIpOgorCiAyMDE0LTEyLTA3ICBDc2FiYSBPc3p0cm9nb27DoWMgIDxvc3N5 QHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmVtb3ZlIHRoZSB1bnVzZWQgV1RGX1VTRV9HQ0NfQ09N UFVURURfR09UT19XT1JLQVJPVU5EIGFmdGVyIHIxMjk0NTMuCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V1RGL0NoYW5nZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IGNkYWY4NGNiNzFhNjA5 YmFlNDBlM2FhNWQxYWQ3NGRhYzY5Y2U0MzguLmNhYzkzZmZiODZiZmM5OWFiNWRjYmJjM2QxNWY0 YzlmZWFlM2Q1NTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XVEYvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTQtMTItMDggIEFuZGVycyBDYXJs c3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KKworICAgICAgICBDaGFuZ2UgV1RGOjpjdXJyZW50 Q1BVVGltZSB0byByZXR1cm4gc3RkOjpjaHJvbm86Om1pY3Jvc2Vjb25kcyBhbmQgZ2V0IHJpZCBv ZiBjdXJyZW50Q1BVVGltZU1TCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xMzk0MTAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICAqIHd0Zi9DdXJyZW50VGltZS5jcHA6CisgICAgICAgIChXVEY6OmN1cnJlbnRD UFVUaW1lKToKKyAgICAgICAgKFdURjo6Y3VycmVudENQVVRpbWVNUyk6IERlbGV0ZWQuCisgICAg ICAgICogd3RmL0N1cnJlbnRUaW1lLmg6CisKIDIwMTQtMTItMDcgIEFuZHJlYXMgS2xpbmcgIDxh a2xpbmdAYXBwbGUuY29tPgogCiAgICAgICAgIFVzZSBtb3JlIFBhc3NSZWYgaW4gQXRvbWljU3Ry aW5nLgpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL0FQSS9KU0NvbnRleHRSZWYu Y3BwIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0FQSS9KU0NvbnRleHRSZWYuY3BwCmluZGV4IDlk MmIxMDBlMzU5ZDJkOTEzM2Y5MjI2MTg3NmUwNDIwZjMwZmQ5MjAuLjdkMDI3YmQ4NDI3MjhiODdi MGNkNTY5MTQ0MDliZGUzOWUxMWNkN2EgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9BUEkvSlNDb250ZXh0UmVmLmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvQVBJL0pT Q29udGV4dFJlZi5jcHAKQEAgLTk5LDkgKzk5LDkgQEAgdm9pZCBKU0NvbnRleHRHcm91cFNldEV4 ZWN1dGlvblRpbWVMaW1pdChKU0NvbnRleHRHcm91cFJlZiBncm91cCwgZG91YmxlIGxpbWl0LAog ICAgIFdhdGNoZG9nJiB3YXRjaGRvZyA9ICp2bS53YXRjaGRvZzsKICAgICBpZiAoY2FsbGJhY2sp IHsKICAgICAgICAgdm9pZCogY2FsbGJhY2tQdHIgPSByZWludGVycHJldF9jYXN0PHZvaWQqPihj YWxsYmFjayk7Ci0gICAgICAgIHdhdGNoZG9nLnNldFRpbWVMaW1pdCh2bSwgbGltaXQsIGludGVy bmFsU2NyaXB0VGltZW91dENhbGxiYWNrLCBjYWxsYmFja1B0ciwgY2FsbGJhY2tEYXRhKTsKKyAg ICAgICAgd2F0Y2hkb2cuc2V0VGltZUxpbWl0KHZtLCBzdGQ6OmNocm9ubzo6ZHVyYXRpb25fY2Fz dDxzdGQ6OmNocm9ubzo6bWljcm9zZWNvbmRzPihzdGQ6OmNocm9ubzo6ZHVyYXRpb248ZG91Ymxl PihsaW1pdCkpLCBpbnRlcm5hbFNjcmlwdFRpbWVvdXRDYWxsYmFjaywgY2FsbGJhY2tQdHIsIGNh bGxiYWNrRGF0YSk7CiAgICAgfSBlbHNlCi0gICAgICAgIHdhdGNoZG9nLnNldFRpbWVMaW1pdCh2 bSwgbGltaXQpOworICAgICAgICB3YXRjaGRvZy5zZXRUaW1lTGltaXQodm0sIHN0ZDo6Y2hyb25v OjpkdXJhdGlvbl9jYXN0PHN0ZDo6Y2hyb25vOjptaWNyb3NlY29uZHM+KHN0ZDo6Y2hyb25vOjpk dXJhdGlvbjxkb3VibGU+KGxpbWl0KSkpOwogfQogCiB2b2lkIEpTQ29udGV4dEdyb3VwQ2xlYXJF eGVjdXRpb25UaW1lTGltaXQoSlNDb250ZXh0R3JvdXBSZWYgZ3JvdXApCkBAIC0xMTEsNyArMTEx LDcgQEAgdm9pZCBKU0NvbnRleHRHcm91cENsZWFyRXhlY3V0aW9uVGltZUxpbWl0KEpTQ29udGV4 dEdyb3VwUmVmIGdyb3VwKQogICAgIGlmICghdm0ud2F0Y2hkb2cpCiAgICAgICAgIHZtLndhdGNo ZG9nID0gc3RkOjptYWtlX3VuaXF1ZTxXYXRjaGRvZz4oKTsKICAgICBXYXRjaGRvZyYgd2F0Y2hk b2cgPSAqdm0ud2F0Y2hkb2c7Ci0gICAgd2F0Y2hkb2cuc2V0VGltZUxpbWl0KHZtLCBzdGQ6Om51 bWVyaWNfbGltaXRzPGRvdWJsZT46OmluZmluaXR5KCkpOworICAgIHdhdGNoZG9nLnNldFRpbWVM aW1pdCh2bSwgc3RkOjpjaHJvbm86Om1pY3Jvc2Vjb25kczo6bWF4KCkpOwogfQogCiAvLyBGcm9t IHRoZSBBUEkncyBwZXJzcGVjdGl2ZSwgYSBnbG9iYWwgY29udGV4dCByZW1haW5zIGFsaXZlIGlm ZiBpdCBoYXMgYmVlbiBKU0dsb2JhbENvbnRleHRSZXRhaW5lZC4KZGlmZiAtLWdpdCBhL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1dhdGNoZG9nLmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS9ydW50aW1lL1dhdGNoZG9nLmNwcAppbmRleCA1YjFmZTJiMjk2NzFlOWQ1MThmNzMyZjM5 MDc5MmJhNDQ5ZDNmNDllLi43YzNmZjFjMjgzMWQ3OWUwYzY2ODYyZmQwNzZkMjZjOWRjMTkyNjg1 IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9XYXRjaGRvZy5jcHAK KysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvV2F0Y2hkb2cuY3BwCkBAIC0zMiw3 ICszMiw3IEBACiAKIG5hbWVzcGFjZSBKU0MgewogCi0jZGVmaW5lIE5PX0xJTUlUIHN0ZDo6bnVt ZXJpY19saW1pdHM8ZG91YmxlPjo6aW5maW5pdHkoKQorI2RlZmluZSBOT19MSU1JVCBzdGQ6OmNo cm9ubzo6bWljcm9zZWNvbmRzOjptYXgoKQogCiBXYXRjaGRvZzo6V2F0Y2hkb2coKQogICAgIDog bV90aW1lckRpZEZpcmUoZmFsc2UpCkBAIC01Niw3ICs1Niw3IEBAIFdhdGNoZG9nOjp+V2F0Y2hk b2coKQogICAgIGRlc3Ryb3lUaW1lcigpOwogfQogCi12b2lkIFdhdGNoZG9nOjpzZXRUaW1lTGlt aXQoVk0mIHZtLCBkb3VibGUgbGltaXQsCit2b2lkIFdhdGNoZG9nOjpzZXRUaW1lTGltaXQoVk0m IHZtLCBzdGQ6OmNocm9ubzo6bWljcm9zZWNvbmRzIGxpbWl0LAogICAgIFNob3VsZFRlcm1pbmF0 ZUNhbGxiYWNrIGNhbGxiYWNrLCB2b2lkKiBkYXRhMSwgdm9pZCogZGF0YTIpCiB7CiAgICAgYm9v bCB3YXNFbmFibGVkID0gaXNFbmFibGVkKCk7CkBAIC05Nyw5ICs5Nyw5IEBAIGJvb2wgV2F0Y2hk b2c6OmRpZEZpcmUoRXhlY1N0YXRlKiBleGVjKQogICAgIG1fdGltZXJEaWRGaXJlID0gZmFsc2U7 CiAgICAgc3RvcENvdW50ZG93bigpOwogCi0gICAgZG91YmxlIGN1cnJlbnRUaW1lID0gY3VycmVu dENQVVRpbWUoKTsKLSAgICBkb3VibGUgZGVsdGFUaW1lID0gY3VycmVudFRpbWUgLSBtX3N0YXJ0 VGltZTsKLSAgICBkb3VibGUgdG90YWxFbGFwc2VkVGltZSA9IG1fZWxhcHNlZFRpbWUgKyBkZWx0 YVRpbWU7CisgICAgYXV0byBjdXJyZW50VGltZSA9IGN1cnJlbnRDUFVUaW1lKCk7CisgICAgYXV0 byBkZWx0YVRpbWUgPSBjdXJyZW50VGltZSAtIG1fc3RhcnRUaW1lOworICAgIGF1dG8gdG90YWxF bGFwc2VkVGltZSA9IG1fZWxhcHNlZFRpbWUgKyBkZWx0YVRpbWU7CiAgICAgaWYgKHRvdGFsRWxh cHNlZFRpbWUgPiBtX2xpbWl0KSB7CiAgICAgICAgIC8vIENhc2UgMTogdGhlIGFsbG93ZWQgQ1BV IHRpbWUgaGFzIGVsYXBzZWQuCiAKQEAgLTEyMSw3ICsxMjEsNyBAQCBib29sIFdhdGNoZG9nOjpk aWRGaXJlKEV4ZWNTdGF0ZSogZXhlYykKIAogICAgICAgICAvLyBUZWxsIHRoZSB0aW1lciB0byBh bGFybSB1cyBhZ2FpbiB3aGVuIGl0IHRoaW5rcyB3ZSd2ZSByZWFjaGVkIHRoZQogICAgICAgICAv LyBlbmQgb2YgdGhlIGFsbG93ZWQgdGltZS4KLSAgICAgICAgZG91YmxlIHJlbWFpbmluZ1RpbWUg PSBtX2xpbWl0IC0gdG90YWxFbGFwc2VkVGltZTsKKyAgICAgICAgYXV0byByZW1haW5pbmdUaW1l ID0gbV9saW1pdCAtIHRvdGFsRWxhcHNlZFRpbWU7CiAgICAgICAgIG1fZWxhcHNlZFRpbWUgPSB0 b3RhbEVsYXBzZWRUaW1lOwogICAgICAgICBtX3N0YXJ0VGltZSA9IGN1cnJlbnRUaW1lOwogICAg ICAgICBzdGFydENvdW50ZG93bihyZW1haW5pbmdUaW1lKTsKQEAgLTE2NCwxMyArMTY0LDEzIEBA IHZvaWQgV2F0Y2hkb2c6OnN0YXJ0Q291bnRkb3duSWZOZWVkZWQoKQogICAgICAgICByZXR1cm47 IC8vIE5vdCBleGVjdXRpbmcgSlMgc2NyaXB0LiBObyBuZWVkIHRvIHN0YXJ0LgogCiAgICAgaWYg KGlzRW5hYmxlZCgpKSB7Ci0gICAgICAgIG1fZWxhcHNlZFRpbWUgPSAwOworICAgICAgICBtX2Vs YXBzZWRUaW1lID0gc3RkOjpjaHJvbm86Om1pY3Jvc2Vjb25kczo6emVybygpOwogICAgICAgICBt X3N0YXJ0VGltZSA9IGN1cnJlbnRDUFVUaW1lKCk7CiAgICAgICAgIHN0YXJ0Q291bnRkb3duKG1f bGltaXQpOwogICAgIH0KIH0KIAotdm9pZCBXYXRjaGRvZzo6c3RhcnRDb3VudGRvd24oZG91Ymxl IGxpbWl0KQordm9pZCBXYXRjaGRvZzo6c3RhcnRDb3VudGRvd24oc3RkOjpjaHJvbm86Om1pY3Jv c2Vjb25kcyBsaW1pdCkKIHsKICAgICBBU1NFUlQobV9pc1N0b3BwZWQpOwogICAgIG1faXNTdG9w cGVkID0gZmFsc2U7CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9X YXRjaGRvZy5oIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvV2F0Y2hkb2cuaAppbmRl eCA1MThmZDlkN2QwZTVhMzNjODAzYWRkYWIyNGY1M2YyNjBkNjMwNzM3Li45MWQ4ZDY0MWYwNWZi NjdmNjg4MjFiOGRiYmI5YmI4NzgwMjAzODVjIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvcnVudGltZS9XYXRjaGRvZy5oCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50 aW1lL1dhdGNoZG9nLmgKQEAgLTQzLDcgKzQzLDcgQEAgcHVibGljOgogICAgIH5XYXRjaGRvZygp OwogCiAgICAgdHlwZWRlZiBib29sICgqU2hvdWxkVGVybWluYXRlQ2FsbGJhY2spKEV4ZWNTdGF0 ZSosIHZvaWQqIGRhdGExLCB2b2lkKiBkYXRhMik7Ci0gICAgdm9pZCBzZXRUaW1lTGltaXQoVk0m LCBkb3VibGUgc2Vjb25kcywgU2hvdWxkVGVybWluYXRlQ2FsbGJhY2sgPSAwLCB2b2lkKiBkYXRh MSA9IDAsIHZvaWQqIGRhdGEyID0gMCk7CisgICAgdm9pZCBzZXRUaW1lTGltaXQoVk0mLCBzdGQ6 OmNocm9ubzo6bWljcm9zZWNvbmRzIGxpbWl0LCBTaG91bGRUZXJtaW5hdGVDYWxsYmFjayA9IDAs IHZvaWQqIGRhdGExID0gMCwgdm9pZCogZGF0YTIgPSAwKTsKIAogICAgIC8vIFRoaXMgdmVyc2lv biBvZiBkaWRGaXJlKCkgd2lsbCBjaGVjayB0aGUgZWxhcHNlZCBDUFUgdGltZSBhbmQgY2FsbCB0 aGUKICAgICAvLyBjYWxsYmFjayAoaWYgbmVlZGVkKSB0byBkZXRlcm1pbmUgaWYgdGhlIHdhdGNo ZG9nIHNob3VsZCBmaXJlLgpAQCAtNjMsMTQgKzYzLDE0IEBAIHByaXZhdGU6CiAgICAgdm9pZCBh cm0oKTsKICAgICB2b2lkIGRpc2FybSgpOwogICAgIHZvaWQgc3RhcnRDb3VudGRvd25JZk5lZWRl ZCgpOwotICAgIHZvaWQgc3RhcnRDb3VudGRvd24oZG91YmxlIGxpbWl0KTsKKyAgICB2b2lkIHN0 YXJ0Q291bnRkb3duKHN0ZDo6Y2hyb25vOjptaWNyb3NlY29uZHMgbGltaXQpOwogICAgIHZvaWQg c3RvcENvdW50ZG93bigpOwogICAgIGJvb2wgaXNBcm1lZCgpIHsgcmV0dXJuICEhbV9yZWVudHJ5 Q291bnQ7IH0KIAogICAgIC8vIFBsYXRmb3JtIHNwZWNpZmljIHRpbWVyIGltcGxlbWVudGF0aW9u OgogICAgIHZvaWQgaW5pdFRpbWVyKCk7CiAgICAgdm9pZCBkZXN0cm95VGltZXIoKTsKLSAgICB2 b2lkIHN0YXJ0VGltZXIoZG91YmxlIGxpbWl0KTsKKyAgICB2b2lkIHN0YXJ0VGltZXIoc3RkOjpj aHJvbm86Om1pY3Jvc2Vjb25kcyBsaW1pdCk7CiAgICAgdm9pZCBzdG9wVGltZXIoKTsKIAogICAg IC8vIG1fdGltZXJEaWRGaXJlIChhYm92ZSkgaW5kaWNhdGVzIHdoZXRoZXIgdGhlIHRpbWVyIGZp cmVkLiBUaGUgV2F0Y2hkb2cKQEAgLTgxLDEwICs4MSw5IEBAIHByaXZhdGU6CiAgICAgYm9vbCBt X3RpbWVyRGlkRmlyZTsKICAgICBib29sIG1fZGlkRmlyZTsKIAotICAgIC8vIEFsbCB0aW1lIHVu aXRzIGFyZSBpbiBzZWNvbmRzLgotICAgIGRvdWJsZSBtX2xpbWl0OwotICAgIGRvdWJsZSBtX3N0 YXJ0VGltZTsKLSAgICBkb3VibGUgbV9lbGFwc2VkVGltZTsKKyAgICBzdGQ6OmNocm9ubzo6bWlj cm9zZWNvbmRzIG1fbGltaXQ7CisgICAgc3RkOjpjaHJvbm86Om1pY3Jvc2Vjb25kcyBtX3N0YXJ0 VGltZTsKKyAgICBzdGQ6OmNocm9ubzo6bWljcm9zZWNvbmRzIG1fZWxhcHNlZFRpbWU7CiAKICAg ICBpbnQgbV9yZWVudHJ5Q291bnQ7CiAgICAgYm9vbCBtX2lzU3RvcHBlZDsKZGlmZiAtLWdpdCBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1dhdGNoZG9nTWFjLmNwcCBiL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS9ydW50aW1lL1dhdGNoZG9nTWFjLmNwcAppbmRleCBjYTQ3NGRmMmYxOGQz ZjIyOGQxNGY0NjcyMjM1NzRlMTJhMzZjNmJkLi4zNGYyZWQzMzg4MTc4M2NiODNjYWJiNmQwYTJl OWFjYmZlNzg2YTFjIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9X YXRjaGRvZ01hYy5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvV2F0Y2hk b2dNYWMuY3BwCkBAIC00MSw3ICs0MSw3IEBAIHZvaWQgV2F0Y2hkb2c6OmRlc3Ryb3lUaW1lcigp CiAgICAgICAgIGRpc3BhdGNoX3JlbGVhc2UobV9xdWV1ZSk7CiB9CiAKLXZvaWQgV2F0Y2hkb2c6 OnN0YXJ0VGltZXIoZG91YmxlIGxpbWl0KQordm9pZCBXYXRjaGRvZzo6c3RhcnRUaW1lcihzdGQ6 OmNocm9ubzo6bWljcm9zZWNvbmRzIGxpbWl0KQogewogICAgIEFTU0VSVCghbV90aW1lcik7CiAg ICAgaWYgKCFtX3F1ZXVlKQpAQCAtNDksNyArNDksNyBAQCB2b2lkIFdhdGNoZG9nOjpzdGFydFRp bWVyKGRvdWJsZSBsaW1pdCkKICAgICBtX3RpbWVyID0gZGlzcGF0Y2hfc291cmNlX2NyZWF0ZShE SVNQQVRDSF9TT1VSQ0VfVFlQRV9USU1FUiwgMCwgMCwgbV9xdWV1ZSk7CiAKICAgICBkaXNwYXRj aF9zb3VyY2Vfc2V0X3RpbWVyKG1fdGltZXIsCi0gICAgICAgIGRpc3BhdGNoX3RpbWUoRElTUEFU Q0hfVElNRV9OT1csIGxpbWl0ICogTlNFQ19QRVJfU0VDKSwKKyAgICAgICAgZGlzcGF0Y2hfdGlt ZShESVNQQVRDSF9USU1FX05PVywgc3RkOjpjaHJvbm86Om5hbm9zZWNvbmRzKGxpbWl0KS5jb3Vu dCgpKSwKICAgICAgICAgRElTUEFUQ0hfVElNRV9GT1JFVkVSLCAwKTsKIAogICAgIGRpc3BhdGNo X3NvdXJjZV9zZXRfZXZlbnRfaGFuZGxlcihtX3RpbWVyLCBeewpkaWZmIC0tZ2l0IGEvU291cmNl L1dURi93dGYvQ3VycmVudFRpbWUuY3BwIGIvU291cmNlL1dURi93dGYvQ3VycmVudFRpbWUuY3Bw CmluZGV4IDQxMWU2NzE0OGM5NmNkMDFhNjI4YTBiNzZmZmY3ZWIzNjA3MGJlZDUuLmM1ODQyYzk3 ZGFlMDE1ZGZjMWUzZDdkOGIxNzJhMjkwZDJiNGY3OGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYv d3RmL0N1cnJlbnRUaW1lLmNwcAorKysgYi9Tb3VyY2UvV1RGL3d0Zi9DdXJyZW50VGltZS5jcHAK QEAgLTI5NCw3ICsyOTQsNyBAQCBkb3VibGUgbW9ub3RvbmljYWxseUluY3JlYXNpbmdUaW1lKCkK IAogI2VuZGlmCiAKLWRvdWJsZSBjdXJyZW50Q1BVVGltZSgpCitzdGQ6OmNocm9ubzo6bWljcm9z ZWNvbmRzIGN1cnJlbnRDUFVUaW1lKCkKIHsKICNpZiBPUyhEQVJXSU4pCiAgICAgbWFjaF9tc2df dHlwZV9udW1iZXJfdCBpbmZvQ291bnQgPSBUSFJFQURfQkFTSUNfSU5GT19DT1VOVDsKQEAgLTMw NCwxMSArMzA0LDggQEAgZG91YmxlIGN1cnJlbnRDUFVUaW1lKCkKICAgICBtYWNoX3BvcnRfdCB0 aHJlYWRQb3J0ID0gbWFjaF90aHJlYWRfc2VsZigpOwogICAgIHRocmVhZF9pbmZvKHRocmVhZFBv cnQsIFRIUkVBRF9CQVNJQ19JTkZPLCByZWludGVycHJldF9jYXN0PHRocmVhZF9pbmZvX3Q+KCZp bmZvKSwgJmluZm9Db3VudCk7CiAgICAgbWFjaF9wb3J0X2RlYWxsb2NhdGUobWFjaF90YXNrX3Nl bGYoKSwgdGhyZWFkUG9ydCk7Ci0gICAgCi0gICAgZG91YmxlIHRpbWUgPSBpbmZvLnVzZXJfdGlt ZS5zZWNvbmRzICsgaW5mby51c2VyX3RpbWUubWljcm9zZWNvbmRzIC8gMTAwMDAwMC47Ci0gICAg dGltZSArPSBpbmZvLnN5c3RlbV90aW1lLnNlY29uZHMgKyBpbmZvLnN5c3RlbV90aW1lLm1pY3Jv c2Vjb25kcyAvIDEwMDAwMDAuOwotICAgIAotICAgIHJldHVybiB0aW1lOworCisgICAgcmV0dXJu IHN0ZDo6Y2hyb25vOjpzZWNvbmRzKGluZm8udXNlcl90aW1lLnNlY29uZHMgKyBpbmZvLnN5c3Rl bV90aW1lLnNlY29uZHMpICsgc3RkOjpjaHJvbm86Om1pY3Jvc2Vjb25kcyhpbmZvLnVzZXJfdGlt ZS5taWNyb3NlY29uZHMgKyBpbmZvLnN5c3RlbV90aW1lLm1pY3Jvc2Vjb25kcyk7CiAjZWxpZiBP UyhXSU5ET1dTKQogICAgIHVuaW9uIHsKICAgICAgICAgRklMRVRJTUUgZmlsZVRpbWU7CkBAIC0z MjAsMjAgKzMxNywxNCBAQCBkb3VibGUgY3VycmVudENQVVRpbWUoKQogICAgIEZJTEVUSU1FIGNy ZWF0aW9uVGltZSwgZXhpdFRpbWU7CiAgICAgCiAgICAgR2V0VGhyZWFkVGltZXMoR2V0Q3VycmVu dFRocmVhZCgpLCAmY3JlYXRpb25UaW1lLCAmZXhpdFRpbWUsICZrZXJuZWxUaW1lLmZpbGVUaW1l LCAmdXNlclRpbWUuZmlsZVRpbWUpOwotICAgIAotICAgIHJldHVybiB1c2VyVGltZS5maWxlVGlt ZUFzTG9uZyAvIDEwMDAwMDAwLiArIGtlcm5lbFRpbWUuZmlsZVRpbWVBc0xvbmcgLyAxMDAwMDAw MC47CisKKyAgICByZXR1cm4gc3RkOjpjaHJvbm86Om1pY3Jvc2Vjb25kcygodXNlclRpbWUuZmls ZVRpbWVBc0xvbmcgKyBrZXJuZWxUaW1lLmZpbGVUaW1lQXNMb25nKSAvIDEwKTsKICNlbHNlCiAg ICAgLy8gRklYTUU6IFdlIHNob3VsZCByZXR1cm4gdGhlIHRpbWUgdGhlIGN1cnJlbnQgdGhyZWFk IGhhcyBzcGVudCBleGVjdXRpbmcuCiAKLSAgICAvLyB1c2UgYSByZWxhdGl2ZSB0aW1lIGZyb20g Zmlyc3QgY2FsbCBpbiBvcmRlciB0byBhdm9pZCBhbiBvdmVyZmxvdwotICAgIHN0YXRpYyBkb3Vi bGUgZmlyc3RUaW1lID0gY3VycmVudFRpbWUoKTsKLSAgICByZXR1cm4gY3VycmVudFRpbWUoKSAt IGZpcnN0VGltZTsKKyAgICBzdGF0aWMgYXV0byBmaXJzdFRpbWUgPSBzdGQ6OmNocm9ubzo6c3Rl YWR5X2Nsb2NrOjpub3coKTsKKyAgICByZXR1cm4gc3RkOjpjaHJvbm86OmR1cmF0aW9uX2Nhc3Q8 c3RkOjpjaHJvbm86Om1pY3Jvc2Vjb25kcz4oc3RkOjpjaHJvbm86OnN0ZWFkeV9jbG9jazo6bm93 KCkgLSBmaXJzdFRpbWUpOwogI2VuZGlmCiB9CiAKLWRvdWJsZSBjdXJyZW50Q1BVVGltZU1TKCkK LXsKLSAgICByZXR1cm4gY3VycmVudENQVVRpbWUoKSAqIDEwMDA7Ci19Ci0KIH0gLy8gbmFtZXNw YWNlIFdURgpkaWZmIC0tZ2l0IGEvU291cmNlL1dURi93dGYvQ3VycmVudFRpbWUuaCBiL1NvdXJj ZS9XVEYvd3RmL0N1cnJlbnRUaW1lLmgKaW5kZXggMjE4ZWI5NTZmODJjOWVhNGVlOTM5N2RlY2Fj MzQ2ZDFiMWQ4ZjIyOC4uM2Q3NjRhOTQ3NGYzMzdlMDNiYzBkZWEzOWNlYzQzZjk4NDU0MTZjZiAx MDA2NDQKLS0tIGEvU291cmNlL1dURi93dGYvQ3VycmVudFRpbWUuaAorKysgYi9Tb3VyY2UvV1RG L3d0Zi9DdXJyZW50VGltZS5oCkBAIC0zMiw2ICszMiw3IEBACiAjaWZuZGVmIEN1cnJlbnRUaW1l X2gKICNkZWZpbmUgQ3VycmVudFRpbWVfaAogCisjaW5jbHVkZSA8Y2hyb25vPgogI2luY2x1ZGUg PHRpbWUuaD4KIAogbmFtZXNwYWNlIFdURiB7CkBAIC01NSwxMyArNTYsMTAgQEAgaW5saW5lIGRv dWJsZSBjdXJyZW50VGltZU1TKCkKIC8vIE5UUCBvciBtYW51YWwgYWRqdXN0bWVudHMsIHNvIGl0 IGlzIGJldHRlciBzdWl0ZWQgZm9yIGVsYXBzZWQgdGltZSBtZWFzdXJlbWVudC4KIFdURl9FWFBP UlRfUFJJVkFURSBkb3VibGUgbW9ub3RvbmljYWxseUluY3JlYXNpbmdUaW1lKCk7CiAKLS8vIFJl dHVybnMgdGhlIGN1cnJlbnQgQ1BVIHRpbWUgb2YgdGhlIGN1cnJlbnQgdGhyZWFkIGluIHNlY29u ZHMuCisvLyBSZXR1cm5zIHRoZSBjdXJyZW50IENQVSB0aW1lIG9mIHRoZSBjdXJyZW50IHRocmVh ZC4KIC8vIFByZWNpc2lvbiB2YXJpZXMgZGVwZW5kaW5nIG9uIHBsYXRmb3JtIGJ1dCBpcyB1c3Vh bGx5IGFzIGdvb2Qgb3IgYmV0dGVyCiAvLyB0aGFuIGEgbWlsbGlzZWNvbmQuCi1XVEZfRVhQT1JU X1BSSVZBVEUgZG91YmxlIGN1cnJlbnRDUFVUaW1lKCk7Ci0KLS8vIFJldHVybnMgdGhlIGN1cnJl bnQgQ1BVIHRpbWUgb2YgdGhlIGN1cnJlbnQgdGhyZWFkIGluIG1pbGxpc2Vjb25kcy4KLVdURl9F WFBPUlRfUFJJVkFURSBkb3VibGUgY3VycmVudENQVVRpbWVNUygpOworV1RGX0VYUE9SVF9QUklW QVRFIHN0ZDo6Y2hyb25vOjptaWNyb3NlY29uZHMgY3VycmVudENQVVRpbWUoKTsKIAogfSAvLyBu YW1lc3BhY2UgV1RGCiAK 242840 2014-12-08 12:49:22 -0800 2014-12-08 14:14:49 -0800 Patch bug-139410-20141208125001.patch text/plain 11822 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTc2OTQ5CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBl NjgwOGEyNzlhNWU4NGE5NzNhNTAwMzQ2NjE1Y2M2ZTlkZTcxMTg5Li5iMWRiMmQ0YWNlOTA4ZDM4 MzJiN2JhZDliMjhlZTMxOGEwNGYzMmZjIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyMiBAQAorMjAxNC0xMi0wOCAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUu Y29tPgorCisgICAgICAgIENoYW5nZSBXVEY6OmN1cnJlbnRDUFVUaW1lIHRvIHJldHVybiBzdGQ6 OmNocm9ubzo6bWljcm9zZWNvbmRzIGFuZCBnZXQgcmlkIG9mIGN1cnJlbnRDUFVUaW1lTVMKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzOTQxMAorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogQVBJL0pTQ29u dGV4dFJlZi5jcHA6CisgICAgICAgIChKU0NvbnRleHRHcm91cFNldEV4ZWN1dGlvblRpbWVMaW1p dCk6CisgICAgICAgIChKU0NvbnRleHRHcm91cENsZWFyRXhlY3V0aW9uVGltZUxpbWl0KToKKyAg ICAgICAgKiBydW50aW1lL1dhdGNoZG9nLmNwcDoKKyAgICAgICAgKEpTQzo6V2F0Y2hkb2c6OnNl dFRpbWVMaW1pdCk6CisgICAgICAgIChKU0M6OldhdGNoZG9nOjpkaWRGaXJlKToKKyAgICAgICAg KEpTQzo6V2F0Y2hkb2c6OnN0YXJ0Q291bnRkb3duSWZOZWVkZWQpOgorICAgICAgICAoSlNDOjpX YXRjaGRvZzo6c3RhcnRDb3VudGRvd24pOgorICAgICAgICAqIHJ1bnRpbWUvV2F0Y2hkb2cuaDoK KyAgICAgICAgKiBydW50aW1lL1dhdGNoZG9nTWFjLmNwcDoKKyAgICAgICAgKEpTQzo6V2F0Y2hk b2c6OnN0YXJ0VGltZXIpOgorCiAyMDE0LTEyLTA3ICBDc2FiYSBPc3p0cm9nb27DoWMgIDxvc3N5 QHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmVtb3ZlIHRoZSB1bnVzZWQgV1RGX1VTRV9HQ0NfQ09N UFVURURfR09UT19XT1JLQVJPVU5EIGFmdGVyIHIxMjk0NTMuCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V1RGL0NoYW5nZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IGNkYWY4NGNiNzFhNjA5 YmFlNDBlM2FhNWQxYWQ3NGRhYzY5Y2U0MzguLmNhYzkzZmZiODZiZmM5OWFiNWRjYmJjM2QxNWY0 YzlmZWFlM2Q1NTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XVEYvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTQtMTItMDggIEFuZGVycyBDYXJs c3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KKworICAgICAgICBDaGFuZ2UgV1RGOjpjdXJyZW50 Q1BVVGltZSB0byByZXR1cm4gc3RkOjpjaHJvbm86Om1pY3Jvc2Vjb25kcyBhbmQgZ2V0IHJpZCBv ZiBjdXJyZW50Q1BVVGltZU1TCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xMzk0MTAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICAqIHd0Zi9DdXJyZW50VGltZS5jcHA6CisgICAgICAgIChXVEY6OmN1cnJlbnRD UFVUaW1lKToKKyAgICAgICAgKFdURjo6Y3VycmVudENQVVRpbWVNUyk6IERlbGV0ZWQuCisgICAg ICAgICogd3RmL0N1cnJlbnRUaW1lLmg6CisKIDIwMTQtMTItMDcgIEFuZHJlYXMgS2xpbmcgIDxh a2xpbmdAYXBwbGUuY29tPgogCiAgICAgICAgIFVzZSBtb3JlIFBhc3NSZWYgaW4gQXRvbWljU3Ry aW5nLgpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL0FQSS9KU0NvbnRleHRSZWYu Y3BwIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0FQSS9KU0NvbnRleHRSZWYuY3BwCmluZGV4IDlk MmIxMDBlMzU5ZDJkOTEzM2Y5MjI2MTg3NmUwNDIwZjMwZmQ5MjAuLjdkMDI3YmQ4NDI3MjhiODdi MGNkNTY5MTQ0MDliZGUzOWUxMWNkN2EgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9BUEkvSlNDb250ZXh0UmVmLmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvQVBJL0pT Q29udGV4dFJlZi5jcHAKQEAgLTk5LDkgKzk5LDkgQEAgdm9pZCBKU0NvbnRleHRHcm91cFNldEV4 ZWN1dGlvblRpbWVMaW1pdChKU0NvbnRleHRHcm91cFJlZiBncm91cCwgZG91YmxlIGxpbWl0LAog ICAgIFdhdGNoZG9nJiB3YXRjaGRvZyA9ICp2bS53YXRjaGRvZzsKICAgICBpZiAoY2FsbGJhY2sp IHsKICAgICAgICAgdm9pZCogY2FsbGJhY2tQdHIgPSByZWludGVycHJldF9jYXN0PHZvaWQqPihj YWxsYmFjayk7Ci0gICAgICAgIHdhdGNoZG9nLnNldFRpbWVMaW1pdCh2bSwgbGltaXQsIGludGVy bmFsU2NyaXB0VGltZW91dENhbGxiYWNrLCBjYWxsYmFja1B0ciwgY2FsbGJhY2tEYXRhKTsKKyAg ICAgICAgd2F0Y2hkb2cuc2V0VGltZUxpbWl0KHZtLCBzdGQ6OmNocm9ubzo6ZHVyYXRpb25fY2Fz dDxzdGQ6OmNocm9ubzo6bWljcm9zZWNvbmRzPihzdGQ6OmNocm9ubzo6ZHVyYXRpb248ZG91Ymxl PihsaW1pdCkpLCBpbnRlcm5hbFNjcmlwdFRpbWVvdXRDYWxsYmFjaywgY2FsbGJhY2tQdHIsIGNh bGxiYWNrRGF0YSk7CiAgICAgfSBlbHNlCi0gICAgICAgIHdhdGNoZG9nLnNldFRpbWVMaW1pdCh2 bSwgbGltaXQpOworICAgICAgICB3YXRjaGRvZy5zZXRUaW1lTGltaXQodm0sIHN0ZDo6Y2hyb25v OjpkdXJhdGlvbl9jYXN0PHN0ZDo6Y2hyb25vOjptaWNyb3NlY29uZHM+KHN0ZDo6Y2hyb25vOjpk dXJhdGlvbjxkb3VibGU+KGxpbWl0KSkpOwogfQogCiB2b2lkIEpTQ29udGV4dEdyb3VwQ2xlYXJF eGVjdXRpb25UaW1lTGltaXQoSlNDb250ZXh0R3JvdXBSZWYgZ3JvdXApCkBAIC0xMTEsNyArMTEx LDcgQEAgdm9pZCBKU0NvbnRleHRHcm91cENsZWFyRXhlY3V0aW9uVGltZUxpbWl0KEpTQ29udGV4 dEdyb3VwUmVmIGdyb3VwKQogICAgIGlmICghdm0ud2F0Y2hkb2cpCiAgICAgICAgIHZtLndhdGNo ZG9nID0gc3RkOjptYWtlX3VuaXF1ZTxXYXRjaGRvZz4oKTsKICAgICBXYXRjaGRvZyYgd2F0Y2hk b2cgPSAqdm0ud2F0Y2hkb2c7Ci0gICAgd2F0Y2hkb2cuc2V0VGltZUxpbWl0KHZtLCBzdGQ6Om51 bWVyaWNfbGltaXRzPGRvdWJsZT46OmluZmluaXR5KCkpOworICAgIHdhdGNoZG9nLnNldFRpbWVM aW1pdCh2bSwgc3RkOjpjaHJvbm86Om1pY3Jvc2Vjb25kczo6bWF4KCkpOwogfQogCiAvLyBGcm9t IHRoZSBBUEkncyBwZXJzcGVjdGl2ZSwgYSBnbG9iYWwgY29udGV4dCByZW1haW5zIGFsaXZlIGlm ZiBpdCBoYXMgYmVlbiBKU0dsb2JhbENvbnRleHRSZXRhaW5lZC4KZGlmZiAtLWdpdCBhL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1dhdGNoZG9nLmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS9ydW50aW1lL1dhdGNoZG9nLmNwcAppbmRleCA1YjFmZTJiMjk2NzFlOWQ1MThmNzMyZjM5 MDc5MmJhNDQ5ZDNmNDllLi43YzNmZjFjMjgzMWQ3OWUwYzY2ODYyZmQwNzZkMjZjOWRjMTkyNjg1 IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9XYXRjaGRvZy5jcHAK KysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvV2F0Y2hkb2cuY3BwCkBAIC0zMiw3 ICszMiw3IEBACiAKIG5hbWVzcGFjZSBKU0MgewogCi0jZGVmaW5lIE5PX0xJTUlUIHN0ZDo6bnVt ZXJpY19saW1pdHM8ZG91YmxlPjo6aW5maW5pdHkoKQorI2RlZmluZSBOT19MSU1JVCBzdGQ6OmNo cm9ubzo6bWljcm9zZWNvbmRzOjptYXgoKQogCiBXYXRjaGRvZzo6V2F0Y2hkb2coKQogICAgIDog bV90aW1lckRpZEZpcmUoZmFsc2UpCkBAIC01Niw3ICs1Niw3IEBAIFdhdGNoZG9nOjp+V2F0Y2hk b2coKQogICAgIGRlc3Ryb3lUaW1lcigpOwogfQogCi12b2lkIFdhdGNoZG9nOjpzZXRUaW1lTGlt aXQoVk0mIHZtLCBkb3VibGUgbGltaXQsCit2b2lkIFdhdGNoZG9nOjpzZXRUaW1lTGltaXQoVk0m IHZtLCBzdGQ6OmNocm9ubzo6bWljcm9zZWNvbmRzIGxpbWl0LAogICAgIFNob3VsZFRlcm1pbmF0 ZUNhbGxiYWNrIGNhbGxiYWNrLCB2b2lkKiBkYXRhMSwgdm9pZCogZGF0YTIpCiB7CiAgICAgYm9v bCB3YXNFbmFibGVkID0gaXNFbmFibGVkKCk7CkBAIC05Nyw5ICs5Nyw5IEBAIGJvb2wgV2F0Y2hk b2c6OmRpZEZpcmUoRXhlY1N0YXRlKiBleGVjKQogICAgIG1fdGltZXJEaWRGaXJlID0gZmFsc2U7 CiAgICAgc3RvcENvdW50ZG93bigpOwogCi0gICAgZG91YmxlIGN1cnJlbnRUaW1lID0gY3VycmVu dENQVVRpbWUoKTsKLSAgICBkb3VibGUgZGVsdGFUaW1lID0gY3VycmVudFRpbWUgLSBtX3N0YXJ0 VGltZTsKLSAgICBkb3VibGUgdG90YWxFbGFwc2VkVGltZSA9IG1fZWxhcHNlZFRpbWUgKyBkZWx0 YVRpbWU7CisgICAgYXV0byBjdXJyZW50VGltZSA9IGN1cnJlbnRDUFVUaW1lKCk7CisgICAgYXV0 byBkZWx0YVRpbWUgPSBjdXJyZW50VGltZSAtIG1fc3RhcnRUaW1lOworICAgIGF1dG8gdG90YWxF bGFwc2VkVGltZSA9IG1fZWxhcHNlZFRpbWUgKyBkZWx0YVRpbWU7CiAgICAgaWYgKHRvdGFsRWxh cHNlZFRpbWUgPiBtX2xpbWl0KSB7CiAgICAgICAgIC8vIENhc2UgMTogdGhlIGFsbG93ZWQgQ1BV IHRpbWUgaGFzIGVsYXBzZWQuCiAKQEAgLTEyMSw3ICsxMjEsNyBAQCBib29sIFdhdGNoZG9nOjpk aWRGaXJlKEV4ZWNTdGF0ZSogZXhlYykKIAogICAgICAgICAvLyBUZWxsIHRoZSB0aW1lciB0byBh bGFybSB1cyBhZ2FpbiB3aGVuIGl0IHRoaW5rcyB3ZSd2ZSByZWFjaGVkIHRoZQogICAgICAgICAv LyBlbmQgb2YgdGhlIGFsbG93ZWQgdGltZS4KLSAgICAgICAgZG91YmxlIHJlbWFpbmluZ1RpbWUg PSBtX2xpbWl0IC0gdG90YWxFbGFwc2VkVGltZTsKKyAgICAgICAgYXV0byByZW1haW5pbmdUaW1l ID0gbV9saW1pdCAtIHRvdGFsRWxhcHNlZFRpbWU7CiAgICAgICAgIG1fZWxhcHNlZFRpbWUgPSB0 b3RhbEVsYXBzZWRUaW1lOwogICAgICAgICBtX3N0YXJ0VGltZSA9IGN1cnJlbnRUaW1lOwogICAg ICAgICBzdGFydENvdW50ZG93bihyZW1haW5pbmdUaW1lKTsKQEAgLTE2NCwxMyArMTY0LDEzIEBA IHZvaWQgV2F0Y2hkb2c6OnN0YXJ0Q291bnRkb3duSWZOZWVkZWQoKQogICAgICAgICByZXR1cm47 IC8vIE5vdCBleGVjdXRpbmcgSlMgc2NyaXB0LiBObyBuZWVkIHRvIHN0YXJ0LgogCiAgICAgaWYg KGlzRW5hYmxlZCgpKSB7Ci0gICAgICAgIG1fZWxhcHNlZFRpbWUgPSAwOworICAgICAgICBtX2Vs YXBzZWRUaW1lID0gc3RkOjpjaHJvbm86Om1pY3Jvc2Vjb25kczo6emVybygpOwogICAgICAgICBt X3N0YXJ0VGltZSA9IGN1cnJlbnRDUFVUaW1lKCk7CiAgICAgICAgIHN0YXJ0Q291bnRkb3duKG1f bGltaXQpOwogICAgIH0KIH0KIAotdm9pZCBXYXRjaGRvZzo6c3RhcnRDb3VudGRvd24oZG91Ymxl IGxpbWl0KQordm9pZCBXYXRjaGRvZzo6c3RhcnRDb3VudGRvd24oc3RkOjpjaHJvbm86Om1pY3Jv c2Vjb25kcyBsaW1pdCkKIHsKICAgICBBU1NFUlQobV9pc1N0b3BwZWQpOwogICAgIG1faXNTdG9w cGVkID0gZmFsc2U7CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9X YXRjaGRvZy5oIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvV2F0Y2hkb2cuaAppbmRl eCA1MThmZDlkN2QwZTVhMzNjODAzYWRkYWIyNGY1M2YyNjBkNjMwNzM3Li45MWQ4ZDY0MWYwNWZi NjdmNjg4MjFiOGRiYmI5YmI4NzgwMjAzODVjIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvcnVudGltZS9XYXRjaGRvZy5oCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50 aW1lL1dhdGNoZG9nLmgKQEAgLTQzLDcgKzQzLDcgQEAgcHVibGljOgogICAgIH5XYXRjaGRvZygp OwogCiAgICAgdHlwZWRlZiBib29sICgqU2hvdWxkVGVybWluYXRlQ2FsbGJhY2spKEV4ZWNTdGF0 ZSosIHZvaWQqIGRhdGExLCB2b2lkKiBkYXRhMik7Ci0gICAgdm9pZCBzZXRUaW1lTGltaXQoVk0m LCBkb3VibGUgc2Vjb25kcywgU2hvdWxkVGVybWluYXRlQ2FsbGJhY2sgPSAwLCB2b2lkKiBkYXRh MSA9IDAsIHZvaWQqIGRhdGEyID0gMCk7CisgICAgdm9pZCBzZXRUaW1lTGltaXQoVk0mLCBzdGQ6 OmNocm9ubzo6bWljcm9zZWNvbmRzIGxpbWl0LCBTaG91bGRUZXJtaW5hdGVDYWxsYmFjayA9IDAs IHZvaWQqIGRhdGExID0gMCwgdm9pZCogZGF0YTIgPSAwKTsKIAogICAgIC8vIFRoaXMgdmVyc2lv biBvZiBkaWRGaXJlKCkgd2lsbCBjaGVjayB0aGUgZWxhcHNlZCBDUFUgdGltZSBhbmQgY2FsbCB0 aGUKICAgICAvLyBjYWxsYmFjayAoaWYgbmVlZGVkKSB0byBkZXRlcm1pbmUgaWYgdGhlIHdhdGNo ZG9nIHNob3VsZCBmaXJlLgpAQCAtNjMsMTQgKzYzLDE0IEBAIHByaXZhdGU6CiAgICAgdm9pZCBh cm0oKTsKICAgICB2b2lkIGRpc2FybSgpOwogICAgIHZvaWQgc3RhcnRDb3VudGRvd25JZk5lZWRl ZCgpOwotICAgIHZvaWQgc3RhcnRDb3VudGRvd24oZG91YmxlIGxpbWl0KTsKKyAgICB2b2lkIHN0 YXJ0Q291bnRkb3duKHN0ZDo6Y2hyb25vOjptaWNyb3NlY29uZHMgbGltaXQpOwogICAgIHZvaWQg c3RvcENvdW50ZG93bigpOwogICAgIGJvb2wgaXNBcm1lZCgpIHsgcmV0dXJuICEhbV9yZWVudHJ5 Q291bnQ7IH0KIAogICAgIC8vIFBsYXRmb3JtIHNwZWNpZmljIHRpbWVyIGltcGxlbWVudGF0aW9u OgogICAgIHZvaWQgaW5pdFRpbWVyKCk7CiAgICAgdm9pZCBkZXN0cm95VGltZXIoKTsKLSAgICB2 b2lkIHN0YXJ0VGltZXIoZG91YmxlIGxpbWl0KTsKKyAgICB2b2lkIHN0YXJ0VGltZXIoc3RkOjpj aHJvbm86Om1pY3Jvc2Vjb25kcyBsaW1pdCk7CiAgICAgdm9pZCBzdG9wVGltZXIoKTsKIAogICAg IC8vIG1fdGltZXJEaWRGaXJlIChhYm92ZSkgaW5kaWNhdGVzIHdoZXRoZXIgdGhlIHRpbWVyIGZp cmVkLiBUaGUgV2F0Y2hkb2cKQEAgLTgxLDEwICs4MSw5IEBAIHByaXZhdGU6CiAgICAgYm9vbCBt X3RpbWVyRGlkRmlyZTsKICAgICBib29sIG1fZGlkRmlyZTsKIAotICAgIC8vIEFsbCB0aW1lIHVu aXRzIGFyZSBpbiBzZWNvbmRzLgotICAgIGRvdWJsZSBtX2xpbWl0OwotICAgIGRvdWJsZSBtX3N0 YXJ0VGltZTsKLSAgICBkb3VibGUgbV9lbGFwc2VkVGltZTsKKyAgICBzdGQ6OmNocm9ubzo6bWlj cm9zZWNvbmRzIG1fbGltaXQ7CisgICAgc3RkOjpjaHJvbm86Om1pY3Jvc2Vjb25kcyBtX3N0YXJ0 VGltZTsKKyAgICBzdGQ6OmNocm9ubzo6bWljcm9zZWNvbmRzIG1fZWxhcHNlZFRpbWU7CiAKICAg ICBpbnQgbV9yZWVudHJ5Q291bnQ7CiAgICAgYm9vbCBtX2lzU3RvcHBlZDsKZGlmZiAtLWdpdCBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1dhdGNoZG9nTWFjLmNwcCBiL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS9ydW50aW1lL1dhdGNoZG9nTWFjLmNwcAppbmRleCBjYTQ3NGRmMmYxOGQz ZjIyOGQxNGY0NjcyMjM1NzRlMTJhMzZjNmJkLi4zNGYyZWQzMzg4MTc4M2NiODNjYWJiNmQwYTJl OWFjYmZlNzg2YTFjIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9X YXRjaGRvZ01hYy5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvV2F0Y2hk b2dNYWMuY3BwCkBAIC00MSw3ICs0MSw3IEBAIHZvaWQgV2F0Y2hkb2c6OmRlc3Ryb3lUaW1lcigp CiAgICAgICAgIGRpc3BhdGNoX3JlbGVhc2UobV9xdWV1ZSk7CiB9CiAKLXZvaWQgV2F0Y2hkb2c6 OnN0YXJ0VGltZXIoZG91YmxlIGxpbWl0KQordm9pZCBXYXRjaGRvZzo6c3RhcnRUaW1lcihzdGQ6 OmNocm9ubzo6bWljcm9zZWNvbmRzIGxpbWl0KQogewogICAgIEFTU0VSVCghbV90aW1lcik7CiAg ICAgaWYgKCFtX3F1ZXVlKQpAQCAtNDksNyArNDksNyBAQCB2b2lkIFdhdGNoZG9nOjpzdGFydFRp bWVyKGRvdWJsZSBsaW1pdCkKICAgICBtX3RpbWVyID0gZGlzcGF0Y2hfc291cmNlX2NyZWF0ZShE SVNQQVRDSF9TT1VSQ0VfVFlQRV9USU1FUiwgMCwgMCwgbV9xdWV1ZSk7CiAKICAgICBkaXNwYXRj aF9zb3VyY2Vfc2V0X3RpbWVyKG1fdGltZXIsCi0gICAgICAgIGRpc3BhdGNoX3RpbWUoRElTUEFU Q0hfVElNRV9OT1csIGxpbWl0ICogTlNFQ19QRVJfU0VDKSwKKyAgICAgICAgZGlzcGF0Y2hfdGlt ZShESVNQQVRDSF9USU1FX05PVywgc3RkOjpjaHJvbm86Om5hbm9zZWNvbmRzKGxpbWl0KS5jb3Vu dCgpKSwKICAgICAgICAgRElTUEFUQ0hfVElNRV9GT1JFVkVSLCAwKTsKIAogICAgIGRpc3BhdGNo X3NvdXJjZV9zZXRfZXZlbnRfaGFuZGxlcihtX3RpbWVyLCBeewpkaWZmIC0tZ2l0IGEvU291cmNl L0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvV2F0Y2hkb2dOb25lLmNwcCBiL1NvdXJjZS9KYXZhU2Ny aXB0Q29yZS9ydW50aW1lL1dhdGNoZG9nTm9uZS5jcHAKaW5kZXggNjE1MzE0YmIzZGE5Mjg5NWI1 ZjQ3NmRkNTA5MWMzOTA0NTJjMzlmMy4uZDdiN2NkNTdhNjE3YmYxZjk1NTcwN2EzNDRkNjcwOTIy MTY0MzU1NSAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvV2F0Y2hk b2dOb25lLmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9XYXRjaGRvZ05v bmUuY3BwCkBAIC0zOSw3ICszOSw3IEBAIHZvaWQgV2F0Y2hkb2c6OmRlc3Ryb3lUaW1lcigpCiB7 CiB9CiAKLXZvaWQgV2F0Y2hkb2c6OnN0YXJ0VGltZXIoZG91YmxlKQordm9pZCBXYXRjaGRvZzo6 c3RhcnRUaW1lcihzdGQ6OmNocm9ubzo6bWljcm9zZWNvbmRzKQogewogfQogCmRpZmYgLS1naXQg YS9Tb3VyY2UvV1RGL3d0Zi9DdXJyZW50VGltZS5jcHAgYi9Tb3VyY2UvV1RGL3d0Zi9DdXJyZW50 VGltZS5jcHAKaW5kZXggNDExZTY3MTQ4Yzk2Y2QwMWE2MjhhMGI3NmZmZjdlYjM2MDcwYmVkNS4u YzU4NDJjOTdkYWUwMTVkZmMxZTNkN2Q4YjE3MmEyOTBkMmI0Zjc4YyAxMDA2NDQKLS0tIGEvU291 cmNlL1dURi93dGYvQ3VycmVudFRpbWUuY3BwCisrKyBiL1NvdXJjZS9XVEYvd3RmL0N1cnJlbnRU aW1lLmNwcApAQCAtMjk0LDcgKzI5NCw3IEBAIGRvdWJsZSBtb25vdG9uaWNhbGx5SW5jcmVhc2lu Z1RpbWUoKQogCiAjZW5kaWYKIAotZG91YmxlIGN1cnJlbnRDUFVUaW1lKCkKK3N0ZDo6Y2hyb25v OjptaWNyb3NlY29uZHMgY3VycmVudENQVVRpbWUoKQogewogI2lmIE9TKERBUldJTikKICAgICBt YWNoX21zZ190eXBlX251bWJlcl90IGluZm9Db3VudCA9IFRIUkVBRF9CQVNJQ19JTkZPX0NPVU5U OwpAQCAtMzA0LDExICszMDQsOCBAQCBkb3VibGUgY3VycmVudENQVVRpbWUoKQogICAgIG1hY2hf cG9ydF90IHRocmVhZFBvcnQgPSBtYWNoX3RocmVhZF9zZWxmKCk7CiAgICAgdGhyZWFkX2luZm8o dGhyZWFkUG9ydCwgVEhSRUFEX0JBU0lDX0lORk8sIHJlaW50ZXJwcmV0X2Nhc3Q8dGhyZWFkX2lu Zm9fdD4oJmluZm8pLCAmaW5mb0NvdW50KTsKICAgICBtYWNoX3BvcnRfZGVhbGxvY2F0ZShtYWNo X3Rhc2tfc2VsZigpLCB0aHJlYWRQb3J0KTsKLSAgICAKLSAgICBkb3VibGUgdGltZSA9IGluZm8u dXNlcl90aW1lLnNlY29uZHMgKyBpbmZvLnVzZXJfdGltZS5taWNyb3NlY29uZHMgLyAxMDAwMDAw LjsKLSAgICB0aW1lICs9IGluZm8uc3lzdGVtX3RpbWUuc2Vjb25kcyArIGluZm8uc3lzdGVtX3Rp bWUubWljcm9zZWNvbmRzIC8gMTAwMDAwMC47Ci0gICAgCi0gICAgcmV0dXJuIHRpbWU7CisKKyAg ICByZXR1cm4gc3RkOjpjaHJvbm86OnNlY29uZHMoaW5mby51c2VyX3RpbWUuc2Vjb25kcyArIGlu Zm8uc3lzdGVtX3RpbWUuc2Vjb25kcykgKyBzdGQ6OmNocm9ubzo6bWljcm9zZWNvbmRzKGluZm8u dXNlcl90aW1lLm1pY3Jvc2Vjb25kcyArIGluZm8uc3lzdGVtX3RpbWUubWljcm9zZWNvbmRzKTsK ICNlbGlmIE9TKFdJTkRPV1MpCiAgICAgdW5pb24gewogICAgICAgICBGSUxFVElNRSBmaWxlVGlt ZTsKQEAgLTMyMCwyMCArMzE3LDE0IEBAIGRvdWJsZSBjdXJyZW50Q1BVVGltZSgpCiAgICAgRklM RVRJTUUgY3JlYXRpb25UaW1lLCBleGl0VGltZTsKICAgICAKICAgICBHZXRUaHJlYWRUaW1lcyhH ZXRDdXJyZW50VGhyZWFkKCksICZjcmVhdGlvblRpbWUsICZleGl0VGltZSwgJmtlcm5lbFRpbWUu ZmlsZVRpbWUsICZ1c2VyVGltZS5maWxlVGltZSk7Ci0gICAgCi0gICAgcmV0dXJuIHVzZXJUaW1l LmZpbGVUaW1lQXNMb25nIC8gMTAwMDAwMDAuICsga2VybmVsVGltZS5maWxlVGltZUFzTG9uZyAv IDEwMDAwMDAwLjsKKworICAgIHJldHVybiBzdGQ6OmNocm9ubzo6bWljcm9zZWNvbmRzKCh1c2Vy VGltZS5maWxlVGltZUFzTG9uZyArIGtlcm5lbFRpbWUuZmlsZVRpbWVBc0xvbmcpIC8gMTApOwog I2Vsc2UKICAgICAvLyBGSVhNRTogV2Ugc2hvdWxkIHJldHVybiB0aGUgdGltZSB0aGUgY3VycmVu dCB0aHJlYWQgaGFzIHNwZW50IGV4ZWN1dGluZy4KIAotICAgIC8vIHVzZSBhIHJlbGF0aXZlIHRp bWUgZnJvbSBmaXJzdCBjYWxsIGluIG9yZGVyIHRvIGF2b2lkIGFuIG92ZXJmbG93Ci0gICAgc3Rh dGljIGRvdWJsZSBmaXJzdFRpbWUgPSBjdXJyZW50VGltZSgpOwotICAgIHJldHVybiBjdXJyZW50 VGltZSgpIC0gZmlyc3RUaW1lOworICAgIHN0YXRpYyBhdXRvIGZpcnN0VGltZSA9IHN0ZDo6Y2hy b25vOjpzdGVhZHlfY2xvY2s6Om5vdygpOworICAgIHJldHVybiBzdGQ6OmNocm9ubzo6ZHVyYXRp b25fY2FzdDxzdGQ6OmNocm9ubzo6bWljcm9zZWNvbmRzPihzdGQ6OmNocm9ubzo6c3RlYWR5X2Ns b2NrOjpub3coKSAtIGZpcnN0VGltZSk7CiAjZW5kaWYKIH0KIAotZG91YmxlIGN1cnJlbnRDUFVU aW1lTVMoKQotewotICAgIHJldHVybiBjdXJyZW50Q1BVVGltZSgpICogMTAwMDsKLX0KLQogfSAv LyBuYW1lc3BhY2UgV1RGCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL3d0Zi9DdXJyZW50VGltZS5o IGIvU291cmNlL1dURi93dGYvQ3VycmVudFRpbWUuaAppbmRleCAyMThlYjk1NmY4MmM5ZWE0ZWU5 Mzk3ZGVjYWMzNDZkMWIxZDhmMjI4Li4zZDc2NGE5NDc0ZjMzN2UwM2JjMGRlYTM5Y2VjNDNmOTg0 NTQxNmNmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL3d0Zi9DdXJyZW50VGltZS5oCisrKyBiL1Nv dXJjZS9XVEYvd3RmL0N1cnJlbnRUaW1lLmgKQEAgLTMyLDYgKzMyLDcgQEAKICNpZm5kZWYgQ3Vy cmVudFRpbWVfaAogI2RlZmluZSBDdXJyZW50VGltZV9oCiAKKyNpbmNsdWRlIDxjaHJvbm8+CiAj aW5jbHVkZSA8dGltZS5oPgogCiBuYW1lc3BhY2UgV1RGIHsKQEAgLTU1LDEzICs1NiwxMCBAQCBp bmxpbmUgZG91YmxlIGN1cnJlbnRUaW1lTVMoKQogLy8gTlRQIG9yIG1hbnVhbCBhZGp1c3RtZW50 cywgc28gaXQgaXMgYmV0dGVyIHN1aXRlZCBmb3IgZWxhcHNlZCB0aW1lIG1lYXN1cmVtZW50Lgog V1RGX0VYUE9SVF9QUklWQVRFIGRvdWJsZSBtb25vdG9uaWNhbGx5SW5jcmVhc2luZ1RpbWUoKTsK IAotLy8gUmV0dXJucyB0aGUgY3VycmVudCBDUFUgdGltZSBvZiB0aGUgY3VycmVudCB0aHJlYWQg aW4gc2Vjb25kcy4KKy8vIFJldHVybnMgdGhlIGN1cnJlbnQgQ1BVIHRpbWUgb2YgdGhlIGN1cnJl bnQgdGhyZWFkLgogLy8gUHJlY2lzaW9uIHZhcmllcyBkZXBlbmRpbmcgb24gcGxhdGZvcm0gYnV0 IGlzIHVzdWFsbHkgYXMgZ29vZCBvciBiZXR0ZXIKIC8vIHRoYW4gYSBtaWxsaXNlY29uZC4KLVdU Rl9FWFBPUlRfUFJJVkFURSBkb3VibGUgY3VycmVudENQVVRpbWUoKTsKLQotLy8gUmV0dXJucyB0 aGUgY3VycmVudCBDUFUgdGltZSBvZiB0aGUgY3VycmVudCB0aHJlYWQgaW4gbWlsbGlzZWNvbmRz LgotV1RGX0VYUE9SVF9QUklWQVRFIGRvdWJsZSBjdXJyZW50Q1BVVGltZU1TKCk7CitXVEZfRVhQ T1JUX1BSSVZBVEUgc3RkOjpjaHJvbm86Om1pY3Jvc2Vjb25kcyBjdXJyZW50Q1BVVGltZSgpOwog CiB9IC8vIG5hbWVzcGFjZSBXVEYKIAo=