224829 2021-04-20 14:23:38 -0700 If an idle GPUProcess doesn't exit under memory pressure because it just launched, check again later 2021-04-23 01:23:08 -0700 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 224798 1 cdumez cdumez darin ggaren kkinnunen webkit-bug-importer oldest_to_newest 1752420 0 cdumez 2021-04-20 14:23:38 -0700 If an idle GPUProcess doesn't exit under memory pressure because it just launched, check again later. This is a follow-up to r276305. 1752429 1 426594 cdumez 2021-04-20 14:33:46 -0700 Created attachment 426594 Patch 1752448 2 426594 darin 2021-04-20 15:16:55 -0700 Comment on attachment 426594 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=426594&action=review > Source/WebKit/GPUProcess/GPUProcess.cpp:155 > return true; Should we do m_idleExitTimer.stop() here too? 1752451 3 426594 cdumez 2021-04-20 15:19:36 -0700 Comment on attachment 426594 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=426594&action=review >> Source/WebKit/GPUProcess/GPUProcess.cpp:155 >> return true; > > Should we do m_idleExitTimer.stop() here too? Hmm. In this case, we will end up exiting anyway, but sure, it feels a bit cleaner to stop the timer in this case too. 1752459 4 426600 cdumez 2021-04-20 15:32:23 -0700 Created attachment 426600 Patch 1752468 5 426602 cdumez 2021-04-20 15:36:51 -0700 Created attachment 426602 Patch 1752471 6 cdumez 2021-04-20 15:38:37 -0700 I made the suggested change. I am asking for review again because I made a significant change. I moved the whole logic from canExitUnderMemoryPressure() to tryExitIfUnused(). It feels much nicer for tryExitIfUnused() to schedule a timer to call tryExitIfUnused() then a simple query function like canExitUnderMemoryPressure(). 1752543 7 ews-feeder 2021-04-20 17:59:00 -0700 Committed r276339 (236817@main): <https://commits.webkit.org/236817@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 426602. 1753498 8 webkit-bug-importer 2021-04-23 01:23:08 -0700 <rdar://problem/77061558> 426594 2021-04-20 14:33:46 -0700 2021-04-20 15:32:22 -0700 Patch bug-224829-20210420143345.patch text/plain 5416 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjc2MzExCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDU3ZjE3YmM0NGFmYzRlNTIw MTVkMWE5YTMwOTA5NGZjNDg1ZDkxMTQuLmY3NDEzMjgxOWRiMmJjYmZlMzI5NWQ5N2Y2ODQzMWEy ODI5N2EzMGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjcgQEAKKzIwMjEtMDQtMjAgIENocmlzIER1 bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBJZiBhbiBpZGxlIEdQVVByb2Nlc3Mg ZG9lc24ndCBleGl0IHVuZGVyIG1lbW9yeSBwcmVzc3VyZSBiZWNhdXNlIGl0IGp1c3QgbGF1bmNo ZWQsIGNoZWNrIGFnYWluIGxhdGVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0yMjQ4MjkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBJbiByMjc2MzA1LCBJIG1hZGUgaXQgc28gdGhhdCB0aGUgR1BVUHJvY2Vz cyBkb2VzIG5vdCBleGl0IHVuZGVyIG1lbW9yeSBwcmVzc3VyZSB3aGVuIGlkbGUKKyAgICAgICAg aWYgaXQgbGF1bmNoZWQgbGVzcyB0aGFuIDUgc2Vjb25kcyBhZ28uIFRoaXMgZ2l2ZXMgdGhlIFdl YlByb2Nlc3MgdGltZSB0byBzY2hlZHVsZSB3b3JrIHdpdGgKKyAgICAgICAgdGhlIEdQVVByb2Nl c3MgYWZ0ZXIgbGF1bmNoaW5nIGl0IGFuZCBtYWtlcyBzdXJlIHdlIGRvbid0IHJlcGVhdGVkbHkg LyBmcmVxdWVudGx5IGV4aXQgJgorICAgICAgICByZWxhdW5jaCB0aGUgR1BVUHJvY2Vzcy4KKwor ICAgICAgICBJbiB0aGlzIHBhdGNoLCBJIGFtIHR3ZWFraW5nIHRoZSBwb2xpY3kgc28gdGhhdCBp ZiB3ZSBjb3VsZCBoYXZlIGV4aXRlZCBidXQgZGlkbid0IGJlY2F1c2UKKyAgICAgICAgdGhlIEdQ VVByb2Nlc3Mgd2FzIHRvbyB5b3VuZyAobGVzcyB0aGFuIDUgc2Vjb25kcyBvbGQpLCB0aGVuIEkg c2NoZWR1bGUgYSB0aW1lciBmb3IgdGhpcworICAgICAgICA1IHNlY29uZCBkZWFkbGluZSB0byBj aGVjayBhZ2FpbiBpZiB0aGUgR1BVUHJvY2VzcyBjb3VsZCBleGl0IChtZWFuaW5nIHRoYXQgaXQg aXMgdW51c2VkKS4KKyAgICAgICAgV2hlbiB0aGUgdGltZXIgZmlyZXMsIHRoZSBwcm9jZXNzIGRv ZXNuJ3QgaGF2ZSB0byBiZSB1bmRlciBtZW1vcnkgcHJlc3N1cmUgc3RpbGwgaW4gb3JkZXIKKyAg ICAgICAgdG8gZXhpdCwgaXQganVzdCBuZWVkcyB0byBiZSBpZGxlLiBJIGZpZ3VyZWQgdGhlIGZh Y3QgdGhhdCB3ZSB3ZXJlIHVuZGVyIG1lbW9yeSBwcmVzc3VyZQorICAgICAgICBsZXNzIHRoYW4g NSBzZWNvbmRzIGFnbyBzaG91bGQgYmUgZW5vdWdoIGluY2VudGl2ZSB0byBleGl0IGlmIGlkbGUu CisKKyAgICAgICAgKiBHUFVQcm9jZXNzL0dQVVByb2Nlc3MuY3BwOgorICAgICAgICAoV2ViS2l0 OjpHUFVQcm9jZXNzOjpHUFVQcm9jZXNzKToKKyAgICAgICAgKFdlYktpdDo6R1BVUHJvY2Vzczo6 Y2FuRXhpdFVuZGVyTWVtb3J5UHJlc3N1cmUgY29uc3QpOgorICAgICAgICAqIEdQVVByb2Nlc3Mv R1BVUHJvY2Vzcy5oOgorCiAyMDIxLTA0LTIwICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVu c2VuQHdlYmtpdC5vcmc+CiAKICAgICAgICAgRml4IHVzZS1hZnRlci1tb3ZlIGludHJvZHVjZWQg aW4gcjI3NTQwNwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9HUFVQcm9jZXNzL0dQVVByb2Nl c3MuY3BwIGIvU291cmNlL1dlYktpdC9HUFVQcm9jZXNzL0dQVVByb2Nlc3MuY3BwCmluZGV4IDk3 MmM4OWY3NTc4MzVhNDBkYWEwMGQzYTdhMDEzN2Y1NTQxZjE2NGMuLjI4ZjZkZDAxNTljMDQ3OTE0 OTI5OTVhYWE3NDk5NWJiMDE5NjJmM2EgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvR1BVUHJv Y2Vzcy9HUFVQcm9jZXNzLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L0dQVVByb2Nlc3MvR1BVUHJv Y2Vzcy5jcHAKQEAgLTc0LDggKzc0LDE0IEBACiBuYW1lc3BhY2UgV2ViS2l0IHsKIHVzaW5nIG5h bWVzcGFjZSBXZWJDb3JlOwogCisvLyBXZSB3b3VsZG4ndCB3YW50IHRoZSBHUFVQcm9jZXNzIHRv IHJlcGVhdGVkbHkgZXhpdCB0aGVuIHJlbGF1bmNoIHdoZW4gdW5kZXIgbWVtb3J5IHByZXNzdXJl LiBJbiBwYXJ0aWN1bGFyLCB3ZSBuZWVkIHRvIG1ha2Ugc3VyZSB0aGUKKy8vIFdlYlByb2Nlc3Mg aGFzIGEgY2hhbmdlIHRvIHNjaGVkdWxlIHdvcmsgYWZ0ZXIgdGhlIEdQVVByb2Nlc3MgZ2V0IGxh dW5jaGVkLiBGb3IgdGhpcyByZWFzb24sIHdlIG1ha2Ugc3VyZSB0aGF0IHRoZSBHUFVQcm9jZXNz IG5ldmVyCisvLyBpZGxlLWV4aXRzIGxlc3MgdGhhbiA1IHNlY29uZHMgYWZ0ZXIgZ2V0dGluZyBs YXVuY2hlZC4gVGhpcyBhbW91bnQgb2YgdGltZSBzaG91bGQgYmUgc3VmZmljaWVudCBmb3IgdGhl IFdlYlByb2Nlc3MgdG8gc2NoZWR1bGUgd29yaworLy8gd29yayBpbiB0aGUgR1BVUHJvY2Vzcy4K K2NvbnN0ZXhwciBTZWNvbmRzIG1pbmltdW1MaWZldGltZUJlZm9yZUlkbGVFeGl0IHsgNV9zIH07 CiAKIEdQVVByb2Nlc3M6OkdQVVByb2Nlc3MoQXV4aWxpYXJ5UHJvY2Vzc0luaXRpYWxpemF0aW9u UGFyYW1ldGVycyYmIHBhcmFtZXRlcnMpCisgICAgOiBtX2lkbGVFeGl0VGltZXIoKnRoaXMsICZH UFVQcm9jZXNzOjp0cnlFeGl0SWZVbnVzZWQpCiB7CiAgICAgaW5pdGlhbGl6ZShXVEZNb3ZlKHBh cmFtZXRlcnMpKTsKICAgICBSRUxFQVNFX0xPRyhQcm9jZXNzLCAiJXAgLSBHUFVQcm9jZXNzOjpH UFVQcm9jZXNzOiIsIHRoaXMpOwpAQCAtMTI5LDE1ICsxMzUsMjIgQEAgYm9vbCBHUFVQcm9jZXNz OjpzaG91bGRUZXJtaW5hdGUoKQogYm9vbCBHUFVQcm9jZXNzOjpjYW5FeGl0VW5kZXJNZW1vcnlQ cmVzc3VyZSgpIGNvbnN0CiB7CiAgICAgQVNTRVJUKGlzTWFpblJ1bkxvb3AoKSk7Ci0gICAgLy8g VG8gYXZvaWQgZXhpdGluZyB0aGUgR1BVUHJvY2VzcyB0b28gYWdncmVzc2l2ZWx5IHdoaWxlIHVu ZGVyIG1lbW9yeSBwcmVzc3VyZSwgd2UgZG9uJ3QgZXhpdCBpZiB3ZSd2ZSBiZWVuIHJ1bm5pbmcK LSAgICAvLyBmb3IgbGVzcyB0aGFuIDUgc2Vjb25kcy4gSW4gY2FzZSBvZiBzaW11bGF0ZWQgbWVt b3J5IHByZXNzdXJlLCB3ZSBpZ25vcmUgdGhpcyBydWxlIHRvIGF2b2lkIGdlbmVyYXRpbmcgZmxh a2luZXNzCi0gICAgLy8gaW4gb3VyIGJlbmNobWFya3MgYW5kIHRlc3RzLgotICAgIGlmICgoTW9u b3RvbmljVGltZTo6bm93KCkgLSBtX2NyZWF0aW9uVGltZSkgPCA1X3MgJiYgIU1lbW9yeVByZXNz dXJlSGFuZGxlcjo6c2luZ2xldG9uKCkuaXNTaW11bGF0aW5nTWVtb3J5UHJlc3N1cmUoKSkKLSAg ICAgICAgcmV0dXJuIGZhbHNlOwotCiAgICAgZm9yIChhdXRvJiB3ZWJQcm9jZXNzQ29ubmVjdGlv biA6IG1fd2ViUHJvY2Vzc0Nvbm5lY3Rpb25zLnZhbHVlcygpKSB7Ci0gICAgICAgIGlmICghd2Vi UHJvY2Vzc0Nvbm5lY3Rpb24tPmFsbG93c0V4aXRVbmRlck1lbW9yeVByZXNzdXJlKCkpCisgICAg ICAgIGlmICghd2ViUHJvY2Vzc0Nvbm5lY3Rpb24tPmFsbG93c0V4aXRVbmRlck1lbW9yeVByZXNz dXJlKCkpIHsKKyAgICAgICAgICAgIG1faWRsZUV4aXRUaW1lci5zdG9wKCk7CiAgICAgICAgICAg ICByZXR1cm4gZmFsc2U7CisgICAgICAgIH0KKyAgICB9CisgICAgLy8gVG8gYXZvaWQgZXhpdGlu ZyB0aGUgR1BVUHJvY2VzcyB0b28gYWdncmVzc2l2ZWx5IHdoaWxlIHVuZGVyIG1lbW9yeSBwcmVz c3VyZSBhbmQgbWFrZSBzdXJlIHRoZSBXZWJQcm9jZXNzIGdldHMgYQorICAgIC8vIGNoYW5nZSB0 byBzY2hlZHVsZSB3b3JrLCB3ZSBkb24ndCBleGl0IGlmIHdlJ3ZlIGJlZW4gcnVubmluZyBmb3Ig bGVzcyB0aGFuIHxtaW5pbXVtTGlmZXRpbWVCZWZvcmVJZGxlRXhpdHwuCisgICAgLy8gSW4gY2Fz ZSBvZiBzaW11bGF0ZWQgbWVtb3J5IHByZXNzdXJlLCB3ZSBpZ25vcmUgdGhpcyBydWxlIHRvIGF2 b2lkIGZsYWtpbmVzcyBpbiBvdXIgYmVuY2htYXJrcyBhbmQgdGVzdHMuCisgICAgYXV0byBsaWZl dGltZSA9IE1vbm90b25pY1RpbWU6Om5vdygpIC0gbV9jcmVhdGlvblRpbWU7CisgICAgaWYgKGxp ZmV0aW1lIDwgbWluaW11bUxpZmV0aW1lQmVmb3JlSWRsZUV4aXQgJiYgIU1lbW9yeVByZXNzdXJl SGFuZGxlcjo6c2luZ2xldG9uKCkuaXNTaW11bGF0aW5nTWVtb3J5UHJlc3N1cmUoKSkgeworICAg ICAgICAvLyBDaGVjayBhZ2FpbiBhZnRlciB0aGUgcHJvY2VzcyBoYXZlIGxpdmVkIGxvbmcgZW5v dWdoIChtaW5pbXVtTGlmZXRpbWVCZWZvcmVJZGxlRXhpdCkgdG8gc2VlIGlmIHRoZSBHUFVQcm9j ZXNzCisgICAgICAgIC8vIGNhbiBpZGxlLWV4aXQgdGhlbi4KKyAgICAgICAgaWYgKCFtX2lkbGVF eGl0VGltZXIuaXNBY3RpdmUoKSkKKyAgICAgICAgICAgIG1faWRsZUV4aXRUaW1lci5zdGFydE9u ZVNob3QobWluaW11bUxpZmV0aW1lQmVmb3JlSWRsZUV4aXQgLSBsaWZldGltZSk7CisgICAgICAg IHJldHVybiBmYWxzZTsKICAgICB9CiAgICAgcmV0dXJuIHRydWU7CiB9CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L0dQVVByb2Nlc3MvR1BVUHJvY2Vzcy5oIGIvU291cmNlL1dlYktpdC9HUFVQ cm9jZXNzL0dQVVByb2Nlc3MuaAppbmRleCAwOTZiYTVlMTgxNmE1NmI1NWU4YmZkZTE3YmZmZDc2 M2Q3MDY1ZWVlLi5jYWU4ODk0Y2IyZjEyYTk4NGJkNTBiYTFlMWQyZTFmYWU2NDNlYmZlIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L0dQVVByb2Nlc3MvR1BVUHJvY2Vzcy5oCisrKyBiL1NvdXJj ZS9XZWJLaXQvR1BVUHJvY2Vzcy9HUFVQcm9jZXNzLmgKQEAgLTMwLDYgKzMwLDcgQEAKICNpbmNs dWRlICJBdXhpbGlhcnlQcm9jZXNzLmgiCiAjaW5jbHVkZSAiV2ViUGFnZVByb3h5SWRlbnRpZmll ci5oIgogI2luY2x1ZGUgPFdlYkNvcmUvTGliV2ViUlRDRW51bVRyYWl0cy5oPgorI2luY2x1ZGUg PFdlYkNvcmUvVGltZXIuaD4KICNpbmNsdWRlIDxwYWwvU2Vzc2lvbklELmg+CiAjaW5jbHVkZSA8 d3RmL0Z1bmN0aW9uLmg+CiAjaW5jbHVkZSA8d3RmL01lbW9yeVByZXNzdXJlSGFuZGxlci5oPgpA QCAtMTc2LDYgKzE3Nyw3IEBAIHByaXZhdGU6CiAjZW5kaWYKICAgICB9OwogICAgIEhhc2hNYXA8 UEFMOjpTZXNzaW9uSUQsIEdQVVNlc3Npb24+IG1fc2Vzc2lvbnM7CisgICAgbXV0YWJsZSBXZWJD b3JlOjpUaW1lciBtX2lkbGVFeGl0VGltZXI7CiAgICAgc3RkOjp1bmlxdWVfcHRyPFdlYkNvcmU6 Ok5vd1BsYXlpbmdNYW5hZ2VyPiBtX25vd1BsYXlpbmdNYW5hZ2VyOwogI2lmIEVOQUJMRShHUFVf UFJPQ0VTUykgJiYgVVNFKEFVRElPX1NFU1NJT04pCiAgICAgbXV0YWJsZSBzdGQ6OnVuaXF1ZV9w dHI8UmVtb3RlQXVkaW9TZXNzaW9uUHJveHlNYW5hZ2VyPiBtX2F1ZGlvU2Vzc2lvbk1hbmFnZXI7 Cg== 426600 2021-04-20 15:32:23 -0700 2021-04-20 15:34:29 -0700 Patch bug-224829-20210420153223.patch text/plain 6135 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjc2MzExCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDU3ZjE3YmM0NGFmYzRlNTIw MTVkMWE5YTMwOTA5NGZjNDg1ZDkxMTQuLmY3NDEzMjgxOWRiMmJjYmZlMzI5NWQ5N2Y2ODQzMWEy ODI5N2EzMGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjcgQEAKKzIwMjEtMDQtMjAgIENocmlzIER1 bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBJZiBhbiBpZGxlIEdQVVByb2Nlc3Mg ZG9lc24ndCBleGl0IHVuZGVyIG1lbW9yeSBwcmVzc3VyZSBiZWNhdXNlIGl0IGp1c3QgbGF1bmNo ZWQsIGNoZWNrIGFnYWluIGxhdGVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0yMjQ4MjkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBJbiByMjc2MzA1LCBJIG1hZGUgaXQgc28gdGhhdCB0aGUgR1BVUHJvY2Vz cyBkb2VzIG5vdCBleGl0IHVuZGVyIG1lbW9yeSBwcmVzc3VyZSB3aGVuIGlkbGUKKyAgICAgICAg aWYgaXQgbGF1bmNoZWQgbGVzcyB0aGFuIDUgc2Vjb25kcyBhZ28uIFRoaXMgZ2l2ZXMgdGhlIFdl YlByb2Nlc3MgdGltZSB0byBzY2hlZHVsZSB3b3JrIHdpdGgKKyAgICAgICAgdGhlIEdQVVByb2Nl c3MgYWZ0ZXIgbGF1bmNoaW5nIGl0IGFuZCBtYWtlcyBzdXJlIHdlIGRvbid0IHJlcGVhdGVkbHkg LyBmcmVxdWVudGx5IGV4aXQgJgorICAgICAgICByZWxhdW5jaCB0aGUgR1BVUHJvY2Vzcy4KKwor ICAgICAgICBJbiB0aGlzIHBhdGNoLCBJIGFtIHR3ZWFraW5nIHRoZSBwb2xpY3kgc28gdGhhdCBp ZiB3ZSBjb3VsZCBoYXZlIGV4aXRlZCBidXQgZGlkbid0IGJlY2F1c2UKKyAgICAgICAgdGhlIEdQ VVByb2Nlc3Mgd2FzIHRvbyB5b3VuZyAobGVzcyB0aGFuIDUgc2Vjb25kcyBvbGQpLCB0aGVuIEkg c2NoZWR1bGUgYSB0aW1lciBmb3IgdGhpcworICAgICAgICA1IHNlY29uZCBkZWFkbGluZSB0byBj aGVjayBhZ2FpbiBpZiB0aGUgR1BVUHJvY2VzcyBjb3VsZCBleGl0IChtZWFuaW5nIHRoYXQgaXQg aXMgdW51c2VkKS4KKyAgICAgICAgV2hlbiB0aGUgdGltZXIgZmlyZXMsIHRoZSBwcm9jZXNzIGRv ZXNuJ3QgaGF2ZSB0byBiZSB1bmRlciBtZW1vcnkgcHJlc3N1cmUgc3RpbGwgaW4gb3JkZXIKKyAg ICAgICAgdG8gZXhpdCwgaXQganVzdCBuZWVkcyB0byBiZSBpZGxlLiBJIGZpZ3VyZWQgdGhlIGZh Y3QgdGhhdCB3ZSB3ZXJlIHVuZGVyIG1lbW9yeSBwcmVzc3VyZQorICAgICAgICBsZXNzIHRoYW4g NSBzZWNvbmRzIGFnbyBzaG91bGQgYmUgZW5vdWdoIGluY2VudGl2ZSB0byBleGl0IGlmIGlkbGUu CisKKyAgICAgICAgKiBHUFVQcm9jZXNzL0dQVVByb2Nlc3MuY3BwOgorICAgICAgICAoV2ViS2l0 OjpHUFVQcm9jZXNzOjpHUFVQcm9jZXNzKToKKyAgICAgICAgKFdlYktpdDo6R1BVUHJvY2Vzczo6 Y2FuRXhpdFVuZGVyTWVtb3J5UHJlc3N1cmUgY29uc3QpOgorICAgICAgICAqIEdQVVByb2Nlc3Mv R1BVUHJvY2Vzcy5oOgorCiAyMDIxLTA0LTIwICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVu c2VuQHdlYmtpdC5vcmc+CiAKICAgICAgICAgRml4IHVzZS1hZnRlci1tb3ZlIGludHJvZHVjZWQg aW4gcjI3NTQwNwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9HUFVQcm9jZXNzL0dQVVByb2Nl c3MuY3BwIGIvU291cmNlL1dlYktpdC9HUFVQcm9jZXNzL0dQVVByb2Nlc3MuY3BwCmluZGV4IDk3 MmM4OWY3NTc4MzVhNDBkYWEwMGQzYTdhMDEzN2Y1NTQxZjE2NGMuLjUxN2RlMzIxMGIwYWFkMTdi OTU3NzNkYjhjYjc1YWViMWVmZWQyOTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvR1BVUHJv Y2Vzcy9HUFVQcm9jZXNzLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L0dQVVByb2Nlc3MvR1BVUHJv Y2Vzcy5jcHAKQEAgLTc0LDggKzc0LDE0IEBACiBuYW1lc3BhY2UgV2ViS2l0IHsKIHVzaW5nIG5h bWVzcGFjZSBXZWJDb3JlOwogCisvLyBXZSB3b3VsZG4ndCB3YW50IHRoZSBHUFVQcm9jZXNzIHRv IHJlcGVhdGVkbHkgZXhpdCB0aGVuIHJlbGF1bmNoIHdoZW4gdW5kZXIgbWVtb3J5IHByZXNzdXJl LiBJbiBwYXJ0aWN1bGFyLCB3ZSBuZWVkIHRvIG1ha2Ugc3VyZSB0aGUKKy8vIFdlYlByb2Nlc3Mg aGFzIGEgY2hhbmdlIHRvIHNjaGVkdWxlIHdvcmsgYWZ0ZXIgdGhlIEdQVVByb2Nlc3MgZ2V0IGxh dW5jaGVkLiBGb3IgdGhpcyByZWFzb24sIHdlIG1ha2Ugc3VyZSB0aGF0IHRoZSBHUFVQcm9jZXNz IG5ldmVyCisvLyBpZGxlLWV4aXRzIGxlc3MgdGhhbiA1IHNlY29uZHMgYWZ0ZXIgZ2V0dGluZyBs YXVuY2hlZC4gVGhpcyBhbW91bnQgb2YgdGltZSBzaG91bGQgYmUgc3VmZmljaWVudCBmb3IgdGhl IFdlYlByb2Nlc3MgdG8gc2NoZWR1bGUgd29yaworLy8gd29yayBpbiB0aGUgR1BVUHJvY2Vzcy4K K2NvbnN0ZXhwciBTZWNvbmRzIG1pbmltdW1MaWZldGltZUJlZm9yZUlkbGVFeGl0IHsgNV9zIH07 CiAKIEdQVVByb2Nlc3M6OkdQVVByb2Nlc3MoQXV4aWxpYXJ5UHJvY2Vzc0luaXRpYWxpemF0aW9u UGFyYW1ldGVycyYmIHBhcmFtZXRlcnMpCisgICAgOiBtX2lkbGVFeGl0VGltZXIoKnRoaXMsICZH UFVQcm9jZXNzOjp0cnlFeGl0SWZVbnVzZWQpCiB7CiAgICAgaW5pdGlhbGl6ZShXVEZNb3ZlKHBh cmFtZXRlcnMpKTsKICAgICBSRUxFQVNFX0xPRyhQcm9jZXNzLCAiJXAgLSBHUFVQcm9jZXNzOjpH UFVQcm9jZXNzOiIsIHRoaXMpOwpAQCAtMTI5LDE1ICsxMzUsMTEgQEAgYm9vbCBHUFVQcm9jZXNz OjpzaG91bGRUZXJtaW5hdGUoKQogYm9vbCBHUFVQcm9jZXNzOjpjYW5FeGl0VW5kZXJNZW1vcnlQ cmVzc3VyZSgpIGNvbnN0CiB7CiAgICAgQVNTRVJUKGlzTWFpblJ1bkxvb3AoKSk7Ci0gICAgLy8g VG8gYXZvaWQgZXhpdGluZyB0aGUgR1BVUHJvY2VzcyB0b28gYWdncmVzc2l2ZWx5IHdoaWxlIHVu ZGVyIG1lbW9yeSBwcmVzc3VyZSwgd2UgZG9uJ3QgZXhpdCBpZiB3ZSd2ZSBiZWVuIHJ1bm5pbmcK LSAgICAvLyBmb3IgbGVzcyB0aGFuIDUgc2Vjb25kcy4gSW4gY2FzZSBvZiBzaW11bGF0ZWQgbWVt b3J5IHByZXNzdXJlLCB3ZSBpZ25vcmUgdGhpcyBydWxlIHRvIGF2b2lkIGdlbmVyYXRpbmcgZmxh a2luZXNzCi0gICAgLy8gaW4gb3VyIGJlbmNobWFya3MgYW5kIHRlc3RzLgotICAgIGlmICgoTW9u b3RvbmljVGltZTo6bm93KCkgLSBtX2NyZWF0aW9uVGltZSkgPCA1X3MgJiYgIU1lbW9yeVByZXNz dXJlSGFuZGxlcjo6c2luZ2xldG9uKCkuaXNTaW11bGF0aW5nTWVtb3J5UHJlc3N1cmUoKSkKLSAg ICAgICAgcmV0dXJuIGZhbHNlOwotCiAgICAgZm9yIChhdXRvJiB3ZWJQcm9jZXNzQ29ubmVjdGlv biA6IG1fd2ViUHJvY2Vzc0Nvbm5lY3Rpb25zLnZhbHVlcygpKSB7Ci0gICAgICAgIGlmICghd2Vi UHJvY2Vzc0Nvbm5lY3Rpb24tPmFsbG93c0V4aXRVbmRlck1lbW9yeVByZXNzdXJlKCkpCisgICAg ICAgIGlmICghd2ViUHJvY2Vzc0Nvbm5lY3Rpb24tPmFsbG93c0V4aXRVbmRlck1lbW9yeVByZXNz dXJlKCkpIHsKKyAgICAgICAgICAgIG1faWRsZUV4aXRUaW1lci5zdG9wKCk7CiAgICAgICAgICAg ICByZXR1cm4gZmFsc2U7CisgICAgICAgIH0KICAgICB9CiAgICAgcmV0dXJuIHRydWU7CiB9CkBA IC0xNTQsOCArMTU2LDI0IEBAIHZvaWQgR1BVUHJvY2Vzczo6dHJ5RXhpdElmVW51c2VkQW5kVW5k ZXJNZW1vcnlQcmVzc3VyZSgpCiB2b2lkIEdQVVByb2Nlc3M6OnRyeUV4aXRJZlVudXNlZCgpCiB7 CiAgICAgQVNTRVJUKGlzTWFpblJ1bkxvb3AoKSk7Ci0gICAgaWYgKCFjYW5FeGl0VW5kZXJNZW1v cnlQcmVzc3VyZSgpKQorICAgIGlmICghY2FuRXhpdFVuZGVyTWVtb3J5UHJlc3N1cmUoKSkgewor ICAgICAgICBtX2lkbGVFeGl0VGltZXIuc3RvcCgpOwogICAgICAgICByZXR1cm47CisgICAgfQor CisgICAgLy8gVG8gYXZvaWQgZXhpdGluZyB0aGUgR1BVUHJvY2VzcyB0b28gYWdncmVzc2l2ZWx5 IHdoaWxlIHVuZGVyIG1lbW9yeSBwcmVzc3VyZSBhbmQgbWFrZSBzdXJlIHRoZSBXZWJQcm9jZXNz IGdldHMgYQorICAgIC8vIGNoYW5nZSB0byBzY2hlZHVsZSB3b3JrLCB3ZSBkb24ndCBleGl0IGlm IHdlJ3ZlIGJlZW4gcnVubmluZyBmb3IgbGVzcyB0aGFuIHxtaW5pbXVtTGlmZXRpbWVCZWZvcmVJ ZGxlRXhpdHwuCisgICAgLy8gSW4gY2FzZSBvZiBzaW11bGF0ZWQgbWVtb3J5IHByZXNzdXJlLCB3 ZSBpZ25vcmUgdGhpcyBydWxlIHRvIGF2b2lkIGZsYWtpbmVzcyBpbiBvdXIgYmVuY2htYXJrcyBh bmQgdGVzdHMuCisgICAgYXV0byBsaWZldGltZSA9IE1vbm90b25pY1RpbWU6Om5vdygpIC0gbV9j cmVhdGlvblRpbWU7CisgICAgaWYgKGxpZmV0aW1lIDwgbWluaW11bUxpZmV0aW1lQmVmb3JlSWRs ZUV4aXQgJiYgIU1lbW9yeVByZXNzdXJlSGFuZGxlcjo6c2luZ2xldG9uKCkuaXNTaW11bGF0aW5n TWVtb3J5UHJlc3N1cmUoKSkgeworICAgICAgICBSRUxFQVNFX0xPRyhQcm9jZXNzLCAiR1BVUHJv Y2Vzczo6dHJ5RXhpdElmVW51c2VkOiBHUFVQcm9jZXNzIGlzIGlkbGUgYW5kIHVuZGVyIG1lbW9y eSBwcmVzc3VyZSBidXQgaXQgaXMgbm90IGV4aXRpbmcgYmVjYXVzZSBpdCBoYXMganVzdCBsYXVu Y2hlZCIpOworICAgICAgICAvLyBDaGVjayBhZ2FpbiBhZnRlciB0aGUgcHJvY2VzcyBoYXZlIGxp dmVkIGxvbmcgZW5vdWdoIChtaW5pbXVtTGlmZXRpbWVCZWZvcmVJZGxlRXhpdCkgdG8gc2VlIGlm IHRoZSBHUFVQcm9jZXNzCisgICAgICAgIC8vIGNhbiBpZGxlLWV4aXQgdGhlbi4KKyAgICAgICAg aWYgKCFtX2lkbGVFeGl0VGltZXIuaXNBY3RpdmUoKSkKKyAgICAgICAgICAgIG1faWRsZUV4aXRU aW1lci5zdGFydE9uZVNob3QobWluaW11bUxpZmV0aW1lQmVmb3JlSWRsZUV4aXQgLSBsaWZldGlt ZSk7CisgICAgICAgIHJldHVybjsKKyAgICB9CisgICAgbV9pZGxlRXhpdFRpbWVyLnN0b3AoKTsK IAogICAgIFJFTEVBU0VfTE9HKFByb2Nlc3MsICJHUFVQcm9jZXNzOjp0cnlFeGl0SWZVbnVzZWQ6 IEdQVVByb2Nlc3MgaXMgZXhpdGluZyBiZWNhdXNlIHdlIGFyZSB1bmRlciBtZW1vcnkgcHJlc3N1 cmUgYW5kIHRoZSBwcm9jZXNzIGlzIG5vIGxvbmdlciB1c2VmdWwuIik7CiAgICAgcGFyZW50UHJv Y2Vzc0Nvbm5lY3Rpb24oKS0+c2VuZChNZXNzYWdlczo6R1BVUHJvY2Vzc1Byb3h5OjpQcm9jZXNz SXNSZWFkeVRvRXhpdCgpLCAwKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvR1BVUHJvY2Vz cy9HUFVQcm9jZXNzLmggYi9Tb3VyY2UvV2ViS2l0L0dQVVByb2Nlc3MvR1BVUHJvY2Vzcy5oCmlu ZGV4IDA5NmJhNWUxODE2YTU2YjU1ZThiZmRlMTdiZmZkNzYzZDcwNjVlZWUuLmNhZTg4OTRjYjJm MTJhOTg0YmQ1MGJhMWUxZDJlMWZhZTY0M2ViZmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv R1BVUHJvY2Vzcy9HUFVQcm9jZXNzLmgKKysrIGIvU291cmNlL1dlYktpdC9HUFVQcm9jZXNzL0dQ VVByb2Nlc3MuaApAQCAtMzAsNiArMzAsNyBAQAogI2luY2x1ZGUgIkF1eGlsaWFyeVByb2Nlc3Mu aCIKICNpbmNsdWRlICJXZWJQYWdlUHJveHlJZGVudGlmaWVyLmgiCiAjaW5jbHVkZSA8V2ViQ29y ZS9MaWJXZWJSVENFbnVtVHJhaXRzLmg+CisjaW5jbHVkZSA8V2ViQ29yZS9UaW1lci5oPgogI2lu Y2x1ZGUgPHBhbC9TZXNzaW9uSUQuaD4KICNpbmNsdWRlIDx3dGYvRnVuY3Rpb24uaD4KICNpbmNs dWRlIDx3dGYvTWVtb3J5UHJlc3N1cmVIYW5kbGVyLmg+CkBAIC0xNzYsNiArMTc3LDcgQEAgcHJp dmF0ZToKICNlbmRpZgogICAgIH07CiAgICAgSGFzaE1hcDxQQUw6OlNlc3Npb25JRCwgR1BVU2Vz c2lvbj4gbV9zZXNzaW9uczsKKyAgICBtdXRhYmxlIFdlYkNvcmU6OlRpbWVyIG1faWRsZUV4aXRU aW1lcjsKICAgICBzdGQ6OnVuaXF1ZV9wdHI8V2ViQ29yZTo6Tm93UGxheWluZ01hbmFnZXI+IG1f bm93UGxheWluZ01hbmFnZXI7CiAjaWYgRU5BQkxFKEdQVV9QUk9DRVNTKSAmJiBVU0UoQVVESU9f U0VTU0lPTikKICAgICBtdXRhYmxlIHN0ZDo6dW5pcXVlX3B0cjxSZW1vdGVBdWRpb1Nlc3Npb25Q cm94eU1hbmFnZXI+IG1fYXVkaW9TZXNzaW9uTWFuYWdlcjsK 426602 2021-04-20 15:36:51 -0700 2021-04-20 17:59:01 -0700 Patch bug-224829-20210420153650.patch text/plain 5979 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjc2MzExCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDU3ZjE3YmM0NGFmYzRlNTIw MTVkMWE5YTMwOTA5NGZjNDg1ZDkxMTQuLmY3NDEzMjgxOWRiMmJjYmZlMzI5NWQ5N2Y2ODQzMWEy ODI5N2EzMGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjcgQEAKKzIwMjEtMDQtMjAgIENocmlzIER1 bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBJZiBhbiBpZGxlIEdQVVByb2Nlc3Mg ZG9lc24ndCBleGl0IHVuZGVyIG1lbW9yeSBwcmVzc3VyZSBiZWNhdXNlIGl0IGp1c3QgbGF1bmNo ZWQsIGNoZWNrIGFnYWluIGxhdGVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0yMjQ4MjkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBJbiByMjc2MzA1LCBJIG1hZGUgaXQgc28gdGhhdCB0aGUgR1BVUHJvY2Vz cyBkb2VzIG5vdCBleGl0IHVuZGVyIG1lbW9yeSBwcmVzc3VyZSB3aGVuIGlkbGUKKyAgICAgICAg aWYgaXQgbGF1bmNoZWQgbGVzcyB0aGFuIDUgc2Vjb25kcyBhZ28uIFRoaXMgZ2l2ZXMgdGhlIFdl YlByb2Nlc3MgdGltZSB0byBzY2hlZHVsZSB3b3JrIHdpdGgKKyAgICAgICAgdGhlIEdQVVByb2Nl c3MgYWZ0ZXIgbGF1bmNoaW5nIGl0IGFuZCBtYWtlcyBzdXJlIHdlIGRvbid0IHJlcGVhdGVkbHkg LyBmcmVxdWVudGx5IGV4aXQgJgorICAgICAgICByZWxhdW5jaCB0aGUgR1BVUHJvY2Vzcy4KKwor ICAgICAgICBJbiB0aGlzIHBhdGNoLCBJIGFtIHR3ZWFraW5nIHRoZSBwb2xpY3kgc28gdGhhdCBp ZiB3ZSBjb3VsZCBoYXZlIGV4aXRlZCBidXQgZGlkbid0IGJlY2F1c2UKKyAgICAgICAgdGhlIEdQ VVByb2Nlc3Mgd2FzIHRvbyB5b3VuZyAobGVzcyB0aGFuIDUgc2Vjb25kcyBvbGQpLCB0aGVuIEkg c2NoZWR1bGUgYSB0aW1lciBmb3IgdGhpcworICAgICAgICA1IHNlY29uZCBkZWFkbGluZSB0byBj aGVjayBhZ2FpbiBpZiB0aGUgR1BVUHJvY2VzcyBjb3VsZCBleGl0IChtZWFuaW5nIHRoYXQgaXQg aXMgdW51c2VkKS4KKyAgICAgICAgV2hlbiB0aGUgdGltZXIgZmlyZXMsIHRoZSBwcm9jZXNzIGRv ZXNuJ3QgaGF2ZSB0byBiZSB1bmRlciBtZW1vcnkgcHJlc3N1cmUgc3RpbGwgaW4gb3JkZXIKKyAg ICAgICAgdG8gZXhpdCwgaXQganVzdCBuZWVkcyB0byBiZSBpZGxlLiBJIGZpZ3VyZWQgdGhlIGZh Y3QgdGhhdCB3ZSB3ZXJlIHVuZGVyIG1lbW9yeSBwcmVzc3VyZQorICAgICAgICBsZXNzIHRoYW4g NSBzZWNvbmRzIGFnbyBzaG91bGQgYmUgZW5vdWdoIGluY2VudGl2ZSB0byBleGl0IGlmIGlkbGUu CisKKyAgICAgICAgKiBHUFVQcm9jZXNzL0dQVVByb2Nlc3MuY3BwOgorICAgICAgICAoV2ViS2l0 OjpHUFVQcm9jZXNzOjpHUFVQcm9jZXNzKToKKyAgICAgICAgKFdlYktpdDo6R1BVUHJvY2Vzczo6 Y2FuRXhpdFVuZGVyTWVtb3J5UHJlc3N1cmUgY29uc3QpOgorICAgICAgICAqIEdQVVByb2Nlc3Mv R1BVUHJvY2Vzcy5oOgorCiAyMDIxLTA0LTIwICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVu c2VuQHdlYmtpdC5vcmc+CiAKICAgICAgICAgRml4IHVzZS1hZnRlci1tb3ZlIGludHJvZHVjZWQg aW4gcjI3NTQwNwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9HUFVQcm9jZXNzL0dQVVByb2Nl c3MuY3BwIGIvU291cmNlL1dlYktpdC9HUFVQcm9jZXNzL0dQVVByb2Nlc3MuY3BwCmluZGV4IDk3 MmM4OWY3NTc4MzVhNDBkYWEwMGQzYTdhMDEzN2Y1NTQxZjE2NGMuLmVmOTc1NWU0YzU5NTRjNzA4 NGQ1NjI5YTliZjFhYjgxYjE1YzU3Y2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvR1BVUHJv Y2Vzcy9HUFVQcm9jZXNzLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L0dQVVByb2Nlc3MvR1BVUHJv Y2Vzcy5jcHAKQEAgLTc0LDggKzc0LDE0IEBACiBuYW1lc3BhY2UgV2ViS2l0IHsKIHVzaW5nIG5h bWVzcGFjZSBXZWJDb3JlOwogCisvLyBXZSB3b3VsZG4ndCB3YW50IHRoZSBHUFVQcm9jZXNzIHRv IHJlcGVhdGVkbHkgZXhpdCB0aGVuIHJlbGF1bmNoIHdoZW4gdW5kZXIgbWVtb3J5IHByZXNzdXJl LiBJbiBwYXJ0aWN1bGFyLCB3ZSBuZWVkIHRvIG1ha2Ugc3VyZSB0aGUKKy8vIFdlYlByb2Nlc3Mg aGFzIGEgY2hhbmdlIHRvIHNjaGVkdWxlIHdvcmsgYWZ0ZXIgdGhlIEdQVVByb2Nlc3MgZ2V0IGxh dW5jaGVkLiBGb3IgdGhpcyByZWFzb24sIHdlIG1ha2Ugc3VyZSB0aGF0IHRoZSBHUFVQcm9jZXNz IG5ldmVyCisvLyBpZGxlLWV4aXRzIGxlc3MgdGhhbiA1IHNlY29uZHMgYWZ0ZXIgZ2V0dGluZyBs YXVuY2hlZC4gVGhpcyBhbW91bnQgb2YgdGltZSBzaG91bGQgYmUgc3VmZmljaWVudCBmb3IgdGhl IFdlYlByb2Nlc3MgdG8gc2NoZWR1bGUgd29yaworLy8gd29yayBpbiB0aGUgR1BVUHJvY2Vzcy4K K2NvbnN0ZXhwciBTZWNvbmRzIG1pbmltdW1MaWZldGltZUJlZm9yZUlkbGVFeGl0IHsgNV9zIH07 CiAKIEdQVVByb2Nlc3M6OkdQVVByb2Nlc3MoQXV4aWxpYXJ5UHJvY2Vzc0luaXRpYWxpemF0aW9u UGFyYW1ldGVycyYmIHBhcmFtZXRlcnMpCisgICAgOiBtX2lkbGVFeGl0VGltZXIoKnRoaXMsICZH UFVQcm9jZXNzOjp0cnlFeGl0SWZVbnVzZWQpCiB7CiAgICAgaW5pdGlhbGl6ZShXVEZNb3ZlKHBh cmFtZXRlcnMpKTsKICAgICBSRUxFQVNFX0xPRyhQcm9jZXNzLCAiJXAgLSBHUFVQcm9jZXNzOjpH UFVQcm9jZXNzOiIsIHRoaXMpOwpAQCAtMTI5LDEyICsxMzUsNiBAQCBib29sIEdQVVByb2Nlc3M6 OnNob3VsZFRlcm1pbmF0ZSgpCiBib29sIEdQVVByb2Nlc3M6OmNhbkV4aXRVbmRlck1lbW9yeVBy ZXNzdXJlKCkgY29uc3QKIHsKICAgICBBU1NFUlQoaXNNYWluUnVuTG9vcCgpKTsKLSAgICAvLyBU byBhdm9pZCBleGl0aW5nIHRoZSBHUFVQcm9jZXNzIHRvbyBhZ2dyZXNzaXZlbHkgd2hpbGUgdW5k ZXIgbWVtb3J5IHByZXNzdXJlLCB3ZSBkb24ndCBleGl0IGlmIHdlJ3ZlIGJlZW4gcnVubmluZwot ICAgIC8vIGZvciBsZXNzIHRoYW4gNSBzZWNvbmRzLiBJbiBjYXNlIG9mIHNpbXVsYXRlZCBtZW1v cnkgcHJlc3N1cmUsIHdlIGlnbm9yZSB0aGlzIHJ1bGUgdG8gYXZvaWQgZ2VuZXJhdGluZyBmbGFr aW5lc3MKLSAgICAvLyBpbiBvdXIgYmVuY2htYXJrcyBhbmQgdGVzdHMuCi0gICAgaWYgKChNb25v dG9uaWNUaW1lOjpub3coKSAtIG1fY3JlYXRpb25UaW1lKSA8IDVfcyAmJiAhTWVtb3J5UHJlc3N1 cmVIYW5kbGVyOjpzaW5nbGV0b24oKS5pc1NpbXVsYXRpbmdNZW1vcnlQcmVzc3VyZSgpKQotICAg ICAgICByZXR1cm4gZmFsc2U7Ci0KICAgICBmb3IgKGF1dG8mIHdlYlByb2Nlc3NDb25uZWN0aW9u IDogbV93ZWJQcm9jZXNzQ29ubmVjdGlvbnMudmFsdWVzKCkpIHsKICAgICAgICAgaWYgKCF3ZWJQ cm9jZXNzQ29ubmVjdGlvbi0+YWxsb3dzRXhpdFVuZGVyTWVtb3J5UHJlc3N1cmUoKSkKICAgICAg ICAgICAgIHJldHVybiBmYWxzZTsKQEAgLTE1NCw4ICsxNTQsMjQgQEAgdm9pZCBHUFVQcm9jZXNz Ojp0cnlFeGl0SWZVbnVzZWRBbmRVbmRlck1lbW9yeVByZXNzdXJlKCkKIHZvaWQgR1BVUHJvY2Vz czo6dHJ5RXhpdElmVW51c2VkKCkKIHsKICAgICBBU1NFUlQoaXNNYWluUnVuTG9vcCgpKTsKLSAg ICBpZiAoIWNhbkV4aXRVbmRlck1lbW9yeVByZXNzdXJlKCkpCisgICAgaWYgKCFjYW5FeGl0VW5k ZXJNZW1vcnlQcmVzc3VyZSgpKSB7CisgICAgICAgIG1faWRsZUV4aXRUaW1lci5zdG9wKCk7CiAg ICAgICAgIHJldHVybjsKKyAgICB9CisKKyAgICAvLyBUbyBhdm9pZCBleGl0aW5nIHRoZSBHUFVQ cm9jZXNzIHRvbyBhZ2dyZXNzaXZlbHkgd2hpbGUgdW5kZXIgbWVtb3J5IHByZXNzdXJlIGFuZCBt YWtlIHN1cmUgdGhlIFdlYlByb2Nlc3MgZ2V0cyBhCisgICAgLy8gY2hhbmdlIHRvIHNjaGVkdWxl IHdvcmssIHdlIGRvbid0IGV4aXQgaWYgd2UndmUgYmVlbiBydW5uaW5nIGZvciBsZXNzIHRoYW4g fG1pbmltdW1MaWZldGltZUJlZm9yZUlkbGVFeGl0fC4KKyAgICAvLyBJbiBjYXNlIG9mIHNpbXVs YXRlZCBtZW1vcnkgcHJlc3N1cmUsIHdlIGlnbm9yZSB0aGlzIHJ1bGUgdG8gYXZvaWQgZmxha2lu ZXNzIGluIG91ciBiZW5jaG1hcmtzIGFuZCB0ZXN0cy4KKyAgICBhdXRvIGxpZmV0aW1lID0gTW9u b3RvbmljVGltZTo6bm93KCkgLSBtX2NyZWF0aW9uVGltZTsKKyAgICBpZiAobGlmZXRpbWUgPCBt aW5pbXVtTGlmZXRpbWVCZWZvcmVJZGxlRXhpdCAmJiAhTWVtb3J5UHJlc3N1cmVIYW5kbGVyOjpz aW5nbGV0b24oKS5pc1NpbXVsYXRpbmdNZW1vcnlQcmVzc3VyZSgpKSB7CisgICAgICAgIFJFTEVB U0VfTE9HKFByb2Nlc3MsICJHUFVQcm9jZXNzOjp0cnlFeGl0SWZVbnVzZWQ6IEdQVVByb2Nlc3Mg aXMgaWRsZSBhbmQgdW5kZXIgbWVtb3J5IHByZXNzdXJlIGJ1dCBpdCBpcyBub3QgZXhpdGluZyBi ZWNhdXNlIGl0IGhhcyBqdXN0IGxhdW5jaGVkIik7CisgICAgICAgIC8vIENoZWNrIGFnYWluIGFm dGVyIHRoZSBwcm9jZXNzIGhhdmUgbGl2ZWQgbG9uZyBlbm91Z2ggKG1pbmltdW1MaWZldGltZUJl Zm9yZUlkbGVFeGl0KSB0byBzZWUgaWYgdGhlIEdQVVByb2Nlc3MKKyAgICAgICAgLy8gY2FuIGlk bGUtZXhpdCB0aGVuLgorICAgICAgICBpZiAoIW1faWRsZUV4aXRUaW1lci5pc0FjdGl2ZSgpKQor ICAgICAgICAgICAgbV9pZGxlRXhpdFRpbWVyLnN0YXJ0T25lU2hvdChtaW5pbXVtTGlmZXRpbWVC ZWZvcmVJZGxlRXhpdCAtIGxpZmV0aW1lKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKyAgICBt X2lkbGVFeGl0VGltZXIuc3RvcCgpOwogCiAgICAgUkVMRUFTRV9MT0coUHJvY2VzcywgIkdQVVBy b2Nlc3M6OnRyeUV4aXRJZlVudXNlZDogR1BVUHJvY2VzcyBpcyBleGl0aW5nIGJlY2F1c2Ugd2Ug YXJlIHVuZGVyIG1lbW9yeSBwcmVzc3VyZSBhbmQgdGhlIHByb2Nlc3MgaXMgbm8gbG9uZ2VyIHVz ZWZ1bC4iKTsKICAgICBwYXJlbnRQcm9jZXNzQ29ubmVjdGlvbigpLT5zZW5kKE1lc3NhZ2VzOjpH UFVQcm9jZXNzUHJveHk6OlByb2Nlc3NJc1JlYWR5VG9FeGl0KCksIDApOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9HUFVQcm9jZXNzL0dQVVByb2Nlc3MuaCBiL1NvdXJjZS9XZWJLaXQvR1BV UHJvY2Vzcy9HUFVQcm9jZXNzLmgKaW5kZXggMDk2YmE1ZTE4MTZhNTZiNTVlOGJmZGUxN2JmZmQ3 NjNkNzA2NWVlZS4uMjdjZDJjZDQwOGQ2NzJiOTkyNWQzNDVjYjdlNzI2YzIzOGRiMTFhOCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdC9HUFVQcm9jZXNzL0dQVVByb2Nlc3MuaAorKysgYi9Tb3Vy Y2UvV2ViS2l0L0dQVVByb2Nlc3MvR1BVUHJvY2Vzcy5oCkBAIC0zMCw2ICszMCw3IEBACiAjaW5j bHVkZSAiQXV4aWxpYXJ5UHJvY2Vzcy5oIgogI2luY2x1ZGUgIldlYlBhZ2VQcm94eUlkZW50aWZp ZXIuaCIKICNpbmNsdWRlIDxXZWJDb3JlL0xpYldlYlJUQ0VudW1UcmFpdHMuaD4KKyNpbmNsdWRl IDxXZWJDb3JlL1RpbWVyLmg+CiAjaW5jbHVkZSA8cGFsL1Nlc3Npb25JRC5oPgogI2luY2x1ZGUg PHd0Zi9GdW5jdGlvbi5oPgogI2luY2x1ZGUgPHd0Zi9NZW1vcnlQcmVzc3VyZUhhbmRsZXIuaD4K QEAgLTE3Niw2ICsxNzcsNyBAQCBwcml2YXRlOgogI2VuZGlmCiAgICAgfTsKICAgICBIYXNoTWFw PFBBTDo6U2Vzc2lvbklELCBHUFVTZXNzaW9uPiBtX3Nlc3Npb25zOworICAgIFdlYkNvcmU6OlRp bWVyIG1faWRsZUV4aXRUaW1lcjsKICAgICBzdGQ6OnVuaXF1ZV9wdHI8V2ViQ29yZTo6Tm93UGxh eWluZ01hbmFnZXI+IG1fbm93UGxheWluZ01hbmFnZXI7CiAjaWYgRU5BQkxFKEdQVV9QUk9DRVNT KSAmJiBVU0UoQVVESU9fU0VTU0lPTikKICAgICBtdXRhYmxlIHN0ZDo6dW5pcXVlX3B0cjxSZW1v dGVBdWRpb1Nlc3Npb25Qcm94eU1hbmFnZXI+IG1fYXVkaW9TZXNzaW9uTWFuYWdlcjsK