22455 2008-11-24 06:24:02 -0800 Add support for Worker.terminate() 2008-11-24 10:21:22 -0800 1 1 1 Unclassified WebKit WebCore JavaScript 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 ap ap oldest_to_newest 99959 0 ap 2008-11-24 06:24:02 -0800 "The terminate() method, when invoked, must cause the "terminate a worker" algorithm to be run on the worker with with the object is associated." 99960 1 25426 ap 2008-11-24 06:37:03 -0800 Created attachment 25426 proposed patch 99970 2 25426 darin 2008-11-24 08:58:44 -0800 Comment on attachment 25426 proposed patch r=me 99981 3 ap 2008-11-24 10:21:22 -0800 Committed revision 38711. 25426 2008-11-24 06:37:03 -0800 2008-11-24 08:58:44 -0800 proposed patch WorkerTerminate.txt text/plain 13963 ap SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAzODcwNykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMzkgQEAKKzIwMDgtMTEtMjQgIEFsZXhleSBQcm9za3VyeWFrb3YgIDxhcEB3ZWJr aXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjQ1NQorICAgICAgICBB ZGQgc3VwcG9ydCBmb3IgV29ya2VyLnRlcm1pbmF0ZSgpCisKKyAgICAgICAgVGVzdDogZmFzdC93 b3JrZXJzL3dvcmtlci10ZXJtaW5hdGUuaHRtbAorCisgICAgICAgICogZG9tL1dvcmtlci5pZGw6 CisgICAgICAgICogZG9tL1dvcmtlci5jcHA6CisgICAgICAgICogZG9tL1dvcmtlci5oOgorICAg ICAgICBBZGRlZCB0ZXJtaW5hdGUoKS4KKworICAgICAgICAqIGRvbS9Xb3JrZXJNZXNzYWdpbmdQ cm94eS5oOiAoV2ViQ29yZTo6V29ya2VyTWVzc2FnaW5nUHJveHk6OmFza2VkVG9UZXJtaW5hdGUp OgorICAgICAgICAqIGRvbS9Xb3JrZXJNZXNzYWdpbmdQcm94eS5jcHA6CisgICAgICAgIChXZWJD b3JlOjpNZXNzYWdlV29ya2VyVGFzazo6cGVyZm9ybVRhc2spOiBEb24ndCBkaXNwYXRjaCBtZXNz YWdlcyBpZiB0aGUgd29ya2VyIHdhcyBhc2tlZAorICAgICAgICB0byB0ZXJtaW5hdGUgKHRoaXMg aXMgbm90IG1lbnRpb25lZCBpbiBkcmFmdCBzcGVjLCBidXQgbWFrZXMgc2Vuc2UgYW55d2F5KS4K KyAgICAgICAgKFdlYkNvcmU6Oldvcmtlck1lc3NhZ2luZ1Byb3h5OjpXb3JrZXJNZXNzYWdpbmdQ cm94eSk6IFRoZSBwcm94eSBub3cgcmVtZW1iZXJzIGlmIGl0IHdhcworICAgICAgICBhc2tlZCB0 byB0ZXJtaW5hdGUgaW4gbV9hc2tlZFRvVGVybWluYXRlIG1lbWJlciB2YXJpYWJsZS4gQWxzbywg Y2hhbmdlZCBtX3VuY29uZmlybWVkTWVzc2FnZUNvdW50CisgICAgICAgIHRvIG9ubHkgdHJhY2sg bWVzc2FnZXMgdGhhdCB3ZXJlIHBvc3RlZCB0byB3b3JrZXIgdGhyZWFkLCBhdm9pZGluZyBhIGxl YWsgaWYgdGhlIHNjcmlwdAorICAgICAgICBjb3VsZCBub3QgYmUgbG9hZGVkLgorICAgICAgICAo V2ViQ29yZTo6V29ya2VyTWVzc2FnaW5nUHJveHk6OnBvc3RNZXNzYWdlVG9Xb3JrZXJDb250ZXh0 KTogUmV0dXJuIGVhcmx5IGlmIHRlcm1pbmF0aW5nLgorICAgICAgICAoV2ViQ29yZTo6V29ya2Vy TWVzc2FnaW5nUHJveHk6OndvcmtlclRocmVhZENyZWF0ZWQpOiBTdG9wIHRoZSB0aHJlYWQgaWYg YWxyZWFkeSBhc2tlZCBmb3IuCisgICAgICAgIChXZWJDb3JlOjpXb3JrZXJNZXNzYWdpbmdQcm94 eTo6d29ya2VyQ29udGV4dERlc3Ryb3llZEludGVybmFsKTogRXZlbiBpZiB3b3JrZXIgY29udGV4 dAorICAgICAgICB3YXMgZGVzdHJveWVkLCB0aGUgd29ya2VyIG9iamVjdCBtYXkgc3RpbGwgYmUg YWxpdmUgbm93LCBzbyBkb24ndCBkZWxldGUgc2VsZiBpbiB0aGlzIGNhc2UuCisgICAgICAgIChX ZWJDb3JlOjpXb3JrZXJNZXNzYWdpbmdQcm94eTo6dGVybWluYXRlKTogU3RvcCB0aGUgdGhyZWFk IGlmIGl0IHdhcyBhbHJlYWR5IGNyZWF0ZWQsIG9yCisgICAgICAgIHJlbWVtYmVyIHRvIHN0b3Ag aXQgd2hlbiBpdCBpcyBjcmVhdGVkLgorICAgICAgICAoV2ViQ29yZTo6V29ya2VyTWVzc2FnaW5n UHJveHk6OnJlcG9ydFdvcmtlclRocmVhZEFjdGl2aXR5SW50ZXJuYWwpOiBEb24ndCB0cmFjayBh Y3Rpdml0eQorICAgICAgICBpZiB0aGUgdGhyZWFkIGFza2VkIHRvIHN0b3AgYW55d2F5LgorICAg ICAgICAoV2ViQ29yZTo6V29ya2VyTWVzc2FnaW5nUHJveHk6OndvcmtlclRocmVhZEhhc1BlbmRp bmdBY3Rpdml0eSk6IERpdHRvLgorCisgICAgICAgICogZG9tL1dvcmtlclRocmVhZC5jcHA6Cisg ICAgICAgICogZG9tL1dvcmtlclRocmVhZC5oOgorICAgICAgICBGaXhlZCBhIHJhY2UgY29uZGl0 aW9uIGluIHN0b3AoKS4KKwogMjAwOC0xMS0yNCAgSG9sZ2VyIEhhbnMgUGV0ZXIgRnJleXRoZXIg IDx6ZWNrZUBzZWxmaXNoLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBNYXJrIFJvd2UuCklu ZGV4OiBXZWJDb3JlL2RvbS9Xb3JrZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvZG9tL1dv cmtlci5jcHAJKHJldmlzaW9uIDM4Njk5KQorKysgV2ViQ29yZS9kb20vV29ya2VyLmNwcAkod29y a2luZyBjb3B5KQpAQCAtOTIsNiArOTIsMTEgQEAgdm9pZCBXb3JrZXI6OnBvc3RNZXNzYWdlKGNv bnN0IFN0cmluZyYgbQogICAgIG1fbWVzc2FnaW5nUHJveHktPnBvc3RNZXNzYWdlVG9Xb3JrZXJD b250ZXh0KG1lc3NhZ2UpOwogfQogCit2b2lkIFdvcmtlcjo6dGVybWluYXRlKCkKK3sKKyAgICBt X21lc3NhZ2luZ1Byb3h5LT50ZXJtaW5hdGUoKTsKK30KKwogYm9vbCBXb3JrZXI6Omhhc1BlbmRp bmdBY3Rpdml0eSgpIGNvbnN0CiB7CiAgICAgcmV0dXJuIG1fbWVzc2FnaW5nUHJveHktPndvcmtl clRocmVhZEhhc1BlbmRpbmdBY3Rpdml0eSgpIHx8IEFjdGl2ZURPTU9iamVjdDo6aGFzUGVuZGlu Z0FjdGl2aXR5KCk7CkluZGV4OiBXZWJDb3JlL2RvbS9Xb3JrZXIuaAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBX ZWJDb3JlL2RvbS9Xb3JrZXIuaAkocmV2aXNpb24gMzg2OTkpCisrKyBXZWJDb3JlL2RvbS9Xb3Jr ZXIuaAkod29ya2luZyBjb3B5KQpAQCAtNjMsNiArNjMsOCBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7 CiAKICAgICAgICAgdm9pZCBwb3N0TWVzc2FnZShjb25zdCBTdHJpbmcmIG1lc3NhZ2UpOwogCisg ICAgICAgIHZvaWQgdGVybWluYXRlKCk7CisKICAgICAgICAgdmlydHVhbCBib29sIGhhc1BlbmRp bmdBY3Rpdml0eSgpIGNvbnN0OwogCiAgICAgICAgIHZpcnR1YWwgdm9pZCBhZGRFdmVudExpc3Rl bmVyKGNvbnN0IEF0b21pY1N0cmluZyYgZXZlbnRUeXBlLCBQYXNzUmVmUHRyPEV2ZW50TGlzdGVu ZXI+LCBib29sIHVzZUNhcHR1cmUpOwpJbmRleDogV2ViQ29yZS9kb20vV29ya2VyLmlkbAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBXZWJDb3JlL2RvbS9Xb3JrZXIuaWRsCShyZXZpc2lvbiAzODY5OSkKKysrIFdl YkNvcmUvZG9tL1dvcmtlci5pZGwJKHdvcmtpbmcgY29weSkKQEAgLTMyLDYgKzMyLDggQEAgbW9k dWxlIHRocmVhZHMgewogICAgICAgICBhdHRyaWJ1dGUgRXZlbnRMaXN0ZW5lciBvbm1lc3NhZ2U7 CiAgICAgICAgIHZvaWQgcG9zdE1lc3NhZ2UoaW4gRE9NU3RyaW5nIG1lc3NhZ2UpOwogCisgICAg ICAgIHZvaWQgdGVybWluYXRlKCk7CisKICAgICAgICAgLy8gRXZlbnRUYXJnZXQgaW50ZXJmYWNl CiAgICAgICAgIFtDdXN0b21dIHZvaWQgYWRkRXZlbnRMaXN0ZW5lcihpbiBET01TdHJpbmcgdHlw ZSwgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBpbiBFdmVudExpc3Rl bmVyIGxpc3RlbmVyLCAKSW5kZXg6IFdlYkNvcmUvZG9tL1dvcmtlck1lc3NhZ2luZ1Byb3h5LmNw cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2RvbS9Xb3JrZXJNZXNzYWdpbmdQcm94eS5jcHAJKHJl dmlzaW9uIDM4Njk5KQorKysgV2ViQ29yZS9kb20vV29ya2VyTWVzc2FnaW5nUHJveHkuY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC05MSw3ICs5MSw3IEBAIHByaXZhdGU6CiAgICAgdmlydHVhbCB2b2lk IHBlcmZvcm1UYXNrKFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQqKQogICAgIHsKICAgICAgICAgV29y a2VyKiB3b3JrZXJPYmplY3QgPSBtX21lc3NhZ2luZ1Byb3h5LT53b3JrZXJPYmplY3QoKTsKLSAg ICAgICAgaWYgKCF3b3JrZXJPYmplY3QpCisgICAgICAgIGlmICghd29ya2VyT2JqZWN0IHx8IG1f bWVzc2FnaW5nUHJveHktPmFza2VkVG9UZXJtaW5hdGUoKSkKICAgICAgICAgICAgIHJldHVybjsK IAogICAgICAgICBSZWZQdHI8RXZlbnQ+IGV2dCA9IE1lc3NhZ2VFdmVudDo6Y3JlYXRlKG1fbWVz c2FnZSwgIiIsICIiLCAwLCAwKTsKQEAgLTE5MCw4ICsxOTAsOSBAQCBwcml2YXRlOgogV29ya2Vy TWVzc2FnaW5nUHJveHk6Oldvcmtlck1lc3NhZ2luZ1Byb3h5KFBhc3NSZWZQdHI8U2NyaXB0RXhl Y3V0aW9uQ29udGV4dD4gc2NyaXB0RXhlY3V0aW9uQ29udGV4dCwgV29ya2VyKiB3b3JrZXJPYmpl Y3QpCiAgICAgOiBtX3NjcmlwdEV4ZWN1dGlvbkNvbnRleHQoc2NyaXB0RXhlY3V0aW9uQ29udGV4 dCkKICAgICAsIG1fd29ya2VyT2JqZWN0KHdvcmtlck9iamVjdCkKLSAgICAsIG1fdW5jb25maXJt ZWRNZXNzYWdlQ291bnQoMSkgLy8gV29ya2VyIGluaXRpYWxpemF0aW9uIGNvdW50cyBhcyBhIHBl bmRpbmcgbWVzc2FnZS4KKyAgICAsIG1fdW5jb25maXJtZWRNZXNzYWdlQ291bnQoMCkKICAgICAs IG1fd29ya2VyVGhyZWFkSGFkUGVuZGluZ0FjdGl2aXR5KGZhbHNlKQorICAgICwgbV9hc2tlZFRv VGVybWluYXRlKGZhbHNlKQogewogICAgIEFTU0VSVChtX3dvcmtlck9iamVjdCk7CiAgICAgQVNT RVJUKChtX3NjcmlwdEV4ZWN1dGlvbkNvbnRleHQtPmlzRG9jdW1lbnQoKSAmJiBpc01haW5UaHJl YWQoKSkKQEAgLTIxMiwxMCArMjEzLDEzIEBAIHZvaWQgV29ya2VyTWVzc2FnaW5nUHJveHk6OnBv c3RNZXNzYWdlVG8KIAogdm9pZCBXb3JrZXJNZXNzYWdpbmdQcm94eTo6cG9zdE1lc3NhZ2VUb1dv cmtlckNvbnRleHQoY29uc3QgU3RyaW5nJiBtZXNzYWdlKQogewotICAgICsrbV91bmNvbmZpcm1l ZE1lc3NhZ2VDb3VudDsKLSAgICBpZiAobV93b3JrZXJUaHJlYWQpCisgICAgaWYgKG1fYXNrZWRU b1Rlcm1pbmF0ZSkKKyAgICAgICAgcmV0dXJuOworCisgICAgaWYgKG1fd29ya2VyVGhyZWFkKSB7 CisgICAgICAgICsrbV91bmNvbmZpcm1lZE1lc3NhZ2VDb3VudDsKICAgICAgICAgbV93b3JrZXJU aHJlYWQtPm1lc3NhZ2VRdWV1ZSgpLmFwcGVuZChNZXNzYWdlV29ya2VyQ29udGV4dFRhc2s6OmNy ZWF0ZShtZXNzYWdlKSk7Ci0gICAgZWxzZQorICAgIH0gZWxzZQogICAgICAgICBtX3F1ZXVlZEVh cmx5VGFza3MuYXBwZW5kKE1lc3NhZ2VXb3JrZXJDb250ZXh0VGFzazo6Y3JlYXRlKG1lc3NhZ2Up KTsKIH0KIApAQCAtMjI4LDEwICsyMzIsMTggQEAgdm9pZCBXb3JrZXJNZXNzYWdpbmdQcm94eTo6 d29ya2VyVGhyZWFkQwogewogICAgIG1fd29ya2VyVGhyZWFkID0gd29ya2VyVGhyZWFkOwogCi0g ICAgdW5zaWduZWQgdGFza0NvdW50ID0gbV9xdWV1ZWRFYXJseVRhc2tzLnNpemUoKTsKLSAgICBm b3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgdGFza0NvdW50OyArK2kpCi0gICAgICAgIG1fd29ya2Vy VGhyZWFkLT5tZXNzYWdlUXVldWUoKS5hcHBlbmQobV9xdWV1ZWRFYXJseVRhc2tzW2ldKTsKLSAg ICBtX3F1ZXVlZEVhcmx5VGFza3MuY2xlYXIoKTsKKyAgICBpZiAobV9hc2tlZFRvVGVybWluYXRl KSB7CisgICAgICAgIC8vIFdvcmtlci50ZXJtaW5hdGUoKSBjb3VsZCBiZSBjYWxsZWQgZnJvbSBK UyBiZWZvcmUgdGhlIHRocmVhZCB3YXMgY3JlYXRlZC4KKyAgICAgICAgbV93b3JrZXJUaHJlYWQt PnN0b3AoKTsKKyAgICB9IGVsc2UgeworICAgICAgICB1bnNpZ25lZCB0YXNrQ291bnQgPSBtX3F1 ZXVlZEVhcmx5VGFza3Muc2l6ZSgpOworICAgICAgICBBU1NFUlQoIW1fdW5jb25maXJtZWRNZXNz YWdlQ291bnQpOworICAgICAgICBtX3VuY29uZmlybWVkTWVzc2FnZUNvdW50ID0gdGFza0NvdW50 ICsgMTsgLy8gV29ya2VyIGluaXRpYWxpemF0aW9uIGNvdW50cyBhcyBhIHBlbmRpbmcgbWVzc2Fn ZS4KKworICAgICAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgdGFza0NvdW50OyArK2kpCisg ICAgICAgICAgICBtX3dvcmtlclRocmVhZC0+bWVzc2FnZVF1ZXVlKCkuYXBwZW5kKG1fcXVldWVk RWFybHlUYXNrc1tpXSk7CisgICAgICAgIG1fcXVldWVkRWFybHlUYXNrcy5jbGVhcigpOworICAg IH0KIH0KIAogdm9pZCBXb3JrZXJNZXNzYWdpbmdQcm94eTo6d29ya2VyT2JqZWN0RGVzdHJveWVk KCkKQEAgLTI1MSw4ICsyNjMsMjAgQEAgdm9pZCBXb3JrZXJNZXNzYWdpbmdQcm94eTo6d29ya2Vy Q29udGV4dAogCiB2b2lkIFdvcmtlck1lc3NhZ2luZ1Byb3h5Ojp3b3JrZXJDb250ZXh0RGVzdHJv eWVkSW50ZXJuYWwoKQogewotICAgIEFTU0VSVCghbV93b3JrZXJPYmplY3QpOwotICAgIGRlbGV0 ZSB0aGlzOworICAgIC8vIFdvcmtlckNvbnRleHREZXN0cm95ZWRUYXNrIGlzIGFsd2F5cyB0aGUg bGFzdCB0byBiZSBwZXJmb3JtZWQsIHNvIHRoZSBwcm94eSBpcyBub3QgbmVlZGVkIGZvciBjb21t dW5pY2F0aW9uCisgICAgLy8gaW4gZWl0aGVyIHNpZGUgYW55IG1vcmUuIEhvd2V2ZXIsIHRoZSBX b3JrZXIgb2JqZWN0IG1heSBzdGlsbCBleGlzdCwgYW5kIGl0IGFzc3VtZXMgdGhhdCB0aGUgcHJv eHkgZXhpc3RzLCB0b28uCisgICAgaWYgKCFtX3dvcmtlck9iamVjdCkKKyAgICAgICAgZGVsZXRl IHRoaXM7Cit9CisKK3ZvaWQgV29ya2VyTWVzc2FnaW5nUHJveHk6OnRlcm1pbmF0ZSgpCit7Cisg ICAgaWYgKG1fYXNrZWRUb1Rlcm1pbmF0ZSkKKyAgICAgICAgcmV0dXJuOworICAgIG1fYXNrZWRU b1Rlcm1pbmF0ZSA9IHRydWU7CisKKyAgICBpZiAobV93b3JrZXJUaHJlYWQpCisgICAgICAgIG1f d29ya2VyVGhyZWFkLT5zdG9wKCk7CiB9CiAKIHZvaWQgV29ya2VyTWVzc2FnaW5nUHJveHk6OmNv bmZpcm1Xb3JrZXJUaHJlYWRNZXNzYWdlKGJvb2wgaGFzUGVuZGluZ0FjdGl2aXR5KQpAQCAtMjY5 LDcgKzI5Myw3IEBAIHZvaWQgV29ya2VyTWVzc2FnaW5nUHJveHk6OnJlcG9ydFdvcmtlclQKIAog dm9pZCBXb3JrZXJNZXNzYWdpbmdQcm94eTo6cmVwb3J0V29ya2VyVGhyZWFkQWN0aXZpdHlJbnRl cm5hbChib29sIGNvbmZpcm1pbmdNZXNzYWdlLCBib29sIGhhc1BlbmRpbmdBY3Rpdml0eSkKIHsK LSAgICBpZiAoY29uZmlybWluZ01lc3NhZ2UpIHsKKyAgICBpZiAoY29uZmlybWluZ01lc3NhZ2Ug JiYgIW1fYXNrZWRUb1Rlcm1pbmF0ZSkgewogICAgICAgICBBU1NFUlQobV91bmNvbmZpcm1lZE1l c3NhZ2VDb3VudCk7CiAgICAgICAgIC0tbV91bmNvbmZpcm1lZE1lc3NhZ2VDb3VudDsKICAgICB9 CkBAIC0yNzksNyArMzAzLDcgQEAgdm9pZCBXb3JrZXJNZXNzYWdpbmdQcm94eTo6cmVwb3J0V29y a2VyVAogCiBib29sIFdvcmtlck1lc3NhZ2luZ1Byb3h5Ojp3b3JrZXJUaHJlYWRIYXNQZW5kaW5n QWN0aXZpdHkoKSBjb25zdAogewotICAgIHJldHVybiBtX3VuY29uZmlybWVkTWVzc2FnZUNvdW50 IHx8IG1fd29ya2VyVGhyZWFkSGFkUGVuZGluZ0FjdGl2aXR5OworICAgIHJldHVybiAobV91bmNv bmZpcm1lZE1lc3NhZ2VDb3VudCB8fCBtX3dvcmtlclRocmVhZEhhZFBlbmRpbmdBY3Rpdml0eSkg JiYgIW1fYXNrZWRUb1Rlcm1pbmF0ZTsKIH0KIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpJbmRl eDogV2ViQ29yZS9kb20vV29ya2VyTWVzc2FnaW5nUHJveHkuaAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJD b3JlL2RvbS9Xb3JrZXJNZXNzYWdpbmdQcm94eS5oCShyZXZpc2lvbiAzODY5OSkKKysrIFdlYkNv cmUvZG9tL1dvcmtlck1lc3NhZ2luZ1Byb3h5LmgJKHdvcmtpbmcgY29weSkKQEAgLTU1LDYgKzU1 LDggQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICB2b2lkIHdvcmtlck9iamVjdERlc3Ry b3llZCgpOwogICAgICAgICB2b2lkIHdvcmtlckNvbnRleHREZXN0cm95ZWQoKTsKIAorICAgICAg ICB2b2lkIHRlcm1pbmF0ZSgpOworCiAgICAgICAgIHZvaWQgY29uZmlybVdvcmtlclRocmVhZE1l c3NhZ2UoYm9vbCBoYXNQZW5kaW5nQWN0aXZpdHkpOwogICAgICAgICB2b2lkIHJlcG9ydFdvcmtl clRocmVhZEFjdGl2aXR5KGJvb2wgaGFzUGVuZGluZ0FjdGl2aXR5KTsKICAgICAgICAgYm9vbCB3 b3JrZXJUaHJlYWRIYXNQZW5kaW5nQWN0aXZpdHkoKSBjb25zdDsKQEAgLTY5LDYgKzcxLDcgQEAg bmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICB2b2lkIHdvcmtlckNvbnRleHREZXN0cm95ZWRJ bnRlcm5hbCgpOwogICAgICAgICB2b2lkIHJlcG9ydFdvcmtlclRocmVhZEFjdGl2aXR5SW50ZXJu YWwoYm9vbCBjb25maXJtaW5nTWVzc2FnZSwgYm9vbCBoYXNQZW5kaW5nQWN0aXZpdHkpOwogICAg ICAgICBXb3JrZXIqIHdvcmtlck9iamVjdCgpIGNvbnN0IHsgcmV0dXJuIG1fd29ya2VyT2JqZWN0 OyB9CisgICAgICAgIGJvb2wgYXNrZWRUb1Rlcm1pbmF0ZSgpIHsgcmV0dXJuIG1fYXNrZWRUb1Rl cm1pbmF0ZTsgfQogCiAgICAgICAgIFJlZlB0cjxTY3JpcHRFeGVjdXRpb25Db250ZXh0PiBtX3Nj cmlwdEV4ZWN1dGlvbkNvbnRleHQ7CiAgICAgICAgIFdvcmtlciogbV93b3JrZXJPYmplY3Q7CkBA IC03Nyw2ICs4MCw4IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgdW5zaWduZWQgbV91 bmNvbmZpcm1lZE1lc3NhZ2VDb3VudDsgLy8gVW5jb25maXJtZWQgbWVzc2FnZXMgZnJvbSB3b3Jr ZXIgb2JqZWN0IHRvIHdvcmtlciB0aHJlYWQuCiAgICAgICAgIGJvb2wgbV93b3JrZXJUaHJlYWRI YWRQZW5kaW5nQWN0aXZpdHk7IC8vIFRoZSBsYXRlc3QgY29uZmlybWF0aW9uIGZyb20gd29ya2Vy IHRocmVhZCByZXBvcnRlZCB0aGF0IGl0IHdhcyBzdGlsbCBhY3RpdmUuCiAKKyAgICAgICAgYm9v bCBtX2Fza2VkVG9UZXJtaW5hdGU7CisKICAgICAgICAgVmVjdG9yPFJlZlB0cjxXb3JrZXJUYXNr PiA+IG1fcXVldWVkRWFybHlUYXNrczsgLy8gVGFza3MgYXJlIHF1ZXVlZCBoZXJlIHVudGlsIHRo ZXJlJ3MgYSB0aHJlYWQgb2JqZWN0IGNyZWF0ZWQuCiAgICAgfTsKIApJbmRleDogV2ViQ29yZS9k b20vV29ya2VyVGhyZWFkLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2RvbS9Xb3JrZXJUaHJl YWQuY3BwCShyZXZpc2lvbiAzODY5OSkKKysrIFdlYkNvcmUvZG9tL1dvcmtlclRocmVhZC5jcHAJ KHdvcmtpbmcgY29weSkKQEAgLTc1LDkgKzc1LDEzIEBAIHZvaWQqIFdvcmtlclRocmVhZDo6d29y a2VyVGhyZWFkU3RhcnQodm8KIAogdm9pZCogV29ya2VyVGhyZWFkOjp3b3JrZXJUaHJlYWQoKQog ewotICAgIG1fd29ya2VyQ29udGV4dCA9IFdvcmtlckNvbnRleHQ6OmNyZWF0ZShLVVJMKG1fc2Ny aXB0VVJMKSwgdGhpcyk7Ci0gICAgV29ya2VyU2NyaXB0Q29udHJvbGxlciogc2NyaXB0ID0gbV93 b3JrZXJDb250ZXh0LT5zY3JpcHQoKTsKKyAgICB7CisgICAgICAgIC8vIE11dGV4IHByb3RlY3Rp b24gaXMgbmVjZXNzYXJ5IGJlY2F1c2Ugc3RvcCgpIGNhbiBiZSBjYWxsZWQgYmVmb3JlIHRoZSBj b250ZXh0IGlzIGZ1bGx5IGNyZWF0ZWQuCisgICAgICAgIE11dGV4TG9ja2VyIGxvY2sobV93b3Jr ZXJDb250ZXh0TXV0ZXgpOworICAgICAgICBtX3dvcmtlckNvbnRleHQgPSBXb3JrZXJDb250ZXh0 OjpjcmVhdGUoS1VSTChtX3NjcmlwdFVSTCksIHRoaXMpOworICAgIH0KIAorICAgIFdvcmtlclNj cmlwdENvbnRyb2xsZXIqIHNjcmlwdCA9IG1fd29ya2VyQ29udGV4dC0+c2NyaXB0KCk7CiAgICAg c2NyaXB0LT5ldmFsdWF0ZShtYWtlU291cmNlKG1fc291cmNlQ29kZSwgbV9zY3JpcHRVUkwpKTsK ICAgICBtX21lc3NhZ2luZ1Byb3h5LT5jb25maXJtV29ya2VyVGhyZWFkTWVzc2FnZShtX3dvcmtl ckNvbnRleHQtPmhhc1BlbmRpbmdBY3Rpdml0eSgpKTsgLy8gVGhpcyB3YXNuJ3QgcmVhbGx5IGEg bWVzc2FnZSwgYnV0IGl0IGNvdW50cyBhcyBvbmUgZm9yIEdDLgogCkBAIC0xMDIsOCArMTA2LDEw IEBAIHZvaWQqIFdvcmtlclRocmVhZDo6d29ya2VyVGhyZWFkKCkKIAogdm9pZCBXb3JrZXJUaHJl YWQ6OnN0b3AoKQogeworICAgIE11dGV4TG9ja2VyIGxvY2sobV93b3JrZXJDb250ZXh0TXV0ZXgp OwogICAgIC8vIEVuc3VyZSB0aGF0IHRhc2tzIGFyZSBiZWluZyBoYW5kbGVkIGJ5IHRocmVhZCBl dmVudCBsb29wLiBJZiBzY3JpcHQgZXhlY3V0aW9uIHdlcmVuJ3QgZm9yYmlkZGVuLCBhIHdoaWxl KDEpIGxvb3AgaW4gSlMgY291bGQga2VlcCB0aGUgdGhyZWFkIGFsaXZlIGZvcmV2ZXIuCi0gICAg bV93b3JrZXJDb250ZXh0LT5zY3JpcHQoKS0+Zm9yYmlkRXhlY3V0aW9uKCk7CisgICAgaWYgKG1f d29ya2VyQ29udGV4dCkKKyAgICAgICAgbV93b3JrZXJDb250ZXh0LT5zY3JpcHQoKS0+Zm9yYmlk RXhlY3V0aW9uKCk7CiAKICAgICAvLyBGSVhNRTogUnVkZWx5IGtpbGxpbmcgdGhlIHRocmVhZCB3 b24ndCB3b3JrIHdoZW4gd2UgYWxsb3cgbmVzdGVkIHdvcmtlcnMsIGJlY2F1c2UgdGhleSB3aWxs IHRyeSB0byBwb3N0IG5vdGlmaWNhdGlvbnMgb2YgdGhlaXIgZGVzdHJ1Y3Rpb24uCiAgICAgbV9t ZXNzYWdlUXVldWUua2lsbCgpOwpJbmRleDogV2ViQ29yZS9kb20vV29ya2VyVGhyZWFkLmgKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gV2ViQ29yZS9kb20vV29ya2VyVGhyZWFkLmgJKHJldmlzaW9uIDM4Njk5KQor KysgV2ViQ29yZS9kb20vV29ya2VyVGhyZWFkLmgJKHdvcmtpbmcgY29weSkKQEAgLTY2LDYgKzY2 LDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICBXb3JrZXJNZXNzYWdpbmdQcm94eSog bV9tZXNzYWdpbmdQcm94eTsKIAogICAgICAgICBSZWZQdHI8V29ya2VyQ29udGV4dD4gbV93b3Jr ZXJDb250ZXh0OworICAgICAgICBNdXRleCBtX3dvcmtlckNvbnRleHRNdXRleDsKIAogICAgICAg ICBNZXNzYWdlUXVldWU8UmVmUHRyPFdvcmtlclRhc2s+ID4gbV9tZXNzYWdlUXVldWU7CiAgICAg fTsKSW5kZXg6IExheW91dFRlc3RzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0 cy9DaGFuZ2VMb2cJKHJldmlzaW9uIDM4NzA3KQorKysgTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCSh3 b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTMgQEAKKzIwMDgtMTEtMjQgIEFsZXhleSBQcm9za3Vy eWFrb3YgIDxhcEB3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y MjQ1NQorICAgICAgICBBZGQgc3VwcG9ydCBmb3IgV29ya2VyLnRlcm1pbmF0ZSgpCisKKyAgICAg ICAgKiBmYXN0L3dvcmtlcnMvd29ya2VyLXRlcm1pbmF0ZS1leHBlY3RlZC50eHQ6IEFkZGVkLgor ICAgICAgICAqIGZhc3Qvd29ya2Vycy93b3JrZXItdGVybWluYXRlLmh0bWw6IEFkZGVkLgorCiAy MDA4LTExLTI0ICBIb2xnZXIgSGFucyBQZXRlciBGcmV5dGhlciAgPHplY2tlQHNlbGZpc2gub3Jn PgogCiAgICAgICAgIFJldmlld2VkIGJ5IE1hcmsgUm93ZS4KSW5kZXg6IExheW91dFRlc3RzL2Zh c3Qvd29ya2Vycy93b3JrZXItdGVybWluYXRlLWV4cGVjdGVkLnR4dAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBM YXlvdXRUZXN0cy9mYXN0L3dvcmtlcnMvd29ya2VyLXRlcm1pbmF0ZS1leHBlY3RlZC50eHQJKHJl dmlzaW9uIDApCisrKyBMYXlvdXRUZXN0cy9mYXN0L3dvcmtlcnMvd29ya2VyLXRlcm1pbmF0ZS1l eHBlY3RlZC50eHQJKHJldmlzaW9uIDApCkBAIC0wLDAgKzEsNCBAQAorVGVzdCBXb3JrZXIudGVy bWluYXRlKCkuCisKK0RPTkUKKwoKUHJvcGVydHkgY2hhbmdlcyBvbjogTGF5b3V0VGVzdHMvZmFz dC93b3JrZXJzL3dvcmtlci10ZXJtaW5hdGUtZXhwZWN0ZWQudHh0Cl9fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KTmFtZTog c3ZuOm1pbWUtdHlwZQogICArIHRleHQvcGxhaW4KTmFtZTogc3ZuOmVvbC1zdHlsZQogICArIG5h dGl2ZQoKSW5kZXg6IExheW91dFRlc3RzL2Zhc3Qvd29ya2Vycy93b3JrZXItdGVybWluYXRlLmh0 bWwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvZmFzdC93b3JrZXJzL3dvcmtlci10ZXJtaW5h dGUuaHRtbAkocmV2aXNpb24gMCkKKysrIExheW91dFRlc3RzL2Zhc3Qvd29ya2Vycy93b3JrZXIt dGVybWluYXRlLmh0bWwJKHJldmlzaW9uIDApCkBAIC0wLDAgKzEsNTMgQEAKKzxib2R5PgorPHA+ VGVzdCBXb3JrZXIudGVybWluYXRlKCkuPC9wPgorPGRpdiBpZD1yZXN1bHQ+PC9kaXY+Cis8c2Ny aXB0PgorZnVuY3Rpb24gbG9nKG1lc3NhZ2UpCit7CisgICAgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5 SWQoInJlc3VsdCIpLmlubmVySFRNTCArPSBtZXNzYWdlICsgIjxicj4iOworfQorCitmdW5jdGlv biBnYygpCit7CisgICAgaWYgKHdpbmRvdy5HQ0NvbnRyb2xsZXIpCisgICAgICAgIHJldHVybiBH Q0NvbnRyb2xsZXIuY29sbGVjdCgpOworCisgICAgZm9yICh2YXIgaSA9IDA7IGkgPCAxMDAwMDsg aSsrKSB7IC8vID4gZm9yY2UgZ2FyYmFnZSBjb2xsZWN0aW9uIChGRiByZXF1aXJlcyBhYm91dCA5 SyBhbGxvY2F0aW9ucyBiZWZvcmUgYSBjb2xsZWN0KQorICAgICAgICB2YXIgcyA9IG5ldyBTdHJp bmcoImFiYyIpOworICAgIH0KK30KKworaWYgKHdpbmRvdy5sYXlvdXRUZXN0Q29udHJvbGxlcikg eworICAgIGxheW91dFRlc3RDb250cm9sbGVyLmR1bXBBc1RleHQoKTsKKyAgICBsYXlvdXRUZXN0 Q29udHJvbGxlci53YWl0VW50aWxEb25lKCk7Cit9CisKK3ZhciB3b3JrZXIgPSBuZXcgV29ya2Vy KCdyZXNvdXJjZXMvd29ya2VyLWNvbW1vbi5qcycpOword29ya2VyLnRlcm1pbmF0ZSgpOworCit2 YXIgd29ya2VyMiA9IG5ldyBXb3JrZXIoJ3Jlc291cmNlcy93b3JrZXItY29tbW9uLmpzJyk7Cit3 b3JrZXIyLnRlcm1pbmF0ZSgpOword29ya2VyMiA9IDA7CitnYygpOworCit2YXIgd29ya2VyMyA9 IG5ldyBXb3JrZXIoJ3Jlc291cmNlcy93b3JrZXItY29tbW9uLmpzJyk7Cit3b3JrZXIzLm9ubWVz c2FnZSA9IGZ1bmN0aW9uKGV2dCkgeworICAgIGxvZygiRkFJTCIpOworfQord29ya2VyMy5wb3N0 TWVzc2FnZSgiZXZhbCB0cnVlIik7Cit3b3JrZXIzLnRlcm1pbmF0ZSgpOworCit2YXIgd29ya2Vy NCA9IG5ldyBXb3JrZXIoJ3Jlc291cmNlcy93b3JrZXItY29tbW9uLmpzJyk7Cit3b3JrZXI0Lm9u bWVzc2FnZSA9IGZ1bmN0aW9uKGV2dCkgeworICAgIHdvcmtlcjQub25tZXNzYWdlID0gZnVuY3Rp b24oKSB7IGxvZygiRkFJTCIpOyB9CisgICAgd29ya2VyNC5wb3N0TWVzc2FnZSgiZXZhbCB0cnVl Iik7CisgICAgd29ya2VyNC50ZXJtaW5hdGUoKTsKK30KK3dvcmtlcjQucG9zdE1lc3NhZ2UoImV2 YWwgdHJ1ZSIpOword29ya2VyNC50ZXJtaW5hdGUoKTsKKworc2V0VGltZW91dCgibG9nKCdET05F Jyk7IGlmICh3aW5kb3cubGF5b3V0VGVzdENvbnRyb2xsZXIpIGxheW91dFRlc3RDb250cm9sbGVy Lm5vdGlmeURvbmUoKSIsIDUwMCk7CisKKzwvc2NyaXB0PgorPC9ib2R5PgorPC9odG1sPgoKUHJv cGVydHkgY2hhbmdlcyBvbjogTGF5b3V0VGVzdHMvZmFzdC93b3JrZXJzL3dvcmtlci10ZXJtaW5h dGUuaHRtbApfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fCk5hbWU6IHN2bjptaW1lLXR5cGUKICAgKyB0ZXh0L2h0bWwKCg==