95616 2012-08-31 15:44:21 -0700 [WK2] WebProcesses should not wait 60 seconds to close in multi-process mode 2012-08-31 16:27:41 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 ap ap darin oldest_to_newest 710034 0 ap 2012-08-31 15:44:21 -0700 Patch forthcoming. 710041 1 161786 ap 2012-08-31 15:52:47 -0700 Created attachment 161786 proposed patch 710047 2 161786 darin 2012-08-31 16:00:49 -0700 Comment on attachment 161786 proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=161786&action=review r=me assuming you fix the bool/double thing > Source/WebKit2/Shared/Plugins/PluginProcessCreationParameters.h:53 > + bool terminationTimeout; This needs to be double, right? > Source/WebKit2/UIProcess/WebContext.cpp:89 > +static const double sharedSecondaryProcessShutdownTimeout = 60; Add a comment about why 60 seconds is a good value? > Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.cpp:50 > +static const double shutdownTimeout = 15; Add a comment about why 15 seconds is a good value? 710054 3 ap 2012-08-31 16:21:14 -0700 > Add a comment about why 60 seconds is a good value? That's just moved code, I have no insight into how these values were chosen originally, or why they are different. 710058 4 ap 2012-08-31 16:27:41 -0700 Committed <http://trac.webkit.org/changeset/127334>. Great catch with the bool! 161786 2012-08-31 15:52:47 -0700 2012-08-31 16:00:49 -0700 proposed patch ImmediateTermination.txt text/plain 11211 ap SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDEyNzMyNykKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDQ2IEBACisyMDEyLTA4LTMxICBBbGV4ZXkg UHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29tPgorCisgICAgICAgIFtXSzJdIFdlYlByb2Nlc3Nl cyBzaG91bGQgbm90IHdhaXQgNjAgc2Vjb25kcyB0byBjbG9zZSBpbiBtdWx0aS1wcm9jZXNzIG1v ZGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk1NjE2 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTaGFy ZWQvQ2hpbGRQcm9jZXNzLmNwcDogKFdlYktpdDo6Q2hpbGRQcm9jZXNzOjpDaGlsZFByb2Nlc3Mp OgorICAgICAgICAqIFNoYXJlZC9DaGlsZFByb2Nlc3MuaDogKFdlYktpdDo6Q2hpbGRQcm9jZXNz OjpzZXRUZXJtaW5hdGlvblRpbWVvdXQpOgorICAgICAgICBFeHBvc2UgYSBzZXR0ZXIgZm9yIHRp bWVvdXQgaW5zdGVhZCBvZiB0YWtpbmcgaXQgYXQgY29uc3RydWN0aW9uIHRpbWUuIElmIGEgZGVy aXZlZAorICAgICAgICBjbGFzcyBkb2Vzbid0IGNhbGwgdGhlIHNldHRlciwgZGVmYXVsdCB0byAw LgorCisgICAgICAgICogUGx1Z2luUHJvY2Vzcy9QbHVnaW5Qcm9jZXNzLmNwcDoKKyAgICAgICAg KFdlYktpdDo6UGx1Z2luUHJvY2Vzczo6UGx1Z2luUHJvY2Vzcyk6CisgICAgICAgIChXZWJLaXQ6 OlBsdWdpblByb2Nlc3M6OmluaXRpYWxpemVQbHVnaW5Qcm9jZXNzKToKKyAgICAgICAgVXNlIHRp bWVvdXQgZnJvbSBpbml0aWFsaXphdGlvbiBtZXNzYWdlLgorCisgICAgICAgICogV2ViUHJvY2Vz cy9XZWJQcm9jZXNzLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzczo6V2ViUHJvY2Vz cyk6CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3M6OmluaXRpYWxpemVXZWJQcm9jZXNzKToK KyAgICAgICAgRGl0dG8uCisKKyAgICAgICAgKiBTaGFyZWQvUGx1Z2lucy9QbHVnaW5Qcm9jZXNz Q3JlYXRpb25QYXJhbWV0ZXJzLmNwcDoKKyAgICAgICAgKFdlYktpdDo6UGx1Z2luUHJvY2Vzc0Ny ZWF0aW9uUGFyYW1ldGVyczo6ZW5jb2RlKToKKyAgICAgICAgKFdlYktpdDo6UGx1Z2luUHJvY2Vz c0NyZWF0aW9uUGFyYW1ldGVyczo6ZGVjb2RlKToKKyAgICAgICAgKiBTaGFyZWQvUGx1Z2lucy9Q bHVnaW5Qcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzLmg6CisgICAgICAgICogU2hhcmVkL1dlYlBy b2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNz Q3JlYXRpb25QYXJhbWV0ZXJzOjplbmNvZGUpOgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNz Q3JlYXRpb25QYXJhbWV0ZXJzOjpkZWNvZGUpOgorICAgICAgICAqIFNoYXJlZC9XZWJQcm9jZXNz Q3JlYXRpb25QYXJhbWV0ZXJzLmg6CisgICAgICAgIEZ1bm5lbCB0aW1lb3V0IGFjcm9zcyBwcm9j ZXNzIGJvdW5kYXJ5LgorCisgICAgICAgICogVUlQcm9jZXNzL1BsdWdpbnMvUGx1Z2luUHJvY2Vz c1Byb3h5LmNwcDogKFdlYktpdDo6UGx1Z2luUHJvY2Vzc1Byb3h5OjpkaWRGaW5pc2hMYXVuY2hp bmcpOgorICAgICAgICBQYXNzIHRpbWVvdXQgYXMgaW5pdGlhbGl6YXRpb24gbWVzc2FnZSBhZnRl ciBsYXVuY2guCisKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViQ29udGV4dC5jcHA6CisgICAgICAg IChXZWJLaXQ6OldlYkNvbnRleHQ6OmNyZWF0ZU5ld1dlYlByb2Nlc3MpOiBQYXNzIHRpbWVvdXQg YXMgaW5pdGlhbGl6YXRpb24gbWVzc2FnZQorICAgICAgICAodW5saWtlIHBsdWdpbiBwcm9jZXNz IHByb3h5LCB3ZWIgcHJvY2VzcyBwcm94eSBkb2Vzbid0IHdhaXQsIGFuZCByZWxpZXMgb24gdGhl IG1lc3NhZ2UKKyAgICAgICAgYmVpbmcgcXVldWVkKS4KKyAgICAgICAgKFdlYktpdDo6V2ViQ29u dGV4dDo6ZGlzY29ubmVjdFByb2Nlc3MpOiBTa2lwIGludmFsaWRhdGluZyBnbG9iYWwgbWFuYWdl cnMgd2hlbgorICAgICAgICBvbmUgcHJvY2VzcyBxdWl0cy4gV2Ugc3RpbGwgbmVlZCB0byBkbyBz b21ldGhpbmcsIGJ1dCBydW5uaW5nIHRoaXMgY29kZSB3b3VsZCBqdXN0CisgICAgICAgIHJlc3Vs dCBpbiBhc3NlcnRpb24gZmFpbHVyZXMgYW55IHRpbWUgYSBwYWdlIHdhcyBjbG9zZWQuCisKIDIw MTItMDgtMzEgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgogCiAgICAgICAgUkVH UkVTU0lPTiAocjEyNzI1Mik6IGluY29tcGxldGUgcmVwYWludCBvbiBGbGFzaCBlbGVtZW50IGFm dGVyIHBpbmNoIHRvIHpvb20KSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1BsdWdpblByb2Nlc3MvUGx1 Z2luUHJvY2Vzcy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvUGx1Z2luUHJvY2Vz cy9QbHVnaW5Qcm9jZXNzLmNwcAkocmV2aXNpb24gMTI2OTI2KQorKysgU291cmNlL1dlYktpdDIv UGx1Z2luUHJvY2Vzcy9QbHVnaW5Qcm9jZXNzLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNjUsOCAr NjUsNiBAQCB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKIAogbmFtZXNwYWNlIFdlYktpdCB7CiAK LXN0YXRpYyBjb25zdCBkb3VibGUgc2h1dGRvd25UaW1lb3V0ID0gMTUuMDsKLQogUGx1Z2luUHJv Y2VzcyYgUGx1Z2luUHJvY2Vzczo6c2hhcmVkKCkKIHsKICAgICBERUZJTkVfU1RBVElDX0xPQ0FM KFBsdWdpblByb2Nlc3MsIHBsdWdpblByb2Nlc3MsICgpKTsKQEAgLTc0LDggKzcyLDcgQEAgUGx1 Z2luUHJvY2VzcyYgUGx1Z2luUHJvY2Vzczo6c2hhcmVkKCkKIH0KIAogUGx1Z2luUHJvY2Vzczo6 UGx1Z2luUHJvY2VzcygpCi0gICAgOiBDaGlsZFByb2Nlc3Moc2h1dGRvd25UaW1lb3V0KQotICAg ICwgbV9zdXBwb3J0c0FzeW5jaHJvbm91c1BsdWdpbkluaXRpYWxpemF0aW9uKGZhbHNlKQorICAg IDogbV9zdXBwb3J0c0FzeW5jaHJvbm91c1BsdWdpbkluaXRpYWxpemF0aW9uKGZhbHNlKQogI2lm IFBMQVRGT1JNKE1BQykKICAgICAsIG1fY29tcG9zaXRpbmdSZW5kZXJTZXJ2ZXJQb3J0KE1BQ0hf UE9SVF9OVUxMKQogI2VuZGlmCkBAIC0xNjIsNiArMTU5LDcgQEAgdm9pZCBQbHVnaW5Qcm9jZXNz Ojppbml0aWFsaXplUGx1Z2luUHJvYwogCiAgICAgbV9wbHVnaW5QYXRoID0gcGFyYW1ldGVycy5w bHVnaW5QYXRoOwogICAgIG1fc3VwcG9ydHNBc3luY2hyb25vdXNQbHVnaW5Jbml0aWFsaXphdGlv biA9IHBhcmFtZXRlcnMuc3VwcG9ydHNBc3luY2hyb25vdXNQbHVnaW5Jbml0aWFsaXphdGlvbjsK KyAgICBzZXRUZXJtaW5hdGlvblRpbWVvdXQocGFyYW1ldGVycy50ZXJtaW5hdGlvblRpbWVvdXQp OwogCiAgICAgcGxhdGZvcm1Jbml0aWFsaXplKHBhcmFtZXRlcnMpOwogfQpJbmRleDogU291cmNl L1dlYktpdDIvU2hhcmVkL0NoaWxkUHJvY2Vzcy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YktpdDIvU2hhcmVkL0NoaWxkUHJvY2Vzcy5jcHAJKHJldmlzaW9uIDEyNjkyNikKKysrIFNvdXJj ZS9XZWJLaXQyL1NoYXJlZC9DaGlsZFByb2Nlc3MuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01Niw4 ICs1Niw4IEBAIHZvaWQgQ2hpbGRQcm9jZXNzOjplbmFibGVUZXJtaW5hdGlvbigpCiAgICAgbV90 ZXJtaW5hdGlvblRpbWVyLnN0YXJ0T25lU2hvdChtX3Rlcm1pbmF0aW9uVGltZW91dCk7CiB9CiAK LUNoaWxkUHJvY2Vzczo6Q2hpbGRQcm9jZXNzKGRvdWJsZSB0ZXJtaW5hdGlvblRpbWVvdXQpCi0g ICAgOiBtX3Rlcm1pbmF0aW9uVGltZW91dCh0ZXJtaW5hdGlvblRpbWVvdXQpCitDaGlsZFByb2Nl c3M6OkNoaWxkUHJvY2VzcygpCisgICAgOiBtX3Rlcm1pbmF0aW9uVGltZW91dCgwKQogICAgICwg bV90ZXJtaW5hdGlvbkNvdW50ZXIoMCkKICAgICAsIG1fdGVybWluYXRpb25UaW1lcihSdW5Mb29w OjptYWluKCksIHRoaXMsICZDaGlsZFByb2Nlc3M6OnRlcm1pbmF0aW9uVGltZXJGaXJlZCkKIHsK SW5kZXg6IFNvdXJjZS9XZWJLaXQyL1NoYXJlZC9DaGlsZFByb2Nlc3MuaAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQvQ2hpbGRQcm9jZXNzLmgJKHJldmlzaW9uIDEyNjkyNikK KysrIFNvdXJjZS9XZWJLaXQyL1NoYXJlZC9DaGlsZFByb2Nlc3MuaAkod29ya2luZyBjb3B5KQpA QCAtNjAsOSArNjAsMTEgQEAgcHVibGljOgogICAgIHN0YXRpYyB2b2lkIGRpZENsb3NlT25Db25u ZWN0aW9uV29ya1F1ZXVlKFdvcmtRdWV1ZSYsIENvcmVJUEM6OkNvbm5lY3Rpb24qKTsKIAogcHJv dGVjdGVkOgotICAgIGV4cGxpY2l0IENoaWxkUHJvY2Vzcyhkb3VibGUgdGVybWluYXRpb25UaW1l b3V0KTsKKyAgICBleHBsaWNpdCBDaGlsZFByb2Nlc3MoKTsKICAgICB+Q2hpbGRQcm9jZXNzKCk7 CiAKKyAgICB2b2lkIHNldFRlcm1pbmF0aW9uVGltZW91dChkb3VibGUgc2Vjb25kcykgeyBtX3Rl cm1pbmF0aW9uVGltZW91dCA9IHNlY29uZHM7IH0KKwogcHJpdmF0ZToKICAgICB2b2lkIHRlcm1p bmF0aW9uVGltZXJGaXJlZCgpOwogCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQvV2ViUHJv Y2Vzc0NyZWF0aW9uUGFyYW1ldGVycy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIv U2hhcmVkL1dlYlByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMuY3BwCShyZXZpc2lvbiAxMjY5MjYp CisrKyBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQvV2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycy5j cHAJKHdvcmtpbmcgY29weSkKQEAgLTY2LDYgKzY2LDcgQEAgdm9pZCBXZWJQcm9jZXNzQ3JlYXRp b25QYXJhbWV0ZXJzOjplbmNvZAogI2lmIEVOQUJMRShQTFVHSU5fUFJPQ0VTUykKICAgICBlbmNv ZGVyLT5lbmNvZGUoZGlzYWJsZVBsdWdpblByb2Nlc3NNZXNzYWdlVGltZW91dCk7CiAjZW5kaWYK KyAgICBlbmNvZGVyLT5lbmNvZGUodGVybWluYXRpb25UaW1lb3V0KTsKICAgICBlbmNvZGVyLT5l bmNvZGUobGFuZ3VhZ2VzKTsKICAgICBlbmNvZGVyLT5lbmNvZGUodGV4dENoZWNrZXJTdGF0ZSk7 CiAgICAgZW5jb2Rlci0+ZW5jb2RlKGZ1bGxLZXlib2FyZEFjY2Vzc0VuYWJsZWQpOwpAQCAtMTM5 LDcgKzE0MCw4IEBAIGJvb2wgV2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVyczo6ZGVjb2QKICAg ICBpZiAoIWRlY29kZXItPmRlY29kZShwYXJhbWV0ZXJzLmRpc2FibGVQbHVnaW5Qcm9jZXNzTWVz c2FnZVRpbWVvdXQpKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAjZW5kaWYKLQorICAgIGlmICgh ZGVjb2Rlci0+ZGVjb2RlKHBhcmFtZXRlcnMudGVybWluYXRpb25UaW1lb3V0KSkKKyAgICAgICAg cmV0dXJuIGZhbHNlOwogICAgIGlmICghZGVjb2Rlci0+ZGVjb2RlKHBhcmFtZXRlcnMubGFuZ3Vh Z2VzKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIGlmICghZGVjb2Rlci0+ZGVjb2RlKHBh cmFtZXRlcnMudGV4dENoZWNrZXJTdGF0ZSkpCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQv V2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQyL1NoYXJlZC9XZWJQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzLmgJKHJldmlzaW9uIDEyNjky NikKKysrIFNvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJz LmgJKHdvcmtpbmcgY29weSkKQEAgLTc3LDYgKzc3LDggQEAgc3RydWN0IFdlYlByb2Nlc3NDcmVh dGlvblBhcmFtZXRlcnMgewogICAgIGJvb2wgZGlzYWJsZVBsdWdpblByb2Nlc3NNZXNzYWdlVGlt ZW91dDsKICNlbmRpZgogCisgICAgZG91YmxlIHRlcm1pbmF0aW9uVGltZW91dDsKKwogICAgIFZl Y3RvcjxTdHJpbmc+IGxhbmd1YWdlczsKIAogICAgIFRleHRDaGVja2VyU3RhdGUgdGV4dENoZWNr ZXJTdGF0ZTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1NoYXJlZC9QbHVnaW5zL1BsdWdpblByb2Nl c3NDcmVhdGlvblBhcmFtZXRlcnMuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1No YXJlZC9QbHVnaW5zL1BsdWdpblByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMuY3BwCShyZXZpc2lv biAxMjY5MjYpCisrKyBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQvUGx1Z2lucy9QbHVnaW5Qcm9jZXNz Q3JlYXRpb25QYXJhbWV0ZXJzLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDEsNiArNDEsNyBAQCB2 b2lkIFBsdWdpblByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnM6OmVuCiB7CiAgICAgZW5jb2Rlci0+ ZW5jb2RlKHBsdWdpblBhdGgpOwogICAgIGVuY29kZXItPmVuY29kZShzdXBwb3J0c0FzeW5jaHJv bm91c1BsdWdpbkluaXRpYWxpemF0aW9uKTsKKyAgICBlbmNvZGVyLT5lbmNvZGUodGVybWluYXRp b25UaW1lb3V0KTsKIAogI2lmIFBMQVRGT1JNKE1BQykKICAgICBlbmNvZGVyLT5lbmNvZGUocGFy ZW50UHJvY2Vzc05hbWUpOwpAQCAtNTQsNyArNTUsOCBAQCBib29sIFBsdWdpblByb2Nlc3NDcmVh dGlvblBhcmFtZXRlcnM6OmRlCiAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICBpZiAoIWRlY29k ZXItPmRlY29kZShyZXN1bHQuc3VwcG9ydHNBc3luY2hyb25vdXNQbHVnaW5Jbml0aWFsaXphdGlv bikpCiAgICAgICAgIHJldHVybiBmYWxzZTsKLQorICAgIGlmICghZGVjb2Rlci0+ZGVjb2RlKHJl c3VsdC50ZXJtaW5hdGlvblRpbWVvdXQpKQorICAgICAgICByZXR1cm4gZmFsc2U7CiAjaWYgUExB VEZPUk0oTUFDKQogICAgIGlmICghZGVjb2Rlci0+ZGVjb2RlKHJlc3VsdC5wYXJlbnRQcm9jZXNz TmFtZSkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1NoYXJl ZC9QbHVnaW5zL1BsdWdpblByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMuaAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQvUGx1Z2lucy9QbHVnaW5Qcm9jZXNzQ3JlYXRpb25QYXJh bWV0ZXJzLmgJKHJldmlzaW9uIDEyNjkyNikKKysrIFNvdXJjZS9XZWJLaXQyL1NoYXJlZC9QbHVn aW5zL1BsdWdpblByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMuaAkod29ya2luZyBjb3B5KQpAQCAt NTAsNiArNTAsOCBAQCBzdHJ1Y3QgUGx1Z2luUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycyB7CiAg ICAgU3RyaW5nIHBsdWdpblBhdGg7CiAgICAgYm9vbCBzdXBwb3J0c0FzeW5jaHJvbm91c1BsdWdp bkluaXRpYWxpemF0aW9uOwogCisgICAgYm9vbCB0ZXJtaW5hdGlvblRpbWVvdXQ7CisKICNpZiBQ TEFURk9STShNQUMpCiAgICAgU3RyaW5nIHBhcmVudFByb2Nlc3NOYW1lOwogICAgIENvcmVJUEM6 Ok1hY2hQb3J0IGFjY2VsZXJhdGVkQ29tcG9zaXRpbmdQb3J0OwpJbmRleDogU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL1dlYkNvbnRleHQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9XZWJDb250ZXh0LmNwcAkocmV2aXNpb24gMTI2OTI2KQorKysgU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL1dlYkNvbnRleHQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC04Niw2ICs4 Niw4IEBAIHVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwogCiBuYW1lc3BhY2UgV2ViS2l0IHsKIAor c3RhdGljIGNvbnN0IGRvdWJsZSBzaGFyZWRTZWNvbmRhcnlQcm9jZXNzU2h1dGRvd25UaW1lb3V0 ID0gNjA7CisKIERFRklORV9ERUJVR19PTkxZX0dMT0JBTChXVEY6OlJlZkNvdW50ZWRMZWFrQ291 bnRlciwgd2ViQ29udGV4dENvdW50ZXIsICgiV2ViQ29udGV4dCIpKTsKIAogUGFzc1JlZlB0cjxX ZWJDb250ZXh0PiBXZWJDb250ZXh0OjpjcmVhdGUoY29uc3QgU3RyaW5nJiBpbmplY3RlZEJ1bmRs ZVBhdGgpCkBAIC0zMjksNiArMzMxLDggQEAgUGFzc1JlZlB0cjxXZWJQcm9jZXNzUHJveHk+IFdl YkNvbnRleHQ6OgogICAgIAogICAgIHBhcmFtZXRlcnMuaWNvbkRhdGFiYXNlRW5hYmxlZCA9ICFp Y29uRGF0YWJhc2VQYXRoKCkuaXNFbXB0eSgpOwogCisgICAgcGFyYW1ldGVycy50ZXJtaW5hdGlv blRpbWVvdXQgPSAobV9wcm9jZXNzTW9kZWwgPT0gUHJvY2Vzc01vZGVsU2hhcmVkU2Vjb25kYXJ5 UHJvY2VzcykgPyBzaGFyZWRTZWNvbmRhcnlQcm9jZXNzU2h1dGRvd25UaW1lb3V0IDogMDsKKwog ICAgIHBhcmFtZXRlcnMudGV4dENoZWNrZXJTdGF0ZSA9IFRleHRDaGVja2VyOjpzdGF0ZSgpOwog CiAgICAgcGFyYW1ldGVycy5mdWxsS2V5Ym9hcmRBY2Nlc3NFbmFibGVkID0gV2ViUHJvY2Vzc1By b3h5OjpmdWxsS2V5Ym9hcmRBY2Nlc3NFbmFibGVkKCk7CkBAIC00MjcsNiArNDMxLDE0IEBAIHZv aWQgV2ViQ29udGV4dDo6ZGlzY29ubmVjdFByb2Nlc3MoV2ViUHIKIHsKICAgICBBU1NFUlQobV9w cm9jZXNzZXMuY29udGFpbnMocHJvY2VzcykpOwogCisgICAgLy8gRklYTUUgKE11bHRpLVdlYlBy b2Nlc3MpOiBBbGwgdGhlIGludmFsaWRhdGlvbiBjYWxscyBiZWxvdyBhcmUgc3RpbGwgbmVjZXNz YXJ5IGluIG11bHRpLXByb2Nlc3MgbW9kZSwgYnV0IHRoZXkgc2hvdWxkIG9ubHkgYWZmZWN0IGRh dGEgc3RydWN0dXJlcyBwZXJ0YWluaW5nIHRvIHRoZSBwcm9jZXNzIGJlaW5nIGRpc2Nvbm5lY3Rl ZC4KKyAgICAvLyBDbGVhcmluZyBldmVyeXRoaW5nIGNhdXNlcyBhc3NlcnRpb24gZmFpbHVyZXMs IHNvIGl0J3MgbGVzcyB0cm91YmxlIHRvIHNraXAgdGhhdCBmb3Igbm93LgorICAgIGlmIChtX3By b2Nlc3NNb2RlbCAhPSBQcm9jZXNzTW9kZWxTaGFyZWRTZWNvbmRhcnlQcm9jZXNzKSB7CisgICAg ICAgIFJlZlB0cjxXZWJQcm9jZXNzUHJveHk+IHByb3RlY3QocHJvY2Vzcyk7CisgICAgICAgIG1f cHJvY2Vzc2VzLnJlbW92ZShtX3Byb2Nlc3Nlcy5maW5kKHByb2Nlc3MpKTsKKyAgICAgICAgcmV0 dXJuOworICAgIH0KKwogICAgIG1fdmlzaXRlZExpbmtQcm92aWRlci5wcm9jZXNzRGlkQ2xvc2Uo KTsKIAogICAgIC8vIEludmFsaWRhdGUgYWxsIG91dHN0YW5kaW5nIGRvd25sb2Fkcy4KSW5kZXg6 IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblByb2Nlc3NQcm94eS5jcHAK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1BsdWdpbnMvUGx1Z2luUHJv Y2Vzc1Byb3h5LmNwcAkocmV2aXNpb24gMTI2OTI2KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL1BsdWdpbnMvUGx1Z2luUHJvY2Vzc1Byb3h5LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDcs NiArNDcsOCBAQCB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKIAogbmFtZXNwYWNlIFdlYktpdCB7 CiAKK3N0YXRpYyBjb25zdCBkb3VibGUgc2h1dGRvd25UaW1lb3V0ID0gMTU7CisKIFBhc3NSZWZQ dHI8UGx1Z2luUHJvY2Vzc1Byb3h5PiBQbHVnaW5Qcm9jZXNzUHJveHk6OmNyZWF0ZShQbHVnaW5Q cm9jZXNzTWFuYWdlciogUGx1Z2luUHJvY2Vzc01hbmFnZXIsIGNvbnN0IFBsdWdpbk1vZHVsZUlu Zm8mIHBsdWdpbkluZm8pCiB7CiAgICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBQbHVnaW5Qcm9jZXNz UHJveHkoUGx1Z2luUHJvY2Vzc01hbmFnZXIsIHBsdWdpbkluZm8pKTsKQEAgLTIxMSw2ICsyMTMs OCBAQCB2b2lkIFBsdWdpblByb2Nlc3NQcm94eTo6ZGlkRmluaXNoTGF1bmNoCiAKICAgICBwYXJh bWV0ZXJzLnBsdWdpblBhdGggPSBtX3BsdWdpbkluZm8ucGF0aDsKIAorICAgIHBhcmFtZXRlcnMu dGVybWluYXRpb25UaW1lb3V0ID0gc2h1dGRvd25UaW1lb3V0OworCiAgICAgcGxhdGZvcm1Jbml0 aWFsaXplUGx1Z2luUHJvY2VzcyhwYXJhbWV0ZXJzKTsKIAogICAgIC8vIEluaXRpYWxpemUgdGhl IHBsdWctaW4gaG9zdCBwcm9jZXNzLgpJbmRleDogU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9X ZWJQcm9jZXNzLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dl YlByb2Nlc3MuY3BwCShyZXZpc2lvbiAxMjY5MjYpCisrKyBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9j ZXNzL1dlYlByb2Nlc3MuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMzMsMTEgKzEzMyw4IEBAIFdl YlByb2Nlc3MmIFdlYlByb2Nlc3M6OnNoYXJlZCgpCiAgICAgcmV0dXJuIHByb2Nlc3M7CiB9CiAK LXN0YXRpYyBjb25zdCBkb3VibGUgc2h1dGRvd25UaW1lb3V0ID0gNjA7Ci0KIFdlYlByb2Nlc3M6 OldlYlByb2Nlc3MoKQotICAgIDogQ2hpbGRQcm9jZXNzKHNodXRkb3duVGltZW91dCkKLSAgICAs IG1faW5EaWRDbG9zZShmYWxzZSkKKyAgICA6IG1faW5EaWRDbG9zZShmYWxzZSkKICAgICAsIG1f c2hvdWxkVHJhY2tWaXNpdGVkTGlua3ModHJ1ZSkKICAgICAsIG1faGFzU2V0Q2FjaGVNb2RlbChm YWxzZSkKICAgICAsIG1fY2FjaGVNb2RlbChDYWNoZU1vZGVsRG9jdW1lbnRWaWV3ZXIpCkBAIC0y NzQsNiArMjcxLDggQEAgdm9pZCBXZWJQcm9jZXNzOjppbml0aWFsaXplV2ViUHJvY2Vzcyhjbwog I2lmIEVOQUJMRShQTFVHSU5fUFJPQ0VTUykKICAgICBtX2Rpc2FibGVQbHVnaW5Qcm9jZXNzTWVz c2FnZVRpbWVvdXQgPSBwYXJhbWV0ZXJzLmRpc2FibGVQbHVnaW5Qcm9jZXNzTWVzc2FnZVRpbWVv dXQ7CiAjZW5kaWYKKworICAgIHNldFRlcm1pbmF0aW9uVGltZW91dChwYXJhbWV0ZXJzLnRlcm1p bmF0aW9uVGltZW91dCk7CiB9CiAKIHZvaWQgV2ViUHJvY2Vzczo6c2V0U2hvdWxkVHJhY2tWaXNp dGVkTGlua3MoYm9vbCBzaG91bGRUcmFja1Zpc2l0ZWRMaW5rcykK