237156 2022-02-24 13:33:42 -0800 Take down shared worker context connection less aggressively when it becomes idle 2022-02-24 16:55:18 -0800 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 cdumez cdumez achristensen darin ggaren kkinnunen webkit-bug-importer youennf oldest_to_newest 1845743 0 cdumez 2022-02-24 13:33:42 -0800 Take down shared worker context connection less aggressively when it becomes idle. Give it 5 seconds before shutting it down in case it ends up being used again in the near future. This is similar to what we do for service workers. 1845744 1 453135 cdumez 2022-02-24 13:36:02 -0800 Created attachment 453135 Patch 1845837 2 453135 darin 2022-02-24 16:50:06 -0800 Comment on attachment 453135 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=453135&action=review > Source/WebKit/NetworkProcess/SharedWorker/WebSharedWorkerServerToContextConnection.cpp:146 > + // Terminate context connection after a little while if it is no longer used by any SharedWorker objects. If I was doing this change, I’d put this comment on the constant rather than the code that uses it. Not sure that’s better, though. 1845839 3 cdumez 2022-02-24 16:54:11 -0800 Committed r290477 (247775@trunk): <https://commits.webkit.org/247775@trunk> 1845841 4 webkit-bug-importer 2022-02-24 16:55:18 -0800 <rdar://problem/89447191> 453135 2022-02-24 13:36:02 -0800 2022-02-24 16:50:06 -0800 Patch bug-237156-20220224133601.patch text/plain 8785 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjkwNDUwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDUzM2YyNTYxYTU4ZDFlNTFm NjgwMThhMGFlMDJkYzVjNDY5ZGQ0OWMuLmQyYWFlODIwMjllMDg5MmQwZDdlNWFmYWViMTgxYzli ZmI4Y2Y5MDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQgQEAKKzIwMjItMDItMjQgIENocmlzIER1 bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBUYWtlIGRvd24gc2hhcmVkIHdvcmtl ciBjb250ZXh0IGNvbm5lY3Rpb24gbGVzcyBhZ2dyZXNzaXZlbHkgd2hlbiBpdCBiZWNvbWVzIGlk bGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNzE1 NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRha2Ug ZG93biBzaGFyZWQgd29ya2VyIGNvbnRleHQgY29ubmVjdGlvbiBsZXNzIGFnZ3Jlc3NpdmVseSB3 aGVuIGl0IGJlY29tZXMgaWRsZS4gR2l2ZSBpdCA1CisgICAgICAgIHNlY29uZHMgYmVmb3JlIHNo dXR0aW5nIGl0IGRvd24gaW4gY2FzZSBpdCBlbmRzIHVwIGJlaW5nIHVzZWQgYWdhaW4gaW4gdGhl IG5lYXIgZnV0dXJlLgorCisgICAgICAgIFRoaXMgaXMgc2ltaWxhciB0byB3aGF0IHdlIGRvIGZv ciBzZXJ2aWNlIHdvcmtlcnMuCisKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9TaGFyZWRXb3Jr ZXIvV2ViU2hhcmVkV29ya2VyU2VydmVyLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViU2hhcmVk V29ya2VyU2VydmVyOjpzaHV0RG93blNoYXJlZFdvcmtlcik6CisgICAgICAgICogTmV0d29ya1By b2Nlc3MvU2hhcmVkV29ya2VyL1dlYlNoYXJlZFdvcmtlclNlcnZlclRvQ29udGV4dENvbm5lY3Rp b24uY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJTaGFyZWRXb3JrZXJTZXJ2ZXJUb0NvbnRleHRD b25uZWN0aW9uOjpXZWJTaGFyZWRXb3JrZXJTZXJ2ZXJUb0NvbnRleHRDb25uZWN0aW9uKToKKyAg ICAgICAgKFdlYktpdDo6V2ViU2hhcmVkV29ya2VyU2VydmVyVG9Db250ZXh0Q29ubmVjdGlvbjo6 YWRkU2hhcmVkV29ya2VyT2JqZWN0KToKKyAgICAgICAgKFdlYktpdDo6V2ViU2hhcmVkV29ya2Vy U2VydmVyVG9Db250ZXh0Q29ubmVjdGlvbjo6cmVtb3ZlU2hhcmVkV29ya2VyT2JqZWN0KToKKyAg ICAgICAgKFdlYktpdDo6V2ViU2hhcmVkV29ya2VyU2VydmVyVG9Db250ZXh0Q29ubmVjdGlvbjo6 aWRsZVRlcm1pbmF0aW9uVGltZXJGaXJlZCk6CisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvU2hh cmVkV29ya2VyL1dlYlNoYXJlZFdvcmtlclNlcnZlclRvQ29udGV4dENvbm5lY3Rpb24uaDoKKwog MjAyMi0wMi0yNCAgRGV2aW4gUm91c3NvICA8ZHJvdXNzb0BhcHBsZS5jb20+CiAKICAgICAgICAg UkVHUkVTU0lPTihyMjkwNDM2KTogZml4IGJ1aWxkIGZhaWx1cmVzCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL1NoYXJlZFdvcmtlci9XZWJTaGFyZWRXb3JrZXJTZXJ2 ZXIuY3BwIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9TaGFyZWRXb3JrZXIvV2ViU2hh cmVkV29ya2VyU2VydmVyLmNwcAppbmRleCAyNjA3ZjcwY2MyOWM1N2IzYjc3ZTNhOWNlN2RmMzUz YjJmYjA1MzhmLi40NWU2OTdiYTU0NzhkOGI1MDJmY2U1ZDA0ODAwMGI3YjRhZGM4YWExIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL1NoYXJlZFdvcmtlci9XZWJTaGFy ZWRXb3JrZXJTZXJ2ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvU2hh cmVkV29ya2VyL1dlYlNoYXJlZFdvcmtlclNlcnZlci5jcHAKQEAgLTIxMiwxNCArMjEyLDggQEAg dm9pZCBXZWJTaGFyZWRXb3JrZXJTZXJ2ZXI6OnNodXREb3duU2hhcmVkV29ya2VyKGNvbnN0IFdl YkNvcmU6OlNoYXJlZFdvcmtlcktleSYKICAgICBpZiAoIXNoYXJlZFdvcmtlcikKICAgICAgICAg cmV0dXJuOwogCi0gICAgYXV0byogY29udGV4dENvbm5lY3Rpb24gPSBzaGFyZWRXb3JrZXItPmNv bnRleHRDb25uZWN0aW9uKCk7Ci0gICAgaWYgKCFjb250ZXh0Q29ubmVjdGlvbikKLSAgICAgICAg cmV0dXJuOwotCi0gICAgY29udGV4dENvbm5lY3Rpb24tPnRlcm1pbmF0ZVNoYXJlZFdvcmtlcigq c2hhcmVkV29ya2VyKTsKLQotICAgIGlmIChjb250ZXh0Q29ubmVjdGlvbi0+c2hhcmVkV29ya2Vy T2JqZWN0cygpLmlzRW1wdHkoKSkKLSAgICAgICAgY29udGV4dENvbm5lY3Rpb24tPmNvbm5lY3Rp b25Jc05vTG9uZ2VyTmVlZGVkKCk7CisgICAgaWYgKGF1dG8qIGNvbnRleHRDb25uZWN0aW9uID0g c2hhcmVkV29ya2VyLT5jb250ZXh0Q29ubmVjdGlvbigpKQorICAgICAgICBjb250ZXh0Q29ubmVj dGlvbi0+dGVybWluYXRlU2hhcmVkV29ya2VyKCpzaGFyZWRXb3JrZXIpOwogfQogCiB2b2lkIFdl YlNoYXJlZFdvcmtlclNlcnZlcjo6YWRkQ29ubmVjdGlvbihzdGQ6OnVuaXF1ZV9wdHI8V2ViU2hh cmVkV29ya2VyU2VydmVyQ29ubmVjdGlvbj4mJiBjb25uZWN0aW9uKQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9TaGFyZWRXb3JrZXIvV2ViU2hhcmVkV29ya2VyU2Vy dmVyVG9Db250ZXh0Q29ubmVjdGlvbi5jcHAgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNz L1NoYXJlZFdvcmtlci9XZWJTaGFyZWRXb3JrZXJTZXJ2ZXJUb0NvbnRleHRDb25uZWN0aW9uLmNw cAppbmRleCA4OTNiODY4OTgyYjMxOTY5ZmMxMWFjYjU3YjA0NTU1NzFlMjg5NmM1Li4xZjNmMTNi Nzc3NThkZDMwMjY4NWYwNDc4Mjk0YmY3YTU1OTFmYTc4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L05ldHdvcmtQcm9jZXNzL1NoYXJlZFdvcmtlci9XZWJTaGFyZWRXb3JrZXJTZXJ2ZXJUb0Nv bnRleHRDb25uZWN0aW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL1No YXJlZFdvcmtlci9XZWJTaGFyZWRXb3JrZXJTZXJ2ZXJUb0NvbnRleHRDb25uZWN0aW9uLmNwcApA QCAtMzUsMTUgKzM1LDE5IEBACiAjaW5jbHVkZSAiV2ViU2hhcmVkV29ya2VyLmgiCiAjaW5jbHVk ZSAiV2ViU2hhcmVkV29ya2VyQ29udGV4dE1hbmFnZXJDb25uZWN0aW9uTWVzc2FnZXMuaCIKICNp bmNsdWRlICJXZWJTaGFyZWRXb3JrZXJTZXJ2ZXIuaCIKKyNpbmNsdWRlIDx3dGYvTWVtb3J5UHJl c3N1cmVIYW5kbGVyLmg+CiAKIG5hbWVzcGFjZSBXZWJLaXQgewogCiAjZGVmaW5lIENPTlRFWFRf Q09OTkVDVElPTl9SRUxFQVNFX0xPRyhmbXQsIC4uLikgUkVMRUFTRV9MT0coU2hhcmVkV29ya2Vy LCAiJXAgLSBbd2ViUHJvY2Vzc0lkZW50aWZpZXI9JSIgUFJJdTY0ICJdIFdlYlNoYXJlZFdvcmtl clNlcnZlclRvQ29udGV4dENvbm5lY3Rpb246OiIgZm10LCB0aGlzLCB3ZWJQcm9jZXNzSWRlbnRp ZmllcigpLnRvVUludDY0KCksICMjX19WQV9BUkdTX18pCiAKK2NvbnN0ZXhwciBTZWNvbmRzIGlk bGVUZXJtaW5hdGlvbkRlbGF5IHsgNV9zIH07CisKIFdlYlNoYXJlZFdvcmtlclNlcnZlclRvQ29u dGV4dENvbm5lY3Rpb246OldlYlNoYXJlZFdvcmtlclNlcnZlclRvQ29udGV4dENvbm5lY3Rpb24o TmV0d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nlc3MmIGNvbm5lY3Rpb24sIGNvbnN0IFdlYkNvcmU6 OlJlZ2lzdHJhYmxlRG9tYWluJiByZWdpc3RyYWJsZURvbWFpbiwgV2ViU2hhcmVkV29ya2VyU2Vy dmVyJiBzZXJ2ZXIpCiAgICAgOiBtX2Nvbm5lY3Rpb24oY29ubmVjdGlvbikKICAgICAsIG1fc2Vy dmVyKHNlcnZlcikKICAgICAsIG1fcmVnaXN0cmFibGVEb21haW4ocmVnaXN0cmFibGVEb21haW4p CisgICAgLCBtX2lkbGVUZXJtaW5hdGlvblRpbWVyKCp0aGlzLCAmV2ViU2hhcmVkV29ya2VyU2Vy dmVyVG9Db250ZXh0Q29ubmVjdGlvbjo6aWRsZVRlcm1pbmF0aW9uVGltZXJGaXJlZCkKIHsKICAg ICBDT05URVhUX0NPTk5FQ1RJT05fUkVMRUFTRV9MT0coIldlYlNoYXJlZFdvcmtlclNlcnZlclRv Q29udGV4dENvbm5lY3Rpb246Iik7CiAgICAgc2VydmVyLmFkZENvbnRleHRDb25uZWN0aW9uKCp0 aGlzKTsKQEAgLTExMywxNiArMTE3LDIyIEBAIHZvaWQgV2ViU2hhcmVkV29ya2VyU2VydmVyVG9D b250ZXh0Q29ubmVjdGlvbjo6dGVybWluYXRlU2hhcmVkV29ya2VyKGNvbnN0IFdlYlNoCiAKIHZv aWQgV2ViU2hhcmVkV29ya2VyU2VydmVyVG9Db250ZXh0Q29ubmVjdGlvbjo6YWRkU2hhcmVkV29y a2VyT2JqZWN0KFdlYkNvcmU6OlNoYXJlZFdvcmtlck9iamVjdElkZW50aWZpZXIgc2hhcmVkV29y a2VyT2JqZWN0SWRlbnRpZmllcikKIHsKKyAgICBDT05URVhUX0NPTk5FQ1RJT05fUkVMRUFTRV9M T0coImFkZFNoYXJlZFdvcmtlck9iamVjdDogc2hhcmVkV29ya2VyT2JqZWN0SWRlbnRpZmllcj0l e3B1YmxpY31zIiwgc2hhcmVkV29ya2VyT2JqZWN0SWRlbnRpZmllci50b1N0cmluZygpLnV0Zjgo KS5kYXRhKCkpOwogICAgIGF1dG8mIHNoYXJlZFdvcmtlck9iamVjdHMgPSBtX3NoYXJlZFdvcmtl ck9iamVjdHMuZW5zdXJlKHNoYXJlZFdvcmtlck9iamVjdElkZW50aWZpZXIucHJvY2Vzc0lkZW50 aWZpZXIoKSwgW10geyByZXR1cm4gSGFzaFNldDxXZWJDb3JlOjpTaGFyZWRXb3JrZXJPYmplY3RJ ZGVudGlmaWVyPiB7IH07IH0pLml0ZXJhdG9yLT52YWx1ZTsKKyAgICBBU1NFUlQoIXNoYXJlZFdv cmtlck9iamVjdHMuY29udGFpbnMoc2hhcmVkV29ya2VyT2JqZWN0SWRlbnRpZmllcikpOwogICAg IHNoYXJlZFdvcmtlck9iamVjdHMuYWRkKHNoYXJlZFdvcmtlck9iamVjdElkZW50aWZpZXIpOwog CiAgICAgaWYgKHdlYlByb2Nlc3NJZGVudGlmaWVyKCkgIT0gc2hhcmVkV29ya2VyT2JqZWN0SWRl bnRpZmllci5wcm9jZXNzSWRlbnRpZmllcigpICYmIHNoYXJlZFdvcmtlck9iamVjdHMuc2l6ZSgp ID09IDEpCiAgICAgICAgIG1fY29ubmVjdGlvbi5uZXR3b3JrUHJvY2VzcygpLnNlbmQoTWVzc2Fn ZXM6Ok5ldHdvcmtQcm9jZXNzUHJveHk6OlJlZ2lzdGVyUmVtb3RlV29ya2VyQ2xpZW50UHJvY2Vz cyB7IFJlbW90ZVdvcmtlclR5cGU6OlNoYXJlZFdvcmtlciwgc2hhcmVkV29ya2VyT2JqZWN0SWRl bnRpZmllci5wcm9jZXNzSWRlbnRpZmllcigpLCB3ZWJQcm9jZXNzSWRlbnRpZmllcigpIH0sIDAp OworCisgICAgbV9pZGxlVGVybWluYXRpb25UaW1lci5zdG9wKCk7CiB9CiAKIHZvaWQgV2ViU2hh cmVkV29ya2VyU2VydmVyVG9Db250ZXh0Q29ubmVjdGlvbjo6cmVtb3ZlU2hhcmVkV29ya2VyT2Jq ZWN0KFdlYkNvcmU6OlNoYXJlZFdvcmtlck9iamVjdElkZW50aWZpZXIgc2hhcmVkV29ya2VyT2Jq ZWN0SWRlbnRpZmllcikKIHsKKyAgICBDT05URVhUX0NPTk5FQ1RJT05fUkVMRUFTRV9MT0coInJl bW92ZVNoYXJlZFdvcmtlck9iamVjdDogc2hhcmVkV29ya2VyT2JqZWN0SWRlbnRpZmllcj0le3B1 YmxpY31zIiwgc2hhcmVkV29ya2VyT2JqZWN0SWRlbnRpZmllci50b1N0cmluZygpLnV0ZjgoKS5k YXRhKCkpOwogICAgIGF1dG8gaXQgPSBtX3NoYXJlZFdvcmtlck9iamVjdHMuZmluZChzaGFyZWRX b3JrZXJPYmplY3RJZGVudGlmaWVyLnByb2Nlc3NJZGVudGlmaWVyKCkpOworICAgIEFTU0VSVChp dCAhPSBtX3NoYXJlZFdvcmtlck9iamVjdHMuZW5kKCkpOwogICAgIGlmIChpdCA9PSBtX3NoYXJl ZFdvcmtlck9iamVjdHMuZW5kKCkpCiAgICAgICAgIHJldHVybjsKICAgICBpdC0+dmFsdWUucmVt b3ZlKHNoYXJlZFdvcmtlck9iamVjdElkZW50aWZpZXIpOwpAQCAtMTMyLDYgKzE0MiwxOSBAQCB2 b2lkIFdlYlNoYXJlZFdvcmtlclNlcnZlclRvQ29udGV4dENvbm5lY3Rpb246OnJlbW92ZVNoYXJl ZFdvcmtlck9iamVjdChXZWJDb3JlOgogICAgIG1fc2hhcmVkV29ya2VyT2JqZWN0cy5yZW1vdmUo aXQpOwogICAgIGlmICh3ZWJQcm9jZXNzSWRlbnRpZmllcigpICE9IHNoYXJlZFdvcmtlck9iamVj dElkZW50aWZpZXIucHJvY2Vzc0lkZW50aWZpZXIoKSkKICAgICAgICAgbV9jb25uZWN0aW9uLm5l dHdvcmtQcm9jZXNzKCkuc2VuZChNZXNzYWdlczo6TmV0d29ya1Byb2Nlc3NQcm94eTo6VW5yZWdp c3RlclJlbW90ZVdvcmtlckNsaWVudFByb2Nlc3MgeyBSZW1vdGVXb3JrZXJUeXBlOjpTaGFyZWRX b3JrZXIsIHNoYXJlZFdvcmtlck9iamVjdElkZW50aWZpZXIucHJvY2Vzc0lkZW50aWZpZXIoKSwg d2ViUHJvY2Vzc0lkZW50aWZpZXIoKSB9LCAwKTsKKworICAgIC8vIFRlcm1pbmF0ZSBjb250ZXh0 IGNvbm5lY3Rpb24gYWZ0ZXIgYSBsaXR0bGUgd2hpbGUgaWYgaXQgaXMgbm8gbG9uZ2VyIHVzZWQg YnkgYW55IFNoYXJlZFdvcmtlciBvYmplY3RzLgorICAgIGlmIChtX3NoYXJlZFdvcmtlck9iamVj dHMuaXNFbXB0eSgpKSB7CisgICAgICAgIENPTlRFWFRfQ09OTkVDVElPTl9SRUxFQVNFX0xPRygi cmVtb3ZlU2hhcmVkV29ya2VyT2JqZWN0OiBjb25uZWN0aW9uIGlzIG5vdyBpZGxlLCBzdGFydGlu ZyBhIHRpbWVyIHRvIHRlcm1pbmF0ZSBpdCIpOworICAgICAgICBBU1NFUlQoIW1faWRsZVRlcm1p bmF0aW9uVGltZXIuaXNBY3RpdmUoKSk7CisgICAgICAgIG1faWRsZVRlcm1pbmF0aW9uVGltZXIu c3RhcnRPbmVTaG90KE1lbW9yeVByZXNzdXJlSGFuZGxlcjo6c2luZ2xldG9uKCkuaXNVbmRlck1l bW9yeVByZXNzdXJlKCkgPyAwX3MgOiBpZGxlVGVybWluYXRpb25EZWxheSk7CisgICAgfQorfQor Cit2b2lkIFdlYlNoYXJlZFdvcmtlclNlcnZlclRvQ29udGV4dENvbm5lY3Rpb246OmlkbGVUZXJt aW5hdGlvblRpbWVyRmlyZWQoKQoreworICAgIFJFTEVBU0VfQVNTRVJUKG1fc2hhcmVkV29ya2Vy T2JqZWN0cy5pc0VtcHR5KCkpOworICAgIGNvbm5lY3Rpb25Jc05vTG9uZ2VyTmVlZGVkKCk7CiB9 CiAKICN1bmRlZiBDT05URVhUX0NPTk5FQ1RJT05fUkVMRUFTRV9MT0cKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvU2hhcmVkV29ya2VyL1dlYlNoYXJlZFdvcmtlclNl cnZlclRvQ29udGV4dENvbm5lY3Rpb24uaCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mv U2hhcmVkV29ya2VyL1dlYlNoYXJlZFdvcmtlclNlcnZlclRvQ29udGV4dENvbm5lY3Rpb24uaApp bmRleCA4NDE4NzM1NzVjOTMwNzNmOThmYmFjOGUyM2RkNzRmZDU3OWE0ZjRhLi4yYWE1NDM5MDNh Y2I1NGM5NzRhYzI4MzJjMDc1NzJkNDk5MzUwZjM5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L05ldHdvcmtQcm9jZXNzL1NoYXJlZFdvcmtlci9XZWJTaGFyZWRXb3JrZXJTZXJ2ZXJUb0NvbnRl eHRDb25uZWN0aW9uLmgKKysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9TaGFyZWRX b3JrZXIvV2ViU2hhcmVkV29ya2VyU2VydmVyVG9Db250ZXh0Q29ubmVjdGlvbi5oCkBAIC0zMSw2 ICszMSw3IEBACiAjaW5jbHVkZSA8V2ViQ29yZS9SZWdpc3RyYWJsZURvbWFpbi5oPgogI2luY2x1 ZGUgPFdlYkNvcmUvU2hhcmVkV29ya2VySWRlbnRpZmllci5oPgogI2luY2x1ZGUgPFdlYkNvcmUv U2hhcmVkV29ya2VyT2JqZWN0SWRlbnRpZmllci5oPgorI2luY2x1ZGUgPFdlYkNvcmUvVGltZXIu aD4KICNpbmNsdWRlIDxXZWJDb3JlL1RyYW5zZmVycmVkTWVzc2FnZVBvcnQuaD4KIAogbmFtZXNw YWNlIFdlYkNvcmUgewpAQCAtNjEsNyArNjIsNiBAQCBwdWJsaWM6CiAgICAgdm9pZCBwb3N0Q29u bmVjdEV2ZW50KGNvbnN0IFdlYlNoYXJlZFdvcmtlciYsIGNvbnN0IFdlYkNvcmU6OlRyYW5zZmVy cmVkTWVzc2FnZVBvcnQmKTsKICAgICB2b2lkIHRlcm1pbmF0ZVNoYXJlZFdvcmtlcihjb25zdCBX ZWJTaGFyZWRXb3JrZXImKTsKIAotICAgIHZvaWQgY29ubmVjdGlvbklzTm9Mb25nZXJOZWVkZWQo KTsKICAgICBjb25zdCBIYXNoTWFwPFdlYkNvcmU6OlByb2Nlc3NJZGVudGlmaWVyLCBIYXNoU2V0 PFdlYkNvcmU6OlNoYXJlZFdvcmtlck9iamVjdElkZW50aWZpZXI+PiYgc2hhcmVkV29ya2VyT2Jq ZWN0cygpIGNvbnN0IHsgcmV0dXJuIG1fc2hhcmVkV29ya2VyT2JqZWN0czsgfQogCiAgICAgdm9p ZCBkaWRSZWNlaXZlTWVzc2FnZShJUEM6OkNvbm5lY3Rpb24mLCBJUEM6OkRlY29kZXImKSBmaW5h bDsKQEAgLTcwLDYgKzcwLDkgQEAgcHVibGljOgogICAgIHZvaWQgcmVtb3ZlU2hhcmVkV29ya2Vy T2JqZWN0KFdlYkNvcmU6OlNoYXJlZFdvcmtlck9iamVjdElkZW50aWZpZXIpOwogCiBwcml2YXRl OgorICAgIHZvaWQgaWRsZVRlcm1pbmF0aW9uVGltZXJGaXJlZCgpOworICAgIHZvaWQgY29ubmVj dGlvbklzTm9Mb25nZXJOZWVkZWQoKTsKKwogICAgIC8vIElQQyBtZXNzYWdlcy4KICAgICB2b2lk IHBvc3RFeGNlcHRpb25Ub1dvcmtlck9iamVjdChXZWJDb3JlOjpTaGFyZWRXb3JrZXJJZGVudGlm aWVyLCBjb25zdCBTdHJpbmcmIGVycm9yTWVzc2FnZSwgaW50IGxpbmVOdW1iZXIsIGludCBjb2x1 bW5OdW1iZXIsIGNvbnN0IFN0cmluZyYgc291cmNlVVJMKTsKIApAQCAtODEsNiArODQsNyBAQCBw cml2YXRlOgogICAgIFdlYWtQdHI8V2ViU2hhcmVkV29ya2VyU2VydmVyPiBtX3NlcnZlcjsKICAg ICBXZWJDb3JlOjpSZWdpc3RyYWJsZURvbWFpbiBtX3JlZ2lzdHJhYmxlRG9tYWluOwogICAgIEhh c2hNYXA8V2ViQ29yZTo6UHJvY2Vzc0lkZW50aWZpZXIsIEhhc2hTZXQ8V2ViQ29yZTo6U2hhcmVk V29ya2VyT2JqZWN0SWRlbnRpZmllcj4+IG1fc2hhcmVkV29ya2VyT2JqZWN0czsKKyAgICBXZWJD b3JlOjpUaW1lciBtX2lkbGVUZXJtaW5hdGlvblRpbWVyOwogfTsKIAogfSAvLyBuYW1lc3BhY2Ug V2ViS2l0Cg==