232505 2021-10-29 14:32:25 -0700 Increase responsiveness timeout for network process 2021-11-01 10:46:26 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 sihui_liu sihui_liu cdumez ggaren webkit-bug-importer oldest_to_newest 1810249 0 sihui_liu 2021-10-29 14:32:25 -0700 ... 1810250 1 442864 sihui_liu 2021-10-29 14:38:18 -0700 Created attachment 442864 Patch 1810252 2 442864 cdumez 2021-10-29 14:41:04 -0700 Comment on attachment 442864 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=442864&action=review > Source/WebKit/UIProcess/AuxiliaryProcessProxy.h:47 > + AuxiliaryProcessProxy(bool alwaysRunsAtBackgroundPriority, Seconds); Why are you adding a second constructor instead of extending the existing one? > Source/WebKit/UIProcess/Network/NetworkProcessProxy.cpp:204 > + : AuxiliaryProcessProxy(anyProcessPoolAlwaysRunsAtBackgroundPriority(), 6_s) Please use a global static constant with a nice name for 6_s. 1810279 3 442870 sihui_liu 2021-10-29 15:10:43 -0700 Created attachment 442870 Patch 1810281 4 sihui_liu 2021-10-29 15:12:07 -0700 To help resolve web process crash issue rdar://84745326. 1810283 5 sihui_liu 2021-10-29 15:12:37 -0700 (In reply to Chris Dumez from comment #2) > Comment on attachment 442864 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=442864&action=review > > > Source/WebKit/UIProcess/AuxiliaryProcessProxy.h:47 > > + AuxiliaryProcessProxy(bool alwaysRunsAtBackgroundPriority, Seconds); > > Why are you adding a second constructor instead of extending the existing > one? Removed. > > > Source/WebKit/UIProcess/Network/NetworkProcessProxy.cpp:204 > > + : AuxiliaryProcessProxy(anyProcessPoolAlwaysRunsAtBackgroundPriority(), 6_s) > > Please use a global static constant with a nice name for 6_s. Sure. 1810286 6 442870 cdumez 2021-10-29 15:14:27 -0700 Comment on attachment 442870 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=442870&action=review r=me assuming the bots are happy > Source/WebKit/UIProcess/Network/NetworkProcessProxy.cpp:89 > +static const Seconds networkProcessResponsivenessTimeout = 6_s; constexpr 1810667 7 442987 sihui_liu 2021-11-01 10:04:36 -0700 Created attachment 442987 Patch for landing 1810685 8 ews-feeder 2021-11-01 10:45:43 -0700 Committed r285115 (243756@main): <https://commits.webkit.org/243756@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 442987. 1810686 9 webkit-bug-importer 2021-11-01 10:46:26 -0700 <rdar://problem/84888098> 442864 2021-10-29 14:38:18 -0700 2021-10-29 15:10:41 -0700 Patch bug-232505-20211029143817.patch text/plain 10721 sihui_liu U3VidmVyc2lvbiBSZXZpc2lvbjogMjg1MDQyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGVlYjJkYjRmNTZkZDM3MTJk YmU4OTlhMTVhNDNkZjZiZmRiYWNjOTkuLmZkNWM4NjE1M2IzMzIyNzZkOGU1MmFjMjIxNDY0MTgy ODQ5MTdjZGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjUgQEAKKzIwMjEtMTAtMjkgIFNpaHVpIExp dSAgPHNpaHVpX2xpdUBhcHBsZS5jb20+CisKKyAgICAgICAgSW5jcmVhc2UgcmVzcG9uc2l2ZW5l c3MgdGltZW91dCBmb3IgbmV0d29yayBwcm9jZXNzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzI1MDUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BdXhpbGlhcnlQcm9jZXNzUHJveHku Y3BwOgorICAgICAgICAoV2ViS2l0OjpBdXhpbGlhcnlQcm9jZXNzUHJveHk6OkF1eGlsaWFyeVBy b2Nlc3NQcm94eSk6CisgICAgICAgICogVUlQcm9jZXNzL0F1eGlsaWFyeVByb2Nlc3NQcm94eS5o OgorICAgICAgICAqIFVJUHJvY2Vzcy9OZXR3b3JrL05ldHdvcmtQcm9jZXNzUHJveHkuY3BwOgor ICAgICAgICAoV2ViS2l0OjpOZXR3b3JrUHJvY2Vzc1Byb3h5OjpOZXR3b3JrUHJvY2Vzc1Byb3h5 KToKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya1Byb2Nlc3NQcm94eTo6Z2V0TmV0d29ya1Byb2Nl c3NDb25uZWN0aW9uKToKKyAgICAgICAgKiBVSVByb2Nlc3MvUmVzcG9uc2l2ZW5lc3NUaW1lci5j cHA6CisgICAgICAgIChXZWJLaXQ6OlJlc3BvbnNpdmVuZXNzVGltZXI6OlJlc3BvbnNpdmVuZXNz VGltZXIpOgorICAgICAgICAoV2ViS2l0OjpSZXNwb25zaXZlbmVzc1RpbWVyOjp0aW1lckZpcmVk KToKKyAgICAgICAgKFdlYktpdDo6UmVzcG9uc2l2ZW5lc3NUaW1lcjo6c3RhcnQpOgorICAgICAg ICAoKTogRGVsZXRlZC4KKyAgICAgICAgKiBVSVByb2Nlc3MvUmVzcG9uc2l2ZW5lc3NUaW1lci5o OgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJzaXRlRGF0YS9XZWJzaXRlRGF0YVN0b3JlLmNwcDoK KyAgICAgICAgKFdlYktpdDo6V2Vic2l0ZURhdGFTdG9yZTo6Z2V0TmV0d29ya1Byb2Nlc3NDb25u ZWN0aW9uKToKKwogMjAyMS0xMC0yOSAgU2lodWkgTGl1ICA8c2lodWlfbGl1QGFwcGxlLmNvbT4K IAogICAgICAgICBSZWxlYXNlIEZpbGVTeXN0ZW1TdG9yYWdlSGFuZGxlIHdoZW4gaXQgaXMgbm90 IGluIHVzZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQXV4aWxpYXJ5UHJv Y2Vzc1Byb3h5LmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0F1eGlsaWFyeVByb2Nlc3NQ cm94eS5jcHAKaW5kZXggODVhODJjYmI2ZjNiZDgyOTNkYzZjNTlhNjZiMWRlODk4OTRkOWIzYS4u MzE1ZTk5NjE0MmY4M2JiODM2NDkzZTVhNzg3YmE2YjBkNWYwYjBiMiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvQXV4aWxpYXJ5UHJvY2Vzc1Byb3h5LmNwcAorKysgYi9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9BdXhpbGlhcnlQcm9jZXNzUHJveHkuY3BwCkBAIC00Niw2ICs0 NiwxMiBAQCBBdXhpbGlhcnlQcm9jZXNzUHJveHk6OkF1eGlsaWFyeVByb2Nlc3NQcm94eShib29s IGFsd2F5c1J1bnNBdEJhY2tncm91bmRQcmlvcml0eQogewogfQogCitBdXhpbGlhcnlQcm9jZXNz UHJveHk6OkF1eGlsaWFyeVByb2Nlc3NQcm94eShib29sIGFsd2F5c1J1bnNBdEJhY2tncm91bmRQ cmlvcml0eSwgU2Vjb25kcyByZXNwb25zaXZlbmVzc1RpbWVvdXQpCisgICAgOiBtX3Jlc3BvbnNp dmVuZXNzVGltZXIoKnRoaXMsIHJlc3BvbnNpdmVuZXNzVGltZW91dCkKKyAgICAsIG1fYWx3YXlz UnVuc0F0QmFja2dyb3VuZFByaW9yaXR5KGFsd2F5c1J1bnNBdEJhY2tncm91bmRQcmlvcml0eSkK K3sKK30KKwogQXV4aWxpYXJ5UHJvY2Vzc1Byb3h5Ojp+QXV4aWxpYXJ5UHJvY2Vzc1Byb3h5KCkK IHsKICAgICBpZiAobV9jb25uZWN0aW9uKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvQXV4aWxpYXJ5UHJvY2Vzc1Byb3h5LmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9B dXhpbGlhcnlQcm9jZXNzUHJveHkuaAppbmRleCA4MDQzNWIxZTY3N2M2NmQ3Yjc0NjgyZDQ0NTAy ODdiMTRjZmVkYmNkLi40NWFlODNjNGE4MmFmZGU2OTU0NTg5NDg2NmU2NWYyMTRjNWU3MjNiIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BdXhpbGlhcnlQcm9jZXNzUHJveHku aAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BdXhpbGlhcnlQcm9jZXNzUHJveHkuaApA QCAtNDQsNiArNDQsNyBAQCBjbGFzcyBBdXhpbGlhcnlQcm9jZXNzUHJveHkgOiBwdWJsaWMgVGhy ZWFkU2FmZVJlZkNvdW50ZWQ8QXV4aWxpYXJ5UHJvY2Vzc1Byb3h5LAogCiBwcm90ZWN0ZWQ6CiAg ICAgZXhwbGljaXQgQXV4aWxpYXJ5UHJvY2Vzc1Byb3h5KGJvb2wgYWx3YXlzUnVuc0F0QmFja2dy b3VuZFByaW9yaXR5ID0gZmFsc2UpOworICAgIEF1eGlsaWFyeVByb2Nlc3NQcm94eShib29sIGFs d2F5c1J1bnNBdEJhY2tncm91bmRQcmlvcml0eSwgU2Vjb25kcyk7CiAKIHB1YmxpYzoKICAgICB2 aXJ0dWFsIH5BdXhpbGlhcnlQcm9jZXNzUHJveHkoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL05ldHdvcmsvTmV0d29ya1Byb2Nlc3NQcm94eS5jcHAgYi9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9OZXR3b3JrL05ldHdvcmtQcm9jZXNzUHJveHkuY3BwCmluZGV4IGM1NTNm OWNhNzEyOThmODY5MWNhZDAxZDBmNzhiZTNhNzA2NDg1ZGIuLmFhMjZiMTJjMTVkNWNmZjU0OTgx YmNmYjI5MDg3ZDE3YzA3ZTNjM2IgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L05ldHdvcmsvTmV0d29ya1Byb2Nlc3NQcm94eS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvTmV0d29yay9OZXR3b3JrUHJvY2Vzc1Byb3h5LmNwcApAQCAtMjAxLDcgKzIwMSw3IEBA IHN0YXRpYyBib29sIGFueVByb2Nlc3NQb29sU2hvdWxkVGFrZVVJQmFja2dyb3VuZEFzc2VydGlv bigpCiB9CiAKIE5ldHdvcmtQcm9jZXNzUHJveHk6Ok5ldHdvcmtQcm9jZXNzUHJveHkoKQotICAg IDogQXV4aWxpYXJ5UHJvY2Vzc1Byb3h5KGFueVByb2Nlc3NQb29sQWx3YXlzUnVuc0F0QmFja2dy b3VuZFByaW9yaXR5KCkpCisgICAgOiBBdXhpbGlhcnlQcm9jZXNzUHJveHkoYW55UHJvY2Vzc1Bv b2xBbHdheXNSdW5zQXRCYWNrZ3JvdW5kUHJpb3JpdHkoKSwgNl9zKQogI2lmIEVOQUJMRShMRUdB Q1lfQ1VTVE9NX1BST1RPQ09MX01BTkFHRVIpCiAgICAgLCBtX2N1c3RvbVByb3RvY29sTWFuYWdl ckNsaWVudChtYWtlVW5pcXVlUmVmPExlZ2FjeUN1c3RvbVByb3RvY29sTWFuYWdlckNsaWVudD4o KSkKICAgICAsIG1fY3VzdG9tUHJvdG9jb2xNYW5hZ2VyUHJveHkoKnRoaXMpCkBAIC0yNTUsOCAr MjU1LDcgQEAgdm9pZCBOZXR3b3JrUHJvY2Vzc1Byb3h5Ojpwcm9jZXNzV2lsbFNodXREb3duKElQ Qzo6Q29ubmVjdGlvbiYgY29ubmVjdGlvbikKIHZvaWQgTmV0d29ya1Byb2Nlc3NQcm94eTo6Z2V0 TmV0d29ya1Byb2Nlc3NDb25uZWN0aW9uKFdlYlByb2Nlc3NQcm94eSYgd2ViUHJvY2Vzc1Byb3h5 LCBNZXNzYWdlczo6V2ViUHJvY2Vzc1Byb3h5OjpHZXROZXR3b3JrUHJvY2Vzc0Nvbm5lY3Rpb246 OkRlbGF5ZWRSZXBseSYmIHJlcGx5KQogewogICAgIFJFTEVBU0VfTE9HKFByb2Nlc3NTdXNwZW5z aW9uLCAiJXAgLSBOZXR3b3JrUHJvY2Vzc1Byb3h5IGlzIHRha2luZyBhIGJhY2tncm91bmQgYXNz ZXJ0aW9uIGJlY2F1c2UgYSB3ZWIgcHJvY2VzcyBpcyByZXF1ZXN0aW5nIGEgY29ubmVjdGlvbiIs IHRoaXMpOwotICAgIGlmICghaXNMYXVuY2hpbmcoKSkKLSAgICAgICAgc3RhcnRSZXNwb25zaXZl bmVzc1RpbWVyKFVzZUxhenlTdG9wOjpObyk7CisgICAgc3RhcnRSZXNwb25zaXZlbmVzc1RpbWVy KFVzZUxhenlTdG9wOjpObyk7CiAgICAgc2VuZFdpdGhBc3luY1JlcGx5KE1lc3NhZ2VzOjpOZXR3 b3JrUHJvY2Vzczo6Q3JlYXRlTmV0d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nlc3MgeyB3ZWJQcm9j ZXNzUHJveHkuY29yZVByb2Nlc3NJZGVudGlmaWVyKCksIHdlYlByb2Nlc3NQcm94eS5zZXNzaW9u SUQoKSB9LCBbdGhpcywgd2Vha1RoaXMgPSBXZWFrUHRyIHsgKnRoaXMgfSwgcmVwbHkgPSBXVEZN b3ZlKHJlcGx5KV0oYXV0byYmIGlkZW50aWZpZXIsIGF1dG8gY29va2llQWNjZXB0UG9saWN5KSBt dXRhYmxlIHsKICAgICAgICAgaWYgKCF3ZWFrVGhpcykgewogICAgICAgICAgICAgUkVMRUFTRV9M T0dfRVJST1IoUHJvY2VzcywgIk5ldHdvcmtQcm9jZXNzUHJveHk6OmdldE5ldHdvcmtQcm9jZXNz Q29ubmVjdGlvbjogTmV0d29ya1Byb2Nlc3NQcm94eSBkZWFsbG9jYXRlZCBkdXJpbmcgY29ubmVj dGlvbiBlc3RhYmxpc2htZW50Iik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9SZXNwb25zaXZlbmVzc1RpbWVyLmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1Jlc3Bv bnNpdmVuZXNzVGltZXIuY3BwCmluZGV4IDE3MTg4ODRlNWU3OGUyNTEwY2IxMjJmNzM2OTQzZWY4 NGVlMDdiMDQuLmEzNTJhNGRjMjg1YWQ5MWRiOTVkNGZiNTFjMDAxYTdlMDlhNGVhNWUgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1Jlc3BvbnNpdmVuZXNzVGltZXIuY3BwCisr KyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1Jlc3BvbnNpdmVuZXNzVGltZXIuY3BwCkBAIC0y OCwxMSArMjgsMTAgQEAKIAogbmFtZXNwYWNlIFdlYktpdCB7CiAKLXN0YXRpYyBjb25zdCBTZWNv bmRzIHJlc3BvbnNpdmVuZXNzVGltZW91dCB7IDNfcyB9OwotCi1SZXNwb25zaXZlbmVzc1RpbWVy OjpSZXNwb25zaXZlbmVzc1RpbWVyKFJlc3BvbnNpdmVuZXNzVGltZXI6OkNsaWVudCYgY2xpZW50 KQorUmVzcG9uc2l2ZW5lc3NUaW1lcjo6UmVzcG9uc2l2ZW5lc3NUaW1lcihSZXNwb25zaXZlbmVz c1RpbWVyOjpDbGllbnQmIGNsaWVudCwgU2Vjb25kcyByZXNwb25zaXZlbmVzc1RpbWVvdXQpCiAg ICAgOiBtX2NsaWVudChjbGllbnQpCiAgICAgLCBtX3RpbWVyKFJ1bkxvb3A6Om1haW4oKSwgdGhp cywgJlJlc3BvbnNpdmVuZXNzVGltZXI6OnRpbWVyRmlyZWQpCisgICAgLCBtX3Jlc3BvbnNpdmVu ZXNzVGltZW91dChyZXNwb25zaXZlbmVzc1RpbWVvdXQpCiB7CiB9CiAKQEAgLTcyLDcgKzcxLDcg QEAgdm9pZCBSZXNwb25zaXZlbmVzc1RpbWVyOjp0aW1lckZpcmVkKCkKIAogICAgIGlmICghbWF5 QmVjb21lVW5yZXNwb25zaXZlKCkpIHsKICAgICAgICAgbV93YWl0aW5nRm9yVGltZXIgPSB0cnVl OwotICAgICAgICBtX3RpbWVyLnN0YXJ0T25lU2hvdChyZXNwb25zaXZlbmVzc1RpbWVvdXQpOwor ICAgICAgICBtX3RpbWVyLnN0YXJ0T25lU2hvdChtX3Jlc3BvbnNpdmVuZXNzVGltZW91dCk7CiAg ICAgICAgIHJldHVybjsKICAgICB9CiAKQEAgLTk3LDEwICs5NiwxMCBAQCB2b2lkIFJlc3BvbnNp dmVuZXNzVGltZXI6OnN0YXJ0KCkKICAgICAgICAgLy8KICAgICAgICAgLy8gSW4gbW9zdCBjYXNl cywgc3RvcCBpcyBjYWxsZWQgYmVmb3JlIHdlIGdldCB0byBzY2hlZHVsZSB0aGUgc2Vjb25kIHRp bWVyLCBzYXZpbmcgdXMKICAgICAgICAgLy8gdGhlIHNjaGVkdWxpbmcgb2YgdGhlIHRpbWVyIGVu dGlyZWx5LgotICAgICAgICBtX3Jlc3RhcnRGaXJlVGltZSA9IE1vbm90b25pY1RpbWU6Om5vdygp ICsgcmVzcG9uc2l2ZW5lc3NUaW1lb3V0OworICAgICAgICBtX3Jlc3RhcnRGaXJlVGltZSA9IE1v bm90b25pY1RpbWU6Om5vdygpICsgbV9yZXNwb25zaXZlbmVzc1RpbWVvdXQ7CiAgICAgfSBlbHNl IHsKICAgICAgICAgbV9yZXN0YXJ0RmlyZVRpbWUgPSBNb25vdG9uaWNUaW1lKCk7Ci0gICAgICAg IG1fdGltZXIuc3RhcnRPbmVTaG90KHJlc3BvbnNpdmVuZXNzVGltZW91dCk7CisgICAgICAgIG1f dGltZXIuc3RhcnRPbmVTaG90KG1fcmVzcG9uc2l2ZW5lc3NUaW1lb3V0KTsKICAgICB9CiB9CiAK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1Jlc3BvbnNpdmVuZXNzVGltZXIu aCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1Jlc3BvbnNpdmVuZXNzVGltZXIuaAppbmRleCBi MTM1ODEyZTQxOTBjYTg2YTdlMDIwYzRkNjAzYTQyZjg4MWQ4Nzk3Li5jNDI5ZDQwOThkYjRkOGVl YmM3ZmFlN2YwZTMwZDJlZGI1YjE0YmM0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9SZXNwb25zaXZlbmVzc1RpbWVyLmgKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv UmVzcG9uc2l2ZW5lc3NUaW1lci5oCkBAIC00Nyw3ICs0Nyw3IEBAIHB1YmxpYzoKICAgICAgICAg dmlydHVhbCB2b2lkIGRlcmVmKCkgPSAwOwogICAgIH07CiAKLSAgICBleHBsaWNpdCBSZXNwb25z aXZlbmVzc1RpbWVyKFJlc3BvbnNpdmVuZXNzVGltZXI6OkNsaWVudCYpOworICAgIFJlc3BvbnNp dmVuZXNzVGltZXIoUmVzcG9uc2l2ZW5lc3NUaW1lcjo6Q2xpZW50JiwgU2Vjb25kcyByZXNwb25z aXZlbmVzc1RpbWVvdXQgPSAzX3MpOwogICAgIH5SZXNwb25zaXZlbmVzc1RpbWVyKCk7CiAKICAg ICB2b2lkIHN0YXJ0KCk7CkBAIC04Nyw2ICs4Nyw3IEBAIHByaXZhdGU6CiAgICAgYm9vbCBtX2lz UmVzcG9uc2l2ZSB7IHRydWUgfTsKICAgICBib29sIG1fd2FpdGluZ0ZvclRpbWVyIHsgZmFsc2Ug fTsKICAgICBib29sIG1fdXNlTGF6eVN0b3AgeyBmYWxzZSB9OworICAgIFNlY29uZHMgbV9yZXNw b25zaXZlbmVzc1RpbWVvdXQ7CiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRhU3RvcmUu Y3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2Vic2l0ZURhdGEvV2Vic2l0ZURhdGFTdG9y ZS5jcHAKaW5kZXggZmZmY2EyMjY2ZmU3MDE1YTZjMDM5YjI5MzdhYTY0ODg5MWIzY2Q0Ni4uM2Fm OGI2YTZiNDBjNjMyYWVlYTZhMWYzZWFjY2JmYmJmYTIxNzZmYiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvV2Vic2l0ZURhdGEvV2Vic2l0ZURhdGFTdG9yZS5jcHAKKysrIGIv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2Vic2l0ZURhdGEvV2Vic2l0ZURhdGFTdG9yZS5jcHAK QEAgLTE3NDgsNDMgKzE3NDgsMjUgQEAgdm9pZCBXZWJzaXRlRGF0YVN0b3JlOjpnZXROZXR3b3Jr UHJvY2Vzc0Nvbm5lY3Rpb24oV2ViUHJvY2Vzc1Byb3h5JiB3ZWJQcm9jZXNzUHIKICAgICBhdXRv JiBuZXR3b3JrUHJvY2Vzc1Byb3h5ID0gbmV0d29ya1Byb2Nlc3MoKTsKICAgICBuZXR3b3JrUHJv Y2Vzc1Byb3h5LmdldE5ldHdvcmtQcm9jZXNzQ29ubmVjdGlvbih3ZWJQcm9jZXNzUHJveHksIFt3 ZWFrVGhpcyA9IFdlYWtQdHIgeyAqdGhpcyB9LCBuZXR3b3JrUHJvY2Vzc1Byb3h5ID0gV2Vha1B0 ciB7IG5ldHdvcmtQcm9jZXNzUHJveHkgfSwgd2ViUHJvY2Vzc1Byb3h5ID0gV2Vha1B0ciB7IHdl YlByb2Nlc3NQcm94eSB9LCByZXBseSA9IFdURk1vdmUocmVwbHkpLCBzaG91bGRSZXRyeU9uRmFp bHVyZV0gKGF1dG8mIGNvbm5lY3Rpb25JbmZvKSBtdXRhYmxlIHsKICAgICAgICAgaWYgKFVOTElL RUxZKCFJUEM6OkNvbm5lY3Rpb246OmlkZW50aWZpZXJJc1ZhbGlkKGNvbm5lY3Rpb25JbmZvLmlk ZW50aWZpZXIoKSkpKSB7Ci0gICAgICAgICAgICBhdXRvIGxvZ0Vycm9yID0gW25ldHdvcmtQcm9j ZXNzUHJveHksIHdlYlByb2Nlc3NQcm94eV0oKSB7Ci0jaWYgT1MoREFSV0lOKQotICAgICAgICAg ICAgICAgIGlmICghb3NfdmFyaWFudF9hbGxvd3NfaW50ZXJuYWxfc2VjdXJpdHlfcG9saWNpZXMo ImNvbS5hcHBsZS5XZWJLaXQiKSkKLSAgICAgICAgICAgICAgICAgICAgcmV0dXJuOwotCi0gICAg ICAgICAgICAgICAgaWYgKCF3ZWJQcm9jZXNzUHJveHkpCi0gICAgICAgICAgICAgICAgICAgIHJl dHVybjsKLQotICAgICAgICAgICAgICAgIGludCBuZXR3b3JrUHJvY2Vzc0lkZW50aWZpZXIgPSAw OwotICAgICAgICAgICAgICAgIFN0cmluZyBuZXR3b3JrUHJvY2Vzc1N0YXRlID0gIlVua25vd24i X3M7Ci0gICAgICAgICAgICAgICAgaWYgKG5ldHdvcmtQcm9jZXNzUHJveHkpIHsKLSAgICAgICAg ICAgICAgICAgICAgbmV0d29ya1Byb2Nlc3NJZGVudGlmaWVyID0gbmV0d29ya1Byb2Nlc3NQcm94 eS0+cHJvY2Vzc0lkZW50aWZpZXIoKTsKLSAgICAgICAgICAgICAgICAgICAgbmV0d29ya1Byb2Nl c3NTdGF0ZSA9IG5ldHdvcmtQcm9jZXNzUHJveHktPnN0YXRlU3RyaW5nKCk7Ci0gICAgICAgICAg ICAgICAgfQotICAgICAgICAgICAgICAgIFJFTEVBU0VfTE9HX0VSUk9SKFByb2Nlc3MsICJXZWJz aXRlRGF0YVN0b3JlOjpnZXROZXR3b3JrUHJvY2Vzc0Nvbm5lY3Rpb246IEZhaWxlZCB0byBnZXQg Y29ubmVjdGlvbiAtIG5ldHdvcmtQcm9jZXNzUHJveHk9JXAsIG5ldHdvcmtQcm9jZXNzSWRlbnRp Zmllcj0lZCwgcHJvY2Vzc1N0YXRlPSVzLCB3ZWJQcm9jZXNzUHJveHk9JXAsIHdlYlByb2Nlc3NJ ZGVudGlmaWVyPSVkIiwgbmV0d29ya1Byb2Nlc3NQcm94eS5nZXQoKSwgbmV0d29ya1Byb2Nlc3NJ ZGVudGlmaWVyLCBuZXR3b3JrUHJvY2Vzc1N0YXRlLnV0ZjgoKS5kYXRhKCksIHdlYlByb2Nlc3NQ cm94eS5nZXQoKSwgd2ViUHJvY2Vzc1Byb3h5LT5wcm9jZXNzSWRlbnRpZmllcigpKTsKLSAgICAg ICAgICAgICAgICBSRUxFQVNFX0FTU0VSVF9OT1RfUkVBQ0hFRCgpOwotI2VuZGlmCi0gICAgICAg ICAgICB9OwotCiAgICAgICAgICAgICBpZiAoc2hvdWxkUmV0cnlPbkZhaWx1cmUgPT0gU2hvdWxk UmV0cnlPbkZhaWx1cmU6Ok5vIHx8ICF3ZWJQcm9jZXNzUHJveHkpIHsKLSAgICAgICAgICAgICAg ICBsb2dFcnJvcigpOworICAgICAgICAgICAgICAgIFJFTEVBU0VfTE9HX0VSUk9SKFByb2Nlc3Ms ICJnZXROZXR3b3JrUHJvY2Vzc0Nvbm5lY3Rpb246IEZhaWxlZCB0byBnZXQgY29ubmVjdGlvbiB0 byBuZXR3b3JrIHByb2Nlc3MsIHdpbGwgcmVwbHkgaW52YWxpZCBpZGVudGlmaWVyIC4uLiIpOwog ICAgICAgICAgICAgICAgIHJlcGx5KHsgfSk7CiAgICAgICAgICAgICAgICAgcmV0dXJuOwogICAg ICAgICAgICAgfQogCiAgICAgICAgICAgICAvLyBSZXRyeSBvbiB0aGUgbmV4dCBSdW5Mb29wIGl0 ZXJhdGlvbiBiZWNhdXNlIHdlIG1heSBiZSBpbnNpZGUgdGhlIFdlYnNpdGVEYXRhU3RvcmUgZGVz dHJ1Y3Rvci4KLSAgICAgICAgICAgIFJ1bkxvb3A6Om1haW4oKS5kaXNwYXRjaChbd2Vha1RoaXMg PSBXVEZNb3ZlKHdlYWtUaGlzKSwgbmV0d29ya1Byb2Nlc3NQcm94eSA9IFdURk1vdmUobmV0d29y a1Byb2Nlc3NQcm94eSksIHdlYlByb2Nlc3NQcm94eSA9IFdURk1vdmUod2ViUHJvY2Vzc1Byb3h5 KSwgcmVwbHkgPSBXVEZNb3ZlKHJlcGx5KSwgbG9nRXJyb3IgPSBXVEZNb3ZlKGxvZ0Vycm9yKV0g KCkgbXV0YWJsZSB7CisgICAgICAgICAgICBSdW5Mb29wOjptYWluKCkuZGlzcGF0Y2goW3dlYWtU aGlzID0gV1RGTW92ZSh3ZWFrVGhpcyksIG5ldHdvcmtQcm9jZXNzUHJveHkgPSBXVEZNb3ZlKG5l dHdvcmtQcm9jZXNzUHJveHkpLCB3ZWJQcm9jZXNzUHJveHkgPSBXVEZNb3ZlKHdlYlByb2Nlc3NQ cm94eSksIHJlcGx5ID0gV1RGTW92ZShyZXBseSldICgpIG11dGFibGUgewogICAgICAgICAgICAg ICAgIGlmIChSZWZQdHI8V2Vic2l0ZURhdGFTdG9yZT4gc3Ryb25nVGhpcyA9IHdlYWtUaGlzLmdl dCgpOyBzdHJvbmdUaGlzICYmIHdlYlByb2Nlc3NQcm94eSkgewogICAgICAgICAgICAgICAgICAg ICAvLyBUZXJtaW5hdGUgaWYgaXQgaXMgdGhlIHNhbWUgbmV0d29yayBwcm9jZXNzLgogICAgICAg ICAgICAgICAgICAgICBpZiAobmV0d29ya1Byb2Nlc3NQcm94eSAmJiBzdHJvbmdUaGlzLT5tX25l dHdvcmtQcm9jZXNzID09IG5ldHdvcmtQcm9jZXNzUHJveHkuZ2V0KCkpCiAgICAgICAgICAgICAg ICAgICAgICAgICBzdHJvbmdUaGlzLT50ZXJtaW5hdGVOZXR3b3JrUHJvY2VzcygpOwogICAgICAg ICAgICAgICAgICAgICBSRUxFQVNFX0xPR19FUlJPUihQcm9jZXNzLCAiZ2V0TmV0d29ya1Byb2Nl c3NDb25uZWN0aW9uOiBGYWlsZWQgdG8gZ2V0IGNvbm5lY3Rpb24gdG8gbmV0d29yayBwcm9jZXNz LCB3aWxsIHJldHJ5IC4uLiIpOwogICAgICAgICAgICAgICAgICAgICBzdHJvbmdUaGlzLT5nZXRO ZXR3b3JrUHJvY2Vzc0Nvbm5lY3Rpb24oKndlYlByb2Nlc3NQcm94eSwgV1RGTW92ZShyZXBseSks IFNob3VsZFJldHJ5T25GYWlsdXJlOjpObyk7Ci0gICAgICAgICAgICAgICAgfSBlbHNlIHsKLSAg ICAgICAgICAgICAgICAgICAgbG9nRXJyb3IoKTsKLSAgICAgICAgICAgICAgICAgICAgcmVwbHko eyB9KTsKKyAgICAgICAgICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICAgICAgICAgIH0KKwor ICAgICAgICAgICAgICAgIFJFTEVBU0VfTE9HX0VSUk9SKFByb2Nlc3MsICJnZXROZXR3b3JrUHJv Y2Vzc0Nvbm5lY3Rpb246IEZhaWxlZCB0byBnZXQgY29ubmVjdGlvbiB0byBuZXR3b3JrIHByb2Nl c3MsIHdpbGwgcmVwbHkgaW52YWxpZCBpZGVudGlmaWVyIC4uLiIpOworICAgICAgICAgICAgICAg IHJlcGx5KHsgfSk7CiAgICAgICAgICAgICB9KTsKICAgICAgICAgICAgIHJldHVybjsKICAgICAg ICAgfQo= 442870 2021-10-29 15:10:43 -0700 2021-11-01 10:04:33 -0700 Patch bug-232505-20211029151042.patch text/plain 11150 sihui_liu U3VidmVyc2lvbiBSZXZpc2lvbjogMjg1MDQyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGVlYjJkYjRmNTZkZDM3MTJk YmU4OTlhMTVhNDNkZjZiZmRiYWNjOTkuLmZkNWM4NjE1M2IzMzIyNzZkOGU1MmFjMjIxNDY0MTgy ODQ5MTdjZGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjUgQEAKKzIwMjEtMTAtMjkgIFNpaHVpIExp dSAgPHNpaHVpX2xpdUBhcHBsZS5jb20+CisKKyAgICAgICAgSW5jcmVhc2UgcmVzcG9uc2l2ZW5l c3MgdGltZW91dCBmb3IgbmV0d29yayBwcm9jZXNzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzI1MDUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BdXhpbGlhcnlQcm9jZXNzUHJveHku Y3BwOgorICAgICAgICAoV2ViS2l0OjpBdXhpbGlhcnlQcm9jZXNzUHJveHk6OkF1eGlsaWFyeVBy b2Nlc3NQcm94eSk6CisgICAgICAgICogVUlQcm9jZXNzL0F1eGlsaWFyeVByb2Nlc3NQcm94eS5o OgorICAgICAgICAqIFVJUHJvY2Vzcy9OZXR3b3JrL05ldHdvcmtQcm9jZXNzUHJveHkuY3BwOgor ICAgICAgICAoV2ViS2l0OjpOZXR3b3JrUHJvY2Vzc1Byb3h5OjpOZXR3b3JrUHJvY2Vzc1Byb3h5 KToKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya1Byb2Nlc3NQcm94eTo6Z2V0TmV0d29ya1Byb2Nl c3NDb25uZWN0aW9uKToKKyAgICAgICAgKiBVSVByb2Nlc3MvUmVzcG9uc2l2ZW5lc3NUaW1lci5j cHA6CisgICAgICAgIChXZWJLaXQ6OlJlc3BvbnNpdmVuZXNzVGltZXI6OlJlc3BvbnNpdmVuZXNz VGltZXIpOgorICAgICAgICAoV2ViS2l0OjpSZXNwb25zaXZlbmVzc1RpbWVyOjp0aW1lckZpcmVk KToKKyAgICAgICAgKFdlYktpdDo6UmVzcG9uc2l2ZW5lc3NUaW1lcjo6c3RhcnQpOgorICAgICAg ICAoKTogRGVsZXRlZC4KKyAgICAgICAgKiBVSVByb2Nlc3MvUmVzcG9uc2l2ZW5lc3NUaW1lci5o OgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJzaXRlRGF0YS9XZWJzaXRlRGF0YVN0b3JlLmNwcDoK KyAgICAgICAgKFdlYktpdDo6V2Vic2l0ZURhdGFTdG9yZTo6Z2V0TmV0d29ya1Byb2Nlc3NDb25u ZWN0aW9uKToKKwogMjAyMS0xMC0yOSAgU2lodWkgTGl1ICA8c2lodWlfbGl1QGFwcGxlLmNvbT4K IAogICAgICAgICBSZWxlYXNlIEZpbGVTeXN0ZW1TdG9yYWdlSGFuZGxlIHdoZW4gaXQgaXMgbm90 IGluIHVzZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQXV4aWxpYXJ5UHJv Y2Vzc1Byb3h5LmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0F1eGlsaWFyeVByb2Nlc3NQ cm94eS5jcHAKaW5kZXggODVhODJjYmI2ZjNiZDgyOTNkYzZjNTlhNjZiMWRlODk4OTRkOWIzYS4u MTM5OGRlNTM4MmM2YWM5YzMxOGJlYTEyOWY1MWYwYzA2M2M4YTIzZCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvQXV4aWxpYXJ5UHJvY2Vzc1Byb3h5LmNwcAorKysgYi9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9BdXhpbGlhcnlQcm9jZXNzUHJveHkuY3BwCkBAIC00MCw4ICs0 MCw4IEBACiAKIG5hbWVzcGFjZSBXZWJLaXQgewogCi1BdXhpbGlhcnlQcm9jZXNzUHJveHk6OkF1 eGlsaWFyeVByb2Nlc3NQcm94eShib29sIGFsd2F5c1J1bnNBdEJhY2tncm91bmRQcmlvcml0eSkK LSAgICA6IG1fcmVzcG9uc2l2ZW5lc3NUaW1lcigqdGhpcykKK0F1eGlsaWFyeVByb2Nlc3NQcm94 eTo6QXV4aWxpYXJ5UHJvY2Vzc1Byb3h5KGJvb2wgYWx3YXlzUnVuc0F0QmFja2dyb3VuZFByaW9y aXR5LCBTZWNvbmRzIHJlc3BvbnNpdmVuZXNzVGltZW91dCkKKyAgICA6IG1fcmVzcG9uc2l2ZW5l c3NUaW1lcigqdGhpcywgcmVzcG9uc2l2ZW5lc3NUaW1lb3V0KQogICAgICwgbV9hbHdheXNSdW5z QXRCYWNrZ3JvdW5kUHJpb3JpdHkoYWx3YXlzUnVuc0F0QmFja2dyb3VuZFByaW9yaXR5KQogewog fQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQXV4aWxpYXJ5UHJvY2Vzc1By b3h5LmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BdXhpbGlhcnlQcm9jZXNzUHJveHkuaApp bmRleCA4MDQzNWIxZTY3N2M2NmQ3Yjc0NjgyZDQ0NTAyODdiMTRjZmVkYmNkLi5iMTYyMGZlZDFj OTIxZTZkMzJlNGVkM2Y1MDc0NzAwZGZjM2E2NWMwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9BdXhpbGlhcnlQcm9jZXNzUHJveHkuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9BdXhpbGlhcnlQcm9jZXNzUHJveHkuaApAQCAtNDMsNyArNDMsNyBAQCBjbGFzcyBB dXhpbGlhcnlQcm9jZXNzUHJveHkgOiBwdWJsaWMgVGhyZWFkU2FmZVJlZkNvdW50ZWQ8QXV4aWxp YXJ5UHJvY2Vzc1Byb3h5LAogICAgIFdURl9NQUtFX05PTkNPUFlBQkxFKEF1eGlsaWFyeVByb2Nl c3NQcm94eSk7CiAKIHByb3RlY3RlZDoKLSAgICBleHBsaWNpdCBBdXhpbGlhcnlQcm9jZXNzUHJv eHkoYm9vbCBhbHdheXNSdW5zQXRCYWNrZ3JvdW5kUHJpb3JpdHkgPSBmYWxzZSk7CisgICAgQXV4 aWxpYXJ5UHJvY2Vzc1Byb3h5KGJvb2wgYWx3YXlzUnVuc0F0QmFja2dyb3VuZFByaW9yaXR5ID0g ZmFsc2UsIFNlY29uZHMgcmVzcG9uc2l2ZW5lc3NUaW1lb3V0ID0gUmVzcG9uc2l2ZW5lc3NUaW1l cjo6ZGVmYXVsdFJlc3BvbnNpdmVuZXNzVGltZW91dCk7CiAKIHB1YmxpYzoKICAgICB2aXJ0dWFs IH5BdXhpbGlhcnlQcm9jZXNzUHJveHkoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL05ldHdvcmsvTmV0d29ya1Byb2Nlc3NQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9OZXR3b3JrL05ldHdvcmtQcm9jZXNzUHJveHkuY3BwCmluZGV4IGM1NTNmOWNhNzEy OThmODY5MWNhZDAxZDBmNzhiZTNhNzA2NDg1ZGIuLmMzMmRlZWUzNzc2Yzg2MWZlMTRiMTkzMGY2 NDUyNGQ1NGY5YjM1ZjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL05ldHdv cmsvTmV0d29ya1Byb2Nlc3NQcm94eS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv TmV0d29yay9OZXR3b3JrUHJvY2Vzc1Byb3h5LmNwcApAQCAtODYsNiArODYsOCBAQAogbmFtZXNw YWNlIFdlYktpdCB7CiB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKIAorc3RhdGljIGNvbnN0IFNl Y29uZHMgbmV0d29ya1Byb2Nlc3NSZXNwb25zaXZlbmVzc1RpbWVvdXQgPSA2X3M7CisKIHN0YXRp YyBIYXNoU2V0PE5ldHdvcmtQcm9jZXNzUHJveHkqPiYgbmV0d29ya1Byb2Nlc3Nlc1NldCgpCiB7 CiAgICAgQVNTRVJUKFJ1bkxvb3A6OmlzTWFpbigpKTsKQEAgLTIwMSw3ICsyMDMsNyBAQCBzdGF0 aWMgYm9vbCBhbnlQcm9jZXNzUG9vbFNob3VsZFRha2VVSUJhY2tncm91bmRBc3NlcnRpb24oKQog fQogCiBOZXR3b3JrUHJvY2Vzc1Byb3h5OjpOZXR3b3JrUHJvY2Vzc1Byb3h5KCkKLSAgICA6IEF1 eGlsaWFyeVByb2Nlc3NQcm94eShhbnlQcm9jZXNzUG9vbEFsd2F5c1J1bnNBdEJhY2tncm91bmRQ cmlvcml0eSgpKQorICAgIDogQXV4aWxpYXJ5UHJvY2Vzc1Byb3h5KGFueVByb2Nlc3NQb29sQWx3 YXlzUnVuc0F0QmFja2dyb3VuZFByaW9yaXR5KCksIG5ldHdvcmtQcm9jZXNzUmVzcG9uc2l2ZW5l c3NUaW1lb3V0KQogI2lmIEVOQUJMRShMRUdBQ1lfQ1VTVE9NX1BST1RPQ09MX01BTkFHRVIpCiAg ICAgLCBtX2N1c3RvbVByb3RvY29sTWFuYWdlckNsaWVudChtYWtlVW5pcXVlUmVmPExlZ2FjeUN1 c3RvbVByb3RvY29sTWFuYWdlckNsaWVudD4oKSkKICAgICAsIG1fY3VzdG9tUHJvdG9jb2xNYW5h Z2VyUHJveHkoKnRoaXMpCkBAIC0yNTUsOCArMjU3LDcgQEAgdm9pZCBOZXR3b3JrUHJvY2Vzc1By b3h5Ojpwcm9jZXNzV2lsbFNodXREb3duKElQQzo6Q29ubmVjdGlvbiYgY29ubmVjdGlvbikKIHZv aWQgTmV0d29ya1Byb2Nlc3NQcm94eTo6Z2V0TmV0d29ya1Byb2Nlc3NDb25uZWN0aW9uKFdlYlBy b2Nlc3NQcm94eSYgd2ViUHJvY2Vzc1Byb3h5LCBNZXNzYWdlczo6V2ViUHJvY2Vzc1Byb3h5OjpH ZXROZXR3b3JrUHJvY2Vzc0Nvbm5lY3Rpb246OkRlbGF5ZWRSZXBseSYmIHJlcGx5KQogewogICAg IFJFTEVBU0VfTE9HKFByb2Nlc3NTdXNwZW5zaW9uLCAiJXAgLSBOZXR3b3JrUHJvY2Vzc1Byb3h5 IGlzIHRha2luZyBhIGJhY2tncm91bmQgYXNzZXJ0aW9uIGJlY2F1c2UgYSB3ZWIgcHJvY2VzcyBp cyByZXF1ZXN0aW5nIGEgY29ubmVjdGlvbiIsIHRoaXMpOwotICAgIGlmICghaXNMYXVuY2hpbmco KSkKLSAgICAgICAgc3RhcnRSZXNwb25zaXZlbmVzc1RpbWVyKFVzZUxhenlTdG9wOjpObyk7Cisg ICAgc3RhcnRSZXNwb25zaXZlbmVzc1RpbWVyKFVzZUxhenlTdG9wOjpObyk7CiAgICAgc2VuZFdp dGhBc3luY1JlcGx5KE1lc3NhZ2VzOjpOZXR3b3JrUHJvY2Vzczo6Q3JlYXRlTmV0d29ya0Nvbm5l Y3Rpb25Ub1dlYlByb2Nlc3MgeyB3ZWJQcm9jZXNzUHJveHkuY29yZVByb2Nlc3NJZGVudGlmaWVy KCksIHdlYlByb2Nlc3NQcm94eS5zZXNzaW9uSUQoKSB9LCBbdGhpcywgd2Vha1RoaXMgPSBXZWFr UHRyIHsgKnRoaXMgfSwgcmVwbHkgPSBXVEZNb3ZlKHJlcGx5KV0oYXV0byYmIGlkZW50aWZpZXIs IGF1dG8gY29va2llQWNjZXB0UG9saWN5KSBtdXRhYmxlIHsKICAgICAgICAgaWYgKCF3ZWFrVGhp cykgewogICAgICAgICAgICAgUkVMRUFTRV9MT0dfRVJST1IoUHJvY2VzcywgIk5ldHdvcmtQcm9j ZXNzUHJveHk6OmdldE5ldHdvcmtQcm9jZXNzQ29ubmVjdGlvbjogTmV0d29ya1Byb2Nlc3NQcm94 eSBkZWFsbG9jYXRlZCBkdXJpbmcgY29ubmVjdGlvbiBlc3RhYmxpc2htZW50Iik7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9SZXNwb25zaXZlbmVzc1RpbWVyLmNwcCBiL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL1Jlc3BvbnNpdmVuZXNzVGltZXIuY3BwCmluZGV4IDE3MTg4 ODRlNWU3OGUyNTEwY2IxMjJmNzM2OTQzZWY4NGVlMDdiMDQuLmEzNTJhNGRjMjg1YWQ5MWRiOTVk NGZiNTFjMDAxYTdlMDlhNGVhNWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L1Jlc3BvbnNpdmVuZXNzVGltZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1Jl c3BvbnNpdmVuZXNzVGltZXIuY3BwCkBAIC0yOCwxMSArMjgsMTAgQEAKIAogbmFtZXNwYWNlIFdl YktpdCB7CiAKLXN0YXRpYyBjb25zdCBTZWNvbmRzIHJlc3BvbnNpdmVuZXNzVGltZW91dCB7IDNf cyB9OwotCi1SZXNwb25zaXZlbmVzc1RpbWVyOjpSZXNwb25zaXZlbmVzc1RpbWVyKFJlc3BvbnNp dmVuZXNzVGltZXI6OkNsaWVudCYgY2xpZW50KQorUmVzcG9uc2l2ZW5lc3NUaW1lcjo6UmVzcG9u c2l2ZW5lc3NUaW1lcihSZXNwb25zaXZlbmVzc1RpbWVyOjpDbGllbnQmIGNsaWVudCwgU2Vjb25k cyByZXNwb25zaXZlbmVzc1RpbWVvdXQpCiAgICAgOiBtX2NsaWVudChjbGllbnQpCiAgICAgLCBt X3RpbWVyKFJ1bkxvb3A6Om1haW4oKSwgdGhpcywgJlJlc3BvbnNpdmVuZXNzVGltZXI6OnRpbWVy RmlyZWQpCisgICAgLCBtX3Jlc3BvbnNpdmVuZXNzVGltZW91dChyZXNwb25zaXZlbmVzc1RpbWVv dXQpCiB7CiB9CiAKQEAgLTcyLDcgKzcxLDcgQEAgdm9pZCBSZXNwb25zaXZlbmVzc1RpbWVyOjp0 aW1lckZpcmVkKCkKIAogICAgIGlmICghbWF5QmVjb21lVW5yZXNwb25zaXZlKCkpIHsKICAgICAg ICAgbV93YWl0aW5nRm9yVGltZXIgPSB0cnVlOwotICAgICAgICBtX3RpbWVyLnN0YXJ0T25lU2hv dChyZXNwb25zaXZlbmVzc1RpbWVvdXQpOworICAgICAgICBtX3RpbWVyLnN0YXJ0T25lU2hvdCht X3Jlc3BvbnNpdmVuZXNzVGltZW91dCk7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAKQEAgLTk3 LDEwICs5NiwxMCBAQCB2b2lkIFJlc3BvbnNpdmVuZXNzVGltZXI6OnN0YXJ0KCkKICAgICAgICAg Ly8KICAgICAgICAgLy8gSW4gbW9zdCBjYXNlcywgc3RvcCBpcyBjYWxsZWQgYmVmb3JlIHdlIGdl dCB0byBzY2hlZHVsZSB0aGUgc2Vjb25kIHRpbWVyLCBzYXZpbmcgdXMKICAgICAgICAgLy8gdGhl IHNjaGVkdWxpbmcgb2YgdGhlIHRpbWVyIGVudGlyZWx5LgotICAgICAgICBtX3Jlc3RhcnRGaXJl VGltZSA9IE1vbm90b25pY1RpbWU6Om5vdygpICsgcmVzcG9uc2l2ZW5lc3NUaW1lb3V0OworICAg ICAgICBtX3Jlc3RhcnRGaXJlVGltZSA9IE1vbm90b25pY1RpbWU6Om5vdygpICsgbV9yZXNwb25z aXZlbmVzc1RpbWVvdXQ7CiAgICAgfSBlbHNlIHsKICAgICAgICAgbV9yZXN0YXJ0RmlyZVRpbWUg PSBNb25vdG9uaWNUaW1lKCk7Ci0gICAgICAgIG1fdGltZXIuc3RhcnRPbmVTaG90KHJlc3BvbnNp dmVuZXNzVGltZW91dCk7CisgICAgICAgIG1fdGltZXIuc3RhcnRPbmVTaG90KG1fcmVzcG9uc2l2 ZW5lc3NUaW1lb3V0KTsKICAgICB9CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL1Jlc3BvbnNpdmVuZXNzVGltZXIuaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1Jl c3BvbnNpdmVuZXNzVGltZXIuaAppbmRleCBiMTM1ODEyZTQxOTBjYTg2YTdlMDIwYzRkNjAzYTQy Zjg4MWQ4Nzk3Li5hZDU0MjMwNWFiMmM4NjA4NTQ2N2Y5YjQ5MGZiNGMyODIwMmJiOWNkIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9SZXNwb25zaXZlbmVzc1RpbWVyLmgKKysr IGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvUmVzcG9uc2l2ZW5lc3NUaW1lci5oCkBAIC00Nyw3 ICs0Nyw4IEBAIHB1YmxpYzoKICAgICAgICAgdmlydHVhbCB2b2lkIGRlcmVmKCkgPSAwOwogICAg IH07CiAKLSAgICBleHBsaWNpdCBSZXNwb25zaXZlbmVzc1RpbWVyKFJlc3BvbnNpdmVuZXNzVGlt ZXI6OkNsaWVudCYpOworICAgIHN0YXRpYyBjb25zdGV4cHIgU2Vjb25kcyBkZWZhdWx0UmVzcG9u c2l2ZW5lc3NUaW1lb3V0ID0gM19zOworICAgIFJlc3BvbnNpdmVuZXNzVGltZXIoUmVzcG9uc2l2 ZW5lc3NUaW1lcjo6Q2xpZW50JiwgU2Vjb25kcyByZXNwb25zaXZlbmVzc1RpbWVvdXQpOwogICAg IH5SZXNwb25zaXZlbmVzc1RpbWVyKCk7CiAKICAgICB2b2lkIHN0YXJ0KCk7CkBAIC04Nyw2ICs4 OCw3IEBAIHByaXZhdGU6CiAgICAgYm9vbCBtX2lzUmVzcG9uc2l2ZSB7IHRydWUgfTsKICAgICBi b29sIG1fd2FpdGluZ0ZvclRpbWVyIHsgZmFsc2UgfTsKICAgICBib29sIG1fdXNlTGF6eVN0b3Ag eyBmYWxzZSB9OworICAgIFNlY29uZHMgbV9yZXNwb25zaXZlbmVzc1RpbWVvdXQ7CiB9OwogCiB9 IC8vIG5hbWVzcGFjZSBXZWJLaXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRhU3RvcmUuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvV2Vic2l0ZURhdGEvV2Vic2l0ZURhdGFTdG9yZS5jcHAKaW5kZXggZmZmY2EyMjY2ZmU3MDE1 YTZjMDM5YjI5MzdhYTY0ODg5MWIzY2Q0Ni4uM2FmOGI2YTZiNDBjNjMyYWVlYTZhMWYzZWFjY2Jm YmJmYTIxNzZmYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2Vic2l0ZURh dGEvV2Vic2l0ZURhdGFTdG9yZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2Vi c2l0ZURhdGEvV2Vic2l0ZURhdGFTdG9yZS5jcHAKQEAgLTE3NDgsNDMgKzE3NDgsMjUgQEAgdm9p ZCBXZWJzaXRlRGF0YVN0b3JlOjpnZXROZXR3b3JrUHJvY2Vzc0Nvbm5lY3Rpb24oV2ViUHJvY2Vz c1Byb3h5JiB3ZWJQcm9jZXNzUHIKICAgICBhdXRvJiBuZXR3b3JrUHJvY2Vzc1Byb3h5ID0gbmV0 d29ya1Byb2Nlc3MoKTsKICAgICBuZXR3b3JrUHJvY2Vzc1Byb3h5LmdldE5ldHdvcmtQcm9jZXNz Q29ubmVjdGlvbih3ZWJQcm9jZXNzUHJveHksIFt3ZWFrVGhpcyA9IFdlYWtQdHIgeyAqdGhpcyB9 LCBuZXR3b3JrUHJvY2Vzc1Byb3h5ID0gV2Vha1B0ciB7IG5ldHdvcmtQcm9jZXNzUHJveHkgfSwg d2ViUHJvY2Vzc1Byb3h5ID0gV2Vha1B0ciB7IHdlYlByb2Nlc3NQcm94eSB9LCByZXBseSA9IFdU Rk1vdmUocmVwbHkpLCBzaG91bGRSZXRyeU9uRmFpbHVyZV0gKGF1dG8mIGNvbm5lY3Rpb25JbmZv KSBtdXRhYmxlIHsKICAgICAgICAgaWYgKFVOTElLRUxZKCFJUEM6OkNvbm5lY3Rpb246OmlkZW50 aWZpZXJJc1ZhbGlkKGNvbm5lY3Rpb25JbmZvLmlkZW50aWZpZXIoKSkpKSB7Ci0gICAgICAgICAg ICBhdXRvIGxvZ0Vycm9yID0gW25ldHdvcmtQcm9jZXNzUHJveHksIHdlYlByb2Nlc3NQcm94eV0o KSB7Ci0jaWYgT1MoREFSV0lOKQotICAgICAgICAgICAgICAgIGlmICghb3NfdmFyaWFudF9hbGxv d3NfaW50ZXJuYWxfc2VjdXJpdHlfcG9saWNpZXMoImNvbS5hcHBsZS5XZWJLaXQiKSkKLSAgICAg ICAgICAgICAgICAgICAgcmV0dXJuOwotCi0gICAgICAgICAgICAgICAgaWYgKCF3ZWJQcm9jZXNz UHJveHkpCi0gICAgICAgICAgICAgICAgICAgIHJldHVybjsKLQotICAgICAgICAgICAgICAgIGlu dCBuZXR3b3JrUHJvY2Vzc0lkZW50aWZpZXIgPSAwOwotICAgICAgICAgICAgICAgIFN0cmluZyBu ZXR3b3JrUHJvY2Vzc1N0YXRlID0gIlVua25vd24iX3M7Ci0gICAgICAgICAgICAgICAgaWYgKG5l dHdvcmtQcm9jZXNzUHJveHkpIHsKLSAgICAgICAgICAgICAgICAgICAgbmV0d29ya1Byb2Nlc3NJ ZGVudGlmaWVyID0gbmV0d29ya1Byb2Nlc3NQcm94eS0+cHJvY2Vzc0lkZW50aWZpZXIoKTsKLSAg ICAgICAgICAgICAgICAgICAgbmV0d29ya1Byb2Nlc3NTdGF0ZSA9IG5ldHdvcmtQcm9jZXNzUHJv eHktPnN0YXRlU3RyaW5nKCk7Ci0gICAgICAgICAgICAgICAgfQotICAgICAgICAgICAgICAgIFJF TEVBU0VfTE9HX0VSUk9SKFByb2Nlc3MsICJXZWJzaXRlRGF0YVN0b3JlOjpnZXROZXR3b3JrUHJv Y2Vzc0Nvbm5lY3Rpb246IEZhaWxlZCB0byBnZXQgY29ubmVjdGlvbiAtIG5ldHdvcmtQcm9jZXNz UHJveHk9JXAsIG5ldHdvcmtQcm9jZXNzSWRlbnRpZmllcj0lZCwgcHJvY2Vzc1N0YXRlPSVzLCB3 ZWJQcm9jZXNzUHJveHk9JXAsIHdlYlByb2Nlc3NJZGVudGlmaWVyPSVkIiwgbmV0d29ya1Byb2Nl c3NQcm94eS5nZXQoKSwgbmV0d29ya1Byb2Nlc3NJZGVudGlmaWVyLCBuZXR3b3JrUHJvY2Vzc1N0 YXRlLnV0ZjgoKS5kYXRhKCksIHdlYlByb2Nlc3NQcm94eS5nZXQoKSwgd2ViUHJvY2Vzc1Byb3h5 LT5wcm9jZXNzSWRlbnRpZmllcigpKTsKLSAgICAgICAgICAgICAgICBSRUxFQVNFX0FTU0VSVF9O T1RfUkVBQ0hFRCgpOwotI2VuZGlmCi0gICAgICAgICAgICB9OwotCiAgICAgICAgICAgICBpZiAo c2hvdWxkUmV0cnlPbkZhaWx1cmUgPT0gU2hvdWxkUmV0cnlPbkZhaWx1cmU6Ok5vIHx8ICF3ZWJQ cm9jZXNzUHJveHkpIHsKLSAgICAgICAgICAgICAgICBsb2dFcnJvcigpOworICAgICAgICAgICAg ICAgIFJFTEVBU0VfTE9HX0VSUk9SKFByb2Nlc3MsICJnZXROZXR3b3JrUHJvY2Vzc0Nvbm5lY3Rp b246IEZhaWxlZCB0byBnZXQgY29ubmVjdGlvbiB0byBuZXR3b3JrIHByb2Nlc3MsIHdpbGwgcmVw bHkgaW52YWxpZCBpZGVudGlmaWVyIC4uLiIpOwogICAgICAgICAgICAgICAgIHJlcGx5KHsgfSk7 CiAgICAgICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICAgICAgfQogCiAgICAgICAgICAgICAv LyBSZXRyeSBvbiB0aGUgbmV4dCBSdW5Mb29wIGl0ZXJhdGlvbiBiZWNhdXNlIHdlIG1heSBiZSBp bnNpZGUgdGhlIFdlYnNpdGVEYXRhU3RvcmUgZGVzdHJ1Y3Rvci4KLSAgICAgICAgICAgIFJ1bkxv b3A6Om1haW4oKS5kaXNwYXRjaChbd2Vha1RoaXMgPSBXVEZNb3ZlKHdlYWtUaGlzKSwgbmV0d29y a1Byb2Nlc3NQcm94eSA9IFdURk1vdmUobmV0d29ya1Byb2Nlc3NQcm94eSksIHdlYlByb2Nlc3NQ cm94eSA9IFdURk1vdmUod2ViUHJvY2Vzc1Byb3h5KSwgcmVwbHkgPSBXVEZNb3ZlKHJlcGx5KSwg bG9nRXJyb3IgPSBXVEZNb3ZlKGxvZ0Vycm9yKV0gKCkgbXV0YWJsZSB7CisgICAgICAgICAgICBS dW5Mb29wOjptYWluKCkuZGlzcGF0Y2goW3dlYWtUaGlzID0gV1RGTW92ZSh3ZWFrVGhpcyksIG5l dHdvcmtQcm9jZXNzUHJveHkgPSBXVEZNb3ZlKG5ldHdvcmtQcm9jZXNzUHJveHkpLCB3ZWJQcm9j ZXNzUHJveHkgPSBXVEZNb3ZlKHdlYlByb2Nlc3NQcm94eSksIHJlcGx5ID0gV1RGTW92ZShyZXBs eSldICgpIG11dGFibGUgewogICAgICAgICAgICAgICAgIGlmIChSZWZQdHI8V2Vic2l0ZURhdGFT dG9yZT4gc3Ryb25nVGhpcyA9IHdlYWtUaGlzLmdldCgpOyBzdHJvbmdUaGlzICYmIHdlYlByb2Nl c3NQcm94eSkgewogICAgICAgICAgICAgICAgICAgICAvLyBUZXJtaW5hdGUgaWYgaXQgaXMgdGhl IHNhbWUgbmV0d29yayBwcm9jZXNzLgogICAgICAgICAgICAgICAgICAgICBpZiAobmV0d29ya1By b2Nlc3NQcm94eSAmJiBzdHJvbmdUaGlzLT5tX25ldHdvcmtQcm9jZXNzID09IG5ldHdvcmtQcm9j ZXNzUHJveHkuZ2V0KCkpCiAgICAgICAgICAgICAgICAgICAgICAgICBzdHJvbmdUaGlzLT50ZXJt aW5hdGVOZXR3b3JrUHJvY2VzcygpOwogICAgICAgICAgICAgICAgICAgICBSRUxFQVNFX0xPR19F UlJPUihQcm9jZXNzLCAiZ2V0TmV0d29ya1Byb2Nlc3NDb25uZWN0aW9uOiBGYWlsZWQgdG8gZ2V0 IGNvbm5lY3Rpb24gdG8gbmV0d29yayBwcm9jZXNzLCB3aWxsIHJldHJ5IC4uLiIpOwogICAgICAg ICAgICAgICAgICAgICBzdHJvbmdUaGlzLT5nZXROZXR3b3JrUHJvY2Vzc0Nvbm5lY3Rpb24oKndl YlByb2Nlc3NQcm94eSwgV1RGTW92ZShyZXBseSksIFNob3VsZFJldHJ5T25GYWlsdXJlOjpObyk7 Ci0gICAgICAgICAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAgICAgICAgICAgbG9nRXJyb3Io KTsKLSAgICAgICAgICAgICAgICAgICAgcmVwbHkoeyB9KTsKKyAgICAgICAgICAgICAgICAgICAg cmV0dXJuOwogICAgICAgICAgICAgICAgIH0KKworICAgICAgICAgICAgICAgIFJFTEVBU0VfTE9H X0VSUk9SKFByb2Nlc3MsICJnZXROZXR3b3JrUHJvY2Vzc0Nvbm5lY3Rpb246IEZhaWxlZCB0byBn ZXQgY29ubmVjdGlvbiB0byBuZXR3b3JrIHByb2Nlc3MsIHdpbGwgcmVwbHkgaW52YWxpZCBpZGVu dGlmaWVyIC4uLiIpOworICAgICAgICAgICAgICAgIHJlcGx5KHsgfSk7CiAgICAgICAgICAgICB9 KTsKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQo= 442987 2021-11-01 10:04:36 -0700 2021-11-01 10:45:44 -0700 Patch for landing bug-232505-20211101100435.patch text/plain 11134 sihui_liu U3VidmVyc2lvbiBSZXZpc2lvbjogMjg1MTExCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDJmZmUwOWRiYmIwZDZlZGRj NDBhOWRmN2NiOWNjYWJlYTg0YmFkN2EuLjBjNjljMTE5MGQ0M2M4NjYzZTEzNDE1MDNhMGE1MWEy M2E0MzhkOGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjUgQEAKKzIwMjEtMTEtMDEgIFNpaHVpIExp dSAgPHNpaHVpX2xpdUBhcHBsZS5jb20+CisKKyAgICAgICAgSW5jcmVhc2UgcmVzcG9uc2l2ZW5l c3MgdGltZW91dCBmb3IgbmV0d29yayBwcm9jZXNzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzI1MDUKKworICAgICAgICBSZXZpZXdlZCBieSBDaHJp cyBEdW1lei4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BdXhpbGlhcnlQcm9jZXNzUHJveHkuY3Bw OgorICAgICAgICAoV2ViS2l0OjpBdXhpbGlhcnlQcm9jZXNzUHJveHk6OkF1eGlsaWFyeVByb2Nl c3NQcm94eSk6CisgICAgICAgICogVUlQcm9jZXNzL0F1eGlsaWFyeVByb2Nlc3NQcm94eS5oOgor ICAgICAgICAqIFVJUHJvY2Vzcy9OZXR3b3JrL05ldHdvcmtQcm9jZXNzUHJveHkuY3BwOgorICAg ICAgICAoV2ViS2l0OjpOZXR3b3JrUHJvY2Vzc1Byb3h5OjpOZXR3b3JrUHJvY2Vzc1Byb3h5KToK KyAgICAgICAgKFdlYktpdDo6TmV0d29ya1Byb2Nlc3NQcm94eTo6Z2V0TmV0d29ya1Byb2Nlc3ND b25uZWN0aW9uKToKKyAgICAgICAgKiBVSVByb2Nlc3MvUmVzcG9uc2l2ZW5lc3NUaW1lci5jcHA6 CisgICAgICAgIChXZWJLaXQ6OlJlc3BvbnNpdmVuZXNzVGltZXI6OlJlc3BvbnNpdmVuZXNzVGlt ZXIpOgorICAgICAgICAoV2ViS2l0OjpSZXNwb25zaXZlbmVzc1RpbWVyOjp0aW1lckZpcmVkKToK KyAgICAgICAgKFdlYktpdDo6UmVzcG9uc2l2ZW5lc3NUaW1lcjo6c3RhcnQpOgorICAgICAgICAo KTogRGVsZXRlZC4KKyAgICAgICAgKiBVSVByb2Nlc3MvUmVzcG9uc2l2ZW5lc3NUaW1lci5oOgor ICAgICAgICAqIFVJUHJvY2Vzcy9XZWJzaXRlRGF0YS9XZWJzaXRlRGF0YVN0b3JlLmNwcDoKKyAg ICAgICAgKFdlYktpdDo6V2Vic2l0ZURhdGFTdG9yZTo6Z2V0TmV0d29ya1Byb2Nlc3NDb25uZWN0 aW9uKToKKwogMjAyMS0xMS0wMSAgQXl1bWkgS29qaW1hICA8YXl1bWlfa29qaW1hQGFwcGxlLmNv bT4KIAogICAgICAgICBVbnJldmlld2VkLCByZXZlcnRpbmcgcjI4NTA1NS4KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0F1eGlsaWFyeVByb2Nlc3NQcm94eS5jcHAgYi9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9BdXhpbGlhcnlQcm9jZXNzUHJveHkuY3BwCmluZGV4IGU1YTZj MzdjYTNmZWQ0NGEzYjEyNWEwZWM3Y2I5MTJmNmU4YzIxNmUuLmJiODE1OTc2YjUyODkyMzM1YjIy ZDUxMzM4ZTMzNjU1ZGQ2NTM4OTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L0F1eGlsaWFyeVByb2Nlc3NQcm94eS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv QXV4aWxpYXJ5UHJvY2Vzc1Byb3h5LmNwcApAQCAtNDAsOCArNDAsOCBAQAogCiBuYW1lc3BhY2Ug V2ViS2l0IHsKIAotQXV4aWxpYXJ5UHJvY2Vzc1Byb3h5OjpBdXhpbGlhcnlQcm9jZXNzUHJveHko Ym9vbCBhbHdheXNSdW5zQXRCYWNrZ3JvdW5kUHJpb3JpdHkpCi0gICAgOiBtX3Jlc3BvbnNpdmVu ZXNzVGltZXIoKnRoaXMpCitBdXhpbGlhcnlQcm9jZXNzUHJveHk6OkF1eGlsaWFyeVByb2Nlc3NQ cm94eShib29sIGFsd2F5c1J1bnNBdEJhY2tncm91bmRQcmlvcml0eSwgU2Vjb25kcyByZXNwb25z aXZlbmVzc1RpbWVvdXQpCisgICAgOiBtX3Jlc3BvbnNpdmVuZXNzVGltZXIoKnRoaXMsIHJlc3Bv bnNpdmVuZXNzVGltZW91dCkKICAgICAsIG1fYWx3YXlzUnVuc0F0QmFja2dyb3VuZFByaW9yaXR5 KGFsd2F5c1J1bnNBdEJhY2tncm91bmRQcmlvcml0eSkKIHsKIH0KZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL0F1eGlsaWFyeVByb2Nlc3NQcm94eS5oIGIvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvQXV4aWxpYXJ5UHJvY2Vzc1Byb3h5LmgKaW5kZXggODA0MzViMWU2NzdjNjZk N2I3NDY4MmQ0NDUwMjg3YjE0Y2ZlZGJjZC4uYjE2MjBmZWQxYzkyMWU2ZDMyZTRlZDNmNTA3NDcw MGRmYzNhNjVjMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQXV4aWxpYXJ5 UHJvY2Vzc1Byb3h5LmgKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQXV4aWxpYXJ5UHJv Y2Vzc1Byb3h5LmgKQEAgLTQzLDcgKzQzLDcgQEAgY2xhc3MgQXV4aWxpYXJ5UHJvY2Vzc1Byb3h5 IDogcHVibGljIFRocmVhZFNhZmVSZWZDb3VudGVkPEF1eGlsaWFyeVByb2Nlc3NQcm94eSwKICAg ICBXVEZfTUFLRV9OT05DT1BZQUJMRShBdXhpbGlhcnlQcm9jZXNzUHJveHkpOwogCiBwcm90ZWN0 ZWQ6Ci0gICAgZXhwbGljaXQgQXV4aWxpYXJ5UHJvY2Vzc1Byb3h5KGJvb2wgYWx3YXlzUnVuc0F0 QmFja2dyb3VuZFByaW9yaXR5ID0gZmFsc2UpOworICAgIEF1eGlsaWFyeVByb2Nlc3NQcm94eShi b29sIGFsd2F5c1J1bnNBdEJhY2tncm91bmRQcmlvcml0eSA9IGZhbHNlLCBTZWNvbmRzIHJlc3Bv bnNpdmVuZXNzVGltZW91dCA9IFJlc3BvbnNpdmVuZXNzVGltZXI6OmRlZmF1bHRSZXNwb25zaXZl bmVzc1RpbWVvdXQpOwogCiBwdWJsaWM6CiAgICAgdmlydHVhbCB+QXV4aWxpYXJ5UHJvY2Vzc1By b3h5KCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9OZXR3b3JrL05ldHdv cmtQcm9jZXNzUHJveHkuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvTmV0d29yay9OZXR3 b3JrUHJvY2Vzc1Byb3h5LmNwcAppbmRleCBjNTUzZjljYTcxMjk4Zjg2OTFjYWQwMWQwZjc4YmUz YTcwNjQ4NWRiLi40NDQ1YTdkMGE3NWZmYTQwMzFhN2UzMTk1MmI5ZDljMjRhODUwOTcyIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9OZXR3b3JrL05ldHdvcmtQcm9jZXNzUHJv eHkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL05ldHdvcmsvTmV0d29ya1Byb2Nl c3NQcm94eS5jcHAKQEAgLTg2LDYgKzg2LDggQEAKIG5hbWVzcGFjZSBXZWJLaXQgewogdXNpbmcg bmFtZXNwYWNlIFdlYkNvcmU7CiAKK3N0YXRpYyBjb25zdGV4cHIgU2Vjb25kcyBuZXR3b3JrUHJv Y2Vzc1Jlc3BvbnNpdmVuZXNzVGltZW91dCA9IDZfczsKKwogc3RhdGljIEhhc2hTZXQ8TmV0d29y a1Byb2Nlc3NQcm94eSo+JiBuZXR3b3JrUHJvY2Vzc2VzU2V0KCkKIHsKICAgICBBU1NFUlQoUnVu TG9vcDo6aXNNYWluKCkpOwpAQCAtMjAxLDcgKzIwMyw3IEBAIHN0YXRpYyBib29sIGFueVByb2Nl c3NQb29sU2hvdWxkVGFrZVVJQmFja2dyb3VuZEFzc2VydGlvbigpCiB9CiAKIE5ldHdvcmtQcm9j ZXNzUHJveHk6Ok5ldHdvcmtQcm9jZXNzUHJveHkoKQotICAgIDogQXV4aWxpYXJ5UHJvY2Vzc1By b3h5KGFueVByb2Nlc3NQb29sQWx3YXlzUnVuc0F0QmFja2dyb3VuZFByaW9yaXR5KCkpCisgICAg OiBBdXhpbGlhcnlQcm9jZXNzUHJveHkoYW55UHJvY2Vzc1Bvb2xBbHdheXNSdW5zQXRCYWNrZ3Jv dW5kUHJpb3JpdHkoKSwgbmV0d29ya1Byb2Nlc3NSZXNwb25zaXZlbmVzc1RpbWVvdXQpCiAjaWYg RU5BQkxFKExFR0FDWV9DVVNUT01fUFJPVE9DT0xfTUFOQUdFUikKICAgICAsIG1fY3VzdG9tUHJv dG9jb2xNYW5hZ2VyQ2xpZW50KG1ha2VVbmlxdWVSZWY8TGVnYWN5Q3VzdG9tUHJvdG9jb2xNYW5h Z2VyQ2xpZW50PigpKQogICAgICwgbV9jdXN0b21Qcm90b2NvbE1hbmFnZXJQcm94eSgqdGhpcykK QEAgLTI1NSw4ICsyNTcsNyBAQCB2b2lkIE5ldHdvcmtQcm9jZXNzUHJveHk6OnByb2Nlc3NXaWxs U2h1dERvd24oSVBDOjpDb25uZWN0aW9uJiBjb25uZWN0aW9uKQogdm9pZCBOZXR3b3JrUHJvY2Vz c1Byb3h5OjpnZXROZXR3b3JrUHJvY2Vzc0Nvbm5lY3Rpb24oV2ViUHJvY2Vzc1Byb3h5JiB3ZWJQ cm9jZXNzUHJveHksIE1lc3NhZ2VzOjpXZWJQcm9jZXNzUHJveHk6OkdldE5ldHdvcmtQcm9jZXNz Q29ubmVjdGlvbjo6RGVsYXllZFJlcGx5JiYgcmVwbHkpCiB7CiAgICAgUkVMRUFTRV9MT0coUHJv Y2Vzc1N1c3BlbnNpb24sICIlcCAtIE5ldHdvcmtQcm9jZXNzUHJveHkgaXMgdGFraW5nIGEgYmFj a2dyb3VuZCBhc3NlcnRpb24gYmVjYXVzZSBhIHdlYiBwcm9jZXNzIGlzIHJlcXVlc3RpbmcgYSBj b25uZWN0aW9uIiwgdGhpcyk7Ci0gICAgaWYgKCFpc0xhdW5jaGluZygpKQotICAgICAgICBzdGFy dFJlc3BvbnNpdmVuZXNzVGltZXIoVXNlTGF6eVN0b3A6Ok5vKTsKKyAgICBzdGFydFJlc3BvbnNp dmVuZXNzVGltZXIoVXNlTGF6eVN0b3A6Ok5vKTsKICAgICBzZW5kV2l0aEFzeW5jUmVwbHkoTWVz c2FnZXM6Ok5ldHdvcmtQcm9jZXNzOjpDcmVhdGVOZXR3b3JrQ29ubmVjdGlvblRvV2ViUHJvY2Vz cyB7IHdlYlByb2Nlc3NQcm94eS5jb3JlUHJvY2Vzc0lkZW50aWZpZXIoKSwgd2ViUHJvY2Vzc1By b3h5LnNlc3Npb25JRCgpIH0sIFt0aGlzLCB3ZWFrVGhpcyA9IFdlYWtQdHIgeyAqdGhpcyB9LCBy ZXBseSA9IFdURk1vdmUocmVwbHkpXShhdXRvJiYgaWRlbnRpZmllciwgYXV0byBjb29raWVBY2Nl cHRQb2xpY3kpIG11dGFibGUgewogICAgICAgICBpZiAoIXdlYWtUaGlzKSB7CiAgICAgICAgICAg ICBSRUxFQVNFX0xPR19FUlJPUihQcm9jZXNzLCAiTmV0d29ya1Byb2Nlc3NQcm94eTo6Z2V0TmV0 d29ya1Byb2Nlc3NDb25uZWN0aW9uOiBOZXR3b3JrUHJvY2Vzc1Byb3h5IGRlYWxsb2NhdGVkIGR1 cmluZyBjb25uZWN0aW9uIGVzdGFibGlzaG1lbnQiKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL1Jlc3BvbnNpdmVuZXNzVGltZXIuY3BwIGIvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvUmVzcG9uc2l2ZW5lc3NUaW1lci5jcHAKaW5kZXggMTcxODg4NGU1ZTc4ZTI1MTBjYjEy MmY3MzY5NDNlZjg0ZWUwN2IwNC4uYTM1MmE0ZGMyODVhZDkxZGI5NWQ0ZmI1MWMwMDFhN2UwOWE0 ZWE1ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvUmVzcG9uc2l2ZW5lc3NU aW1lci5jcHAKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvUmVzcG9uc2l2ZW5lc3NUaW1l ci5jcHAKQEAgLTI4LDExICsyOCwxMCBAQAogCiBuYW1lc3BhY2UgV2ViS2l0IHsKIAotc3RhdGlj IGNvbnN0IFNlY29uZHMgcmVzcG9uc2l2ZW5lc3NUaW1lb3V0IHsgM19zIH07Ci0KLVJlc3BvbnNp dmVuZXNzVGltZXI6OlJlc3BvbnNpdmVuZXNzVGltZXIoUmVzcG9uc2l2ZW5lc3NUaW1lcjo6Q2xp ZW50JiBjbGllbnQpCitSZXNwb25zaXZlbmVzc1RpbWVyOjpSZXNwb25zaXZlbmVzc1RpbWVyKFJl c3BvbnNpdmVuZXNzVGltZXI6OkNsaWVudCYgY2xpZW50LCBTZWNvbmRzIHJlc3BvbnNpdmVuZXNz VGltZW91dCkKICAgICA6IG1fY2xpZW50KGNsaWVudCkKICAgICAsIG1fdGltZXIoUnVuTG9vcDo6 bWFpbigpLCB0aGlzLCAmUmVzcG9uc2l2ZW5lc3NUaW1lcjo6dGltZXJGaXJlZCkKKyAgICAsIG1f cmVzcG9uc2l2ZW5lc3NUaW1lb3V0KHJlc3BvbnNpdmVuZXNzVGltZW91dCkKIHsKIH0KIApAQCAt NzIsNyArNzEsNyBAQCB2b2lkIFJlc3BvbnNpdmVuZXNzVGltZXI6OnRpbWVyRmlyZWQoKQogCiAg ICAgaWYgKCFtYXlCZWNvbWVVbnJlc3BvbnNpdmUoKSkgewogICAgICAgICBtX3dhaXRpbmdGb3JU aW1lciA9IHRydWU7Ci0gICAgICAgIG1fdGltZXIuc3RhcnRPbmVTaG90KHJlc3BvbnNpdmVuZXNz VGltZW91dCk7CisgICAgICAgIG1fdGltZXIuc3RhcnRPbmVTaG90KG1fcmVzcG9uc2l2ZW5lc3NU aW1lb3V0KTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIApAQCAtOTcsMTAgKzk2LDEwIEBAIHZv aWQgUmVzcG9uc2l2ZW5lc3NUaW1lcjo6c3RhcnQoKQogICAgICAgICAvLwogICAgICAgICAvLyBJ biBtb3N0IGNhc2VzLCBzdG9wIGlzIGNhbGxlZCBiZWZvcmUgd2UgZ2V0IHRvIHNjaGVkdWxlIHRo ZSBzZWNvbmQgdGltZXIsIHNhdmluZyB1cwogICAgICAgICAvLyB0aGUgc2NoZWR1bGluZyBvZiB0 aGUgdGltZXIgZW50aXJlbHkuCi0gICAgICAgIG1fcmVzdGFydEZpcmVUaW1lID0gTW9ub3Rvbmlj VGltZTo6bm93KCkgKyByZXNwb25zaXZlbmVzc1RpbWVvdXQ7CisgICAgICAgIG1fcmVzdGFydEZp cmVUaW1lID0gTW9ub3RvbmljVGltZTo6bm93KCkgKyBtX3Jlc3BvbnNpdmVuZXNzVGltZW91dDsK ICAgICB9IGVsc2UgewogICAgICAgICBtX3Jlc3RhcnRGaXJlVGltZSA9IE1vbm90b25pY1RpbWUo KTsKLSAgICAgICAgbV90aW1lci5zdGFydE9uZVNob3QocmVzcG9uc2l2ZW5lc3NUaW1lb3V0KTsK KyAgICAgICAgbV90aW1lci5zdGFydE9uZVNob3QobV9yZXNwb25zaXZlbmVzc1RpbWVvdXQpOwog ICAgIH0KIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvUmVzcG9uc2l2 ZW5lc3NUaW1lci5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvUmVzcG9uc2l2ZW5lc3NUaW1l ci5oCmluZGV4IGIxMzU4MTJlNDE5MGNhODZhN2UwMjBjNGQ2MDNhNDJmODgxZDg3OTcuLmFkNTQy MzA1YWIyYzg2MDg1NDY3ZjliNDkwZmI0YzI4MjAyYmI5Y2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL1Jlc3BvbnNpdmVuZXNzVGltZXIuaAorKysgYi9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9SZXNwb25zaXZlbmVzc1RpbWVyLmgKQEAgLTQ3LDcgKzQ3LDggQEAgcHVibGlj OgogICAgICAgICB2aXJ0dWFsIHZvaWQgZGVyZWYoKSA9IDA7CiAgICAgfTsKIAotICAgIGV4cGxp Y2l0IFJlc3BvbnNpdmVuZXNzVGltZXIoUmVzcG9uc2l2ZW5lc3NUaW1lcjo6Q2xpZW50Jik7Cisg ICAgc3RhdGljIGNvbnN0ZXhwciBTZWNvbmRzIGRlZmF1bHRSZXNwb25zaXZlbmVzc1RpbWVvdXQg PSAzX3M7CisgICAgUmVzcG9uc2l2ZW5lc3NUaW1lcihSZXNwb25zaXZlbmVzc1RpbWVyOjpDbGll bnQmLCBTZWNvbmRzIHJlc3BvbnNpdmVuZXNzVGltZW91dCk7CiAgICAgflJlc3BvbnNpdmVuZXNz VGltZXIoKTsKIAogICAgIHZvaWQgc3RhcnQoKTsKQEAgLTg3LDYgKzg4LDcgQEAgcHJpdmF0ZToK ICAgICBib29sIG1faXNSZXNwb25zaXZlIHsgdHJ1ZSB9OwogICAgIGJvb2wgbV93YWl0aW5nRm9y VGltZXIgeyBmYWxzZSB9OwogICAgIGJvb2wgbV91c2VMYXp5U3RvcCB7IGZhbHNlIH07CisgICAg U2Vjb25kcyBtX3Jlc3BvbnNpdmVuZXNzVGltZW91dDsKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdl YktpdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2Vic2l0ZURhdGEvV2Vi c2l0ZURhdGFTdG9yZS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJzaXRlRGF0YS9X ZWJzaXRlRGF0YVN0b3JlLmNwcAppbmRleCA5NjcwNTE1MzQ3YTU0YzA2YWQ0ZTcyNGYwZGU2Njll MTIzMmJkMDg4Li4zYmQ0OGJiNWYzMGU5M2VjZjgwZDNmNzgzYWRiMmI4Mzk3NDkwYjJhIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJzaXRlRGF0YS9XZWJzaXRlRGF0YVN0 b3JlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJzaXRlRGF0YS9XZWJzaXRl RGF0YVN0b3JlLmNwcApAQCAtMTU2Nyw0MyArMTU2NywyNSBAQCB2b2lkIFdlYnNpdGVEYXRhU3Rv cmU6OmdldE5ldHdvcmtQcm9jZXNzQ29ubmVjdGlvbihXZWJQcm9jZXNzUHJveHkmIHdlYlByb2Nl c3NQcgogICAgIGF1dG8mIG5ldHdvcmtQcm9jZXNzUHJveHkgPSBuZXR3b3JrUHJvY2VzcygpOwog ICAgIG5ldHdvcmtQcm9jZXNzUHJveHkuZ2V0TmV0d29ya1Byb2Nlc3NDb25uZWN0aW9uKHdlYlBy b2Nlc3NQcm94eSwgW3dlYWtUaGlzID0gV2Vha1B0ciB7ICp0aGlzIH0sIG5ldHdvcmtQcm9jZXNz UHJveHkgPSBXZWFrUHRyIHsgbmV0d29ya1Byb2Nlc3NQcm94eSB9LCB3ZWJQcm9jZXNzUHJveHkg PSBXZWFrUHRyIHsgd2ViUHJvY2Vzc1Byb3h5IH0sIHJlcGx5ID0gV1RGTW92ZShyZXBseSksIHNo b3VsZFJldHJ5T25GYWlsdXJlXSAoYXV0byYgY29ubmVjdGlvbkluZm8pIG11dGFibGUgewogICAg ICAgICBpZiAoVU5MSUtFTFkoIUlQQzo6Q29ubmVjdGlvbjo6aWRlbnRpZmllcklzVmFsaWQoY29u bmVjdGlvbkluZm8uaWRlbnRpZmllcigpKSkpIHsKLSAgICAgICAgICAgIGF1dG8gbG9nRXJyb3Ig PSBbbmV0d29ya1Byb2Nlc3NQcm94eSwgd2ViUHJvY2Vzc1Byb3h5XSgpIHsKLSNpZiBPUyhEQVJX SU4pCi0gICAgICAgICAgICAgICAgaWYgKCFvc192YXJpYW50X2FsbG93c19pbnRlcm5hbF9zZWN1 cml0eV9wb2xpY2llcygiY29tLmFwcGxlLldlYktpdCIpKQotICAgICAgICAgICAgICAgICAgICBy ZXR1cm47Ci0KLSAgICAgICAgICAgICAgICBpZiAoIXdlYlByb2Nlc3NQcm94eSkKLSAgICAgICAg ICAgICAgICAgICAgcmV0dXJuOwotCi0gICAgICAgICAgICAgICAgaW50IG5ldHdvcmtQcm9jZXNz SWRlbnRpZmllciA9IDA7Ci0gICAgICAgICAgICAgICAgU3RyaW5nIG5ldHdvcmtQcm9jZXNzU3Rh dGUgPSAiVW5rbm93biJfczsKLSAgICAgICAgICAgICAgICBpZiAobmV0d29ya1Byb2Nlc3NQcm94 eSkgewotICAgICAgICAgICAgICAgICAgICBuZXR3b3JrUHJvY2Vzc0lkZW50aWZpZXIgPSBuZXR3 b3JrUHJvY2Vzc1Byb3h5LT5wcm9jZXNzSWRlbnRpZmllcigpOwotICAgICAgICAgICAgICAgICAg ICBuZXR3b3JrUHJvY2Vzc1N0YXRlID0gbmV0d29ya1Byb2Nlc3NQcm94eS0+c3RhdGVTdHJpbmco KTsKLSAgICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICAgICAgUkVMRUFTRV9MT0dfRVJST1Io UHJvY2VzcywgIldlYnNpdGVEYXRhU3RvcmU6OmdldE5ldHdvcmtQcm9jZXNzQ29ubmVjdGlvbjog RmFpbGVkIHRvIGdldCBjb25uZWN0aW9uIC0gbmV0d29ya1Byb2Nlc3NQcm94eT0lcCwgbmV0d29y a1Byb2Nlc3NJZGVudGlmaWVyPSVkLCBwcm9jZXNzU3RhdGU9JXMsIHdlYlByb2Nlc3NQcm94eT0l cCwgd2ViUHJvY2Vzc0lkZW50aWZpZXI9JWQiLCBuZXR3b3JrUHJvY2Vzc1Byb3h5LmdldCgpLCBu ZXR3b3JrUHJvY2Vzc0lkZW50aWZpZXIsIG5ldHdvcmtQcm9jZXNzU3RhdGUudXRmOCgpLmRhdGEo KSwgd2ViUHJvY2Vzc1Byb3h5LmdldCgpLCB3ZWJQcm9jZXNzUHJveHktPnByb2Nlc3NJZGVudGlm aWVyKCkpOwotICAgICAgICAgICAgICAgIFJFTEVBU0VfQVNTRVJUX05PVF9SRUFDSEVEKCk7Ci0j ZW5kaWYKLSAgICAgICAgICAgIH07Ci0KICAgICAgICAgICAgIGlmIChzaG91bGRSZXRyeU9uRmFp bHVyZSA9PSBTaG91bGRSZXRyeU9uRmFpbHVyZTo6Tm8gfHwgIXdlYlByb2Nlc3NQcm94eSkgewot ICAgICAgICAgICAgICAgIGxvZ0Vycm9yKCk7CisgICAgICAgICAgICAgICAgUkVMRUFTRV9MT0df RVJST1IoUHJvY2VzcywgImdldE5ldHdvcmtQcm9jZXNzQ29ubmVjdGlvbjogRmFpbGVkIHRvIGdl dCBjb25uZWN0aW9uIHRvIG5ldHdvcmsgcHJvY2Vzcywgd2lsbCByZXBseSBpbnZhbGlkIGlkZW50 aWZpZXIgLi4uIik7CiAgICAgICAgICAgICAgICAgcmVwbHkoeyB9KTsKICAgICAgICAgICAgICAg ICByZXR1cm47CiAgICAgICAgICAgICB9CiAKICAgICAgICAgICAgIC8vIFJldHJ5IG9uIHRoZSBu ZXh0IFJ1bkxvb3AgaXRlcmF0aW9uIGJlY2F1c2Ugd2UgbWF5IGJlIGluc2lkZSB0aGUgV2Vic2l0 ZURhdGFTdG9yZSBkZXN0cnVjdG9yLgotICAgICAgICAgICAgUnVuTG9vcDo6bWFpbigpLmRpc3Bh dGNoKFt3ZWFrVGhpcyA9IFdURk1vdmUod2Vha1RoaXMpLCBuZXR3b3JrUHJvY2Vzc1Byb3h5ID0g V1RGTW92ZShuZXR3b3JrUHJvY2Vzc1Byb3h5KSwgd2ViUHJvY2Vzc1Byb3h5ID0gV1RGTW92ZSh3 ZWJQcm9jZXNzUHJveHkpLCByZXBseSA9IFdURk1vdmUocmVwbHkpLCBsb2dFcnJvciA9IFdURk1v dmUobG9nRXJyb3IpXSAoKSBtdXRhYmxlIHsKKyAgICAgICAgICAgIFJ1bkxvb3A6Om1haW4oKS5k aXNwYXRjaChbd2Vha1RoaXMgPSBXVEZNb3ZlKHdlYWtUaGlzKSwgbmV0d29ya1Byb2Nlc3NQcm94 eSA9IFdURk1vdmUobmV0d29ya1Byb2Nlc3NQcm94eSksIHdlYlByb2Nlc3NQcm94eSA9IFdURk1v dmUod2ViUHJvY2Vzc1Byb3h5KSwgcmVwbHkgPSBXVEZNb3ZlKHJlcGx5KV0gKCkgbXV0YWJsZSB7 CiAgICAgICAgICAgICAgICAgaWYgKFJlZlB0cjxXZWJzaXRlRGF0YVN0b3JlPiBzdHJvbmdUaGlz ID0gd2Vha1RoaXMuZ2V0KCk7IHN0cm9uZ1RoaXMgJiYgd2ViUHJvY2Vzc1Byb3h5KSB7CiAgICAg ICAgICAgICAgICAgICAgIC8vIFRlcm1pbmF0ZSBpZiBpdCBpcyB0aGUgc2FtZSBuZXR3b3JrIHBy b2Nlc3MuCiAgICAgICAgICAgICAgICAgICAgIGlmIChuZXR3b3JrUHJvY2Vzc1Byb3h5ICYmIHN0 cm9uZ1RoaXMtPm1fbmV0d29ya1Byb2Nlc3MgPT0gbmV0d29ya1Byb2Nlc3NQcm94eS5nZXQoKSkK ICAgICAgICAgICAgICAgICAgICAgICAgIHN0cm9uZ1RoaXMtPnRlcm1pbmF0ZU5ldHdvcmtQcm9j ZXNzKCk7CiAgICAgICAgICAgICAgICAgICAgIFJFTEVBU0VfTE9HX0VSUk9SKFByb2Nlc3MsICJn ZXROZXR3b3JrUHJvY2Vzc0Nvbm5lY3Rpb246IEZhaWxlZCB0byBnZXQgY29ubmVjdGlvbiB0byBu ZXR3b3JrIHByb2Nlc3MsIHdpbGwgcmV0cnkgLi4uIik7CiAgICAgICAgICAgICAgICAgICAgIHN0 cm9uZ1RoaXMtPmdldE5ldHdvcmtQcm9jZXNzQ29ubmVjdGlvbigqd2ViUHJvY2Vzc1Byb3h5LCBX VEZNb3ZlKHJlcGx5KSwgU2hvdWxkUmV0cnlPbkZhaWx1cmU6Ok5vKTsKLSAgICAgICAgICAgICAg ICB9IGVsc2UgewotICAgICAgICAgICAgICAgICAgICBsb2dFcnJvcigpOwotICAgICAgICAgICAg ICAgICAgICByZXBseSh7IH0pOworICAgICAgICAgICAgICAgICAgICByZXR1cm47CiAgICAgICAg ICAgICAgICAgfQorCisgICAgICAgICAgICAgICAgUkVMRUFTRV9MT0dfRVJST1IoUHJvY2Vzcywg ImdldE5ldHdvcmtQcm9jZXNzQ29ubmVjdGlvbjogRmFpbGVkIHRvIGdldCBjb25uZWN0aW9uIHRv IG5ldHdvcmsgcHJvY2Vzcywgd2lsbCByZXBseSBpbnZhbGlkIGlkZW50aWZpZXIgLi4uIik7Cisg ICAgICAgICAgICAgICAgcmVwbHkoeyB9KTsKICAgICAgICAgICAgIH0pOwogICAgICAgICAgICAg cmV0dXJuOwogICAgICAgICB9Cg==