147108 2015-07-20 06:13:01 -0700 [GTK] Add API to set the maximum number of web processes per WebKitWebContext 2015-07-28 23:52:24 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED Gtk P2 Normal --- 1 cgarcia webkit-unassigned agomez gustavo mcatanzaro mrobinson svillar oldest_to_newest 1110606 0 cgarcia 2015-07-20 06:13:01 -0700 This is useful for limited resources systems. 1110607 1 257090 cgarcia 2015-07-20 06:16:52 -0700 Created attachment 257090 Patch 1110620 2 257090 mrobinson 2015-07-20 08:08:34 -0700 Comment on attachment 257090 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=257090&action=review > Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp:1208 > + * This method **must be called before any other functions**, > + * as early as possible in your application. Calling it later will make > + * your application crash. Woh, isn't there a way to prevent this crash at all? Can't we guard the contents of the method call somehow? 1110621 3 mcatanzaro 2015-07-20 08:12:39 -0700 The crash is good; it prevents programmers from screwing up and calling it too late. This isn't the only place we do that (I think for set process model, for example). 1110625 4 mrobinson 2015-07-20 08:24:12 -0700 (In reply to comment #3) > The crash is good; it prevents programmers from screwing up and calling it > too late. This isn't the only place we do that (I think for set process > model, for example). How about a warning or a GLib failure though? 1110628 5 mcatanzaro 2015-07-20 08:34:09 -0700 I guess "This method **must be called before any other functions**, as early as possible in your application. Calling it later will make your application crash." is not quite right; it implies you cannot use both webkit_web_context_set_process_model and this function, since the documentation is the same on both functions. Can you not use the function on a non-default WebKitWebContext? And of course you must call a function to get the WebKitWebContext in the first place. 1110641 6 cgarcia 2015-07-20 09:52:45 -0700 (In reply to comment #3) > The crash is good; it prevents programmers from screwing up and calling it > too late. This isn't the only place we do that (I think for set process > model, for example). Right, we (WebProcessPool actually) has some CRASH calls in setProcessModel and setMaximumNumberOfProcesses. We can prevent this by making process model and web process count limit construct-only properties, but that makes the API less convenient and doesn't allow to change them for the default context. 1110642 7 cgarcia 2015-07-20 09:53:05 -0700 (In reply to comment #5) > I guess > > "This method **must be called before any other functions**, as early as > possible in your application. Calling it later will make your application > crash." > > is not quite right; it implies you cannot use both > webkit_web_context_set_process_model and this function, since the > documentation is the same on both functions. Can you not use the function on > a non-default WebKitWebContext? And of course you must call a function to > get the WebKitWebContext in the first place. I agree the documentation is not accurate 1111236 8 257257 cgarcia 2015-07-22 02:46:20 -0700 Created attachment 257257 Updated patch Updated the docs 1112402 9 cgarcia 2015-07-27 06:01:14 -0700 ping 1112412 10 257257 gustavo 2015-07-27 07:46:23 -0700 Comment on attachment 257257 Updated patch I am not so sure about the word 'count', but I did not manage to come up with a suggestion either, so it looks good to me. 1113054 11 cgarcia 2015-07-28 23:52:24 -0700 Committed r187543: <http://trac.webkit.org/changeset/187543> 257090 2015-07-20 06:16:52 -0700 2015-07-22 02:46:20 -0700 Patch wk2-process-limit.diff text/plain 6763 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBkOGEzZTNhLi45YzM2OTNiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTgg QEAKIDIwMTUtMDctMjAgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgogCisgICAgICAgIFtHVEtdIEFkZCBBUEkgdG8gc2V0IHRoZSBtYXhpbXVtIG51bWJlciBvZiB3 ZWIgcHJvY2Vzc2VzIHBlciBXZWJLaXRXZWJDb250ZXh0CisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDcxMDgKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYkNv bnRleHQuY3BwOgorICAgICAgICAod2Via2l0X3dlYl9jb250ZXh0X3NldF93ZWJfcHJvY2Vzc19j b3VudF9saW1pdCk6CisgICAgICAgICh3ZWJraXRfd2ViX2NvbnRleHRfZ2V0X3dlYl9wcm9jZXNz X2NvdW50X2xpbWl0KToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJDb250 ZXh0Lmg6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9ndGsvZG9jcy93ZWJraXQyZ3RrLTQuMC1z ZWN0aW9ucy50eHQ6CisKKzIwMTUtMDctMjAgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNp YUBpZ2FsaWEuY29tPgorCiAgICAgICAgIFtHVEtdIFBhc3MgYSBHc3RJbnN0YWxsUGx1Z2luc0Nv bnRleHQgdG8gZ3N0X2luc3RhbGxfcGx1Z2luc19hc3luYwogICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ3MTAzCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYkNvbnRleHQuY3BwIGIvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViQ29udGV4dC5jcHAKaW5kZXggMDg2ZDRl Yy4uNzQ2N2FlYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsv V2ViS2l0V2ViQ29udGV4dC5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9n dGsvV2ViS2l0V2ViQ29udGV4dC5jcHAKQEAgLTExOTUsNiArMTE5NSw0NyBAQCBXZWJLaXRQcm9j ZXNzTW9kZWwgd2Via2l0X3dlYl9jb250ZXh0X2dldF9wcm9jZXNzX21vZGVsKFdlYktpdFdlYkNv bnRleHQqIGNvbnRleAogICAgIHJldHVybiB0b1dlYktpdFByb2Nlc3NNb2RlbChjb250ZXh0LT5w cml2LT5jb250ZXh0LT5wcm9jZXNzTW9kZWwoKSk7CiB9CiAKKy8qKgorICogd2Via2l0X3dlYl9j b250ZXh0X3NldF93ZWJfcHJvY2Vzc19jb3VudF9saW1pdDoKKyAqIEBjb250ZXh0OiB0aGUgI1dl YktpdFdlYkNvbnRleHQKKyAqIEBsaW1pdDogdGhlIG1heGltdW0gbnVtYmVyIG9mIHdlYiBwcm9j ZXNzZXMKKyAqCisgKiBTZXRzIHRoZSBtYXhpbXVtIG51bWJlciBvZiB3ZWIgcHJvY2Vzc2VzIHRo YXQgY2FuIGJlIGNyZWF0ZWQgYXQgdGhlIHNhbWUgdGltZSBmb3IgdGhlIEBjb250ZXh0LgorICog VGhlIGRlZmF1bHQgdmFsdWUgaXMgMCBhbmQgbWVhbnMgbm8gbGltaXQuCisgKgorICogVGhpcyBt ZXRob2QgKiptdXN0IGJlIGNhbGxlZCBiZWZvcmUgYW55IG90aGVyIGZ1bmN0aW9ucyoqLAorICog YXMgZWFybHkgYXMgcG9zc2libGUgaW4geW91ciBhcHBsaWNhdGlvbi4gQ2FsbGluZyBpdCBsYXRl ciB3aWxsIG1ha2UKKyAqIHlvdXIgYXBwbGljYXRpb24gY3Jhc2guCisgKgorICogU2luY2U6IDIu MTAKKyAqLwordm9pZCB3ZWJraXRfd2ViX2NvbnRleHRfc2V0X3dlYl9wcm9jZXNzX2NvdW50X2xp bWl0KFdlYktpdFdlYkNvbnRleHQqIGNvbnRleHQsIGd1aW50IGxpbWl0KQoreworICAgIGdfcmV0 dXJuX2lmX2ZhaWwoV0VCS0lUX0lTX1dFQl9DT05URVhUKGNvbnRleHQpKTsKKworICAgIGlmIChs aW1pdCA9PSBjb250ZXh0LT5wcml2LT5jb250ZXh0LT5jb25maWd1cmF0aW9uKCkubWF4aW11bVBy b2Nlc3NDb3VudCgpKQorICAgICAgICByZXR1cm47CisKKyAgICBjb250ZXh0LT5wcml2LT5jb250 ZXh0LT5zZXRNYXhpbXVtTnVtYmVyT2ZQcm9jZXNzZXMobGltaXQpOworfQorCisvKioKKyAqIHdl YmtpdF93ZWJfY29udGV4dF9nZXRfd2ViX3Byb2Nlc3NfY291bnRfbGltaXQ6CisgKiBAY29udGV4 dDogdGhlICNXZWJLaXRXZWJDb250ZXh0CisgKgorICogR2V0cyB0aGUgbWF4aW11bSBudW1iZXIg b2Ygd2ViIHByb2Nlc3NlcyB0aGF0IGNhbiBiZSBjcmVhdGVkIGF0IHRoZSBzYW1lIHRpbWUgZm9y IHRoZSBAY29udGV4dC4KKyAqCisgKiBSZXR1cm5zOiB0aGUgbWF4aW11bSBsaW1pdCBvZiB3ZWIg cHJvY2Vzc2VzLCBvciAwIGlmIHRoZXJlIGlzbid0IGEgbGltaXQuCisgKgorICogU2luY2U6IDIu MTAKKyAqLworZ3VpbnQgd2Via2l0X3dlYl9jb250ZXh0X2dldF93ZWJfcHJvY2Vzc19jb3VudF9s aW1pdChXZWJLaXRXZWJDb250ZXh0KiBjb250ZXh0KQoreworICAgIGdfcmV0dXJuX3ZhbF9pZl9m YWlsKFdFQktJVF9JU19XRUJfQ09OVEVYVChjb250ZXh0KSwgMCk7CisKKyAgICByZXR1cm4gY29u dGV4dC0+cHJpdi0+Y29udGV4dC0+Y29uZmlndXJhdGlvbigpLm1heGltdW1Qcm9jZXNzQ291bnQo KTsKK30KKwogV2ViS2l0RG93bmxvYWQqIHdlYmtpdFdlYkNvbnRleHRHZXRPckNyZWF0ZURvd25s b2FkKERvd25sb2FkUHJveHkqIGRvd25sb2FkUHJveHkpCiB7CiAgICAgR1JlZlB0cjxXZWJLaXRE b3dubG9hZD4gZG93bmxvYWQgPSBkb3dubG9hZHNNYXAoKS5nZXQoZG93bmxvYWRQcm94eSk7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJDb250 ZXh0LmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJDb250ZXh0 LmgKaW5kZXggNGRhNDVkOS4uY2Q1NTQ4NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViQ29udGV4dC5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYkNvbnRleHQuaApAQCAtMTYyLDYgKzE2MiwxMyBAQCBX RUJLSVRfQVBJIFdlYktpdENhY2hlTW9kZWwKIHdlYmtpdF93ZWJfY29udGV4dF9nZXRfY2FjaGVf bW9kZWwgICAgICAgICAgICAgICAgICAoV2ViS2l0V2ViQ29udGV4dCAgICAgICAgICAgICAgKmNv bnRleHQpOwogCiBXRUJLSVRfQVBJIHZvaWQKK3dlYmtpdF93ZWJfY29udGV4dF9zZXRfd2ViX3By b2Nlc3NfY291bnRfbGltaXQgICAgICAoV2ViS2l0V2ViQ29udGV4dCAgICAgICAgICAgICAgKmNv bnRleHQsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIGd1aW50ICAgICAgICAgICAgICAgICAgICAgICAgICBsaW1pdCk7CisKK1dFQktJVF9BUEkg Z3VpbnQKK3dlYmtpdF93ZWJfY29udGV4dF9nZXRfd2ViX3Byb2Nlc3NfY291bnRfbGltaXQgICAg ICAoV2ViS2l0V2ViQ29udGV4dCAgICAgICAgICAgICAgKmNvbnRleHQpOworCitXRUJLSVRfQVBJ IHZvaWQKIHdlYmtpdF93ZWJfY29udGV4dF9jbGVhcl9jYWNoZSAgICAgICAgICAgICAgICAgICAg ICAoV2ViS2l0V2ViQ29udGV4dCAgICAgICAgICAgICAgKmNvbnRleHQpOwogCiBXRUJLSVRfQVBJ IFdlYktpdERvd25sb2FkICoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9B UEkvZ3RrL2RvY3Mvd2Via2l0Mmd0ay00LjAtc2VjdGlvbnMudHh0IGIvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9ndGsvZG9jcy93ZWJraXQyZ3RrLTQuMC1zZWN0aW9ucy50eHQKaW5kZXgg Y2Q4NzBhNS4uMGFmOTgzOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9ndGsvZG9jcy93ZWJraXQyZ3RrLTQuMC1zZWN0aW9ucy50eHQKKysrIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9ndGsvZG9jcy93ZWJraXQyZ3RrLTQuMC1zZWN0aW9ucy50eHQKQEAg LTMzLDYgKzMzLDggQEAgd2Via2l0X3dlYl9jb250ZXh0X25ld193aXRoX3dlYnNpdGVfZGF0YV9t YW5hZ2VyCiB3ZWJraXRfd2ViX2NvbnRleHRfZ2V0X3dlYnNpdGVfZGF0YV9tYW5hZ2VyCiB3ZWJr aXRfd2ViX2NvbnRleHRfZ2V0X2NhY2hlX21vZGVsCiB3ZWJraXRfd2ViX2NvbnRleHRfc2V0X2Nh Y2hlX21vZGVsCit3ZWJraXRfd2ViX2NvbnRleHRfZ2V0X3dlYl9wcm9jZXNzX2NvdW50X2xpbWl0 Cit3ZWJraXRfd2ViX2NvbnRleHRfc2V0X3dlYl9wcm9jZXNzX2NvdW50X2xpbWl0CiB3ZWJraXRf d2ViX2NvbnRleHRfY2xlYXJfY2FjaGUKIHdlYmtpdF93ZWJfY29udGV4dF9kb3dubG9hZF91cmkK IHdlYmtpdF93ZWJfY29udGV4dF9nZXRfY29va2llX21hbmFnZXIKZGlmZiAtLWdpdCBhL1Rvb2xz L0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCA5MjU0NzZkLi4wNzRhMmRmIDEwMDY0 NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEs MTYgQEAKKzIwMTUtMDctMjAgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEu Y29tPgorCisgICAgICAgIFtHVEtdIEFkZCBBUEkgdG8gc2V0IHRoZSBtYXhpbXVtIG51bWJlciBv ZiB3ZWIgcHJvY2Vzc2VzIHBlciBXZWJLaXRXZWJDb250ZXh0CisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDcxMDgKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgdGVzdCBjYXNlIHRvIGNoZWNrIHRoZSB3 ZWIgcHJvY2VzcyBsaW1pdC4KKworICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0 Mkd0ay9UZXN0TXVsdGlwcm9jZXNzLmNwcDoKKyAgICAgICAgKHRlc3RXZWJQcm9jZXNzTGltaXQp OgorICAgICAgICAoYmVmb3JlQWxsKToKKwogMjAxNS0wNy0xNiAgRGVhbiBKb2huc29uICA8ZGVh bl9qb2huc29uQGFwcGxlLmNvbT4KIAogICAgICAgICB3ZWJraXQtcGF0Y2ggdXNlcyBpbmNvcnJl Y3QgY3JlZGVudGlhbHMgZnJvbSBrZXljaGFpbiB0byBsb2dpbiB1bnRpbCBhY2NvdW50IGxvY2tv dXQKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Mkd0ay9UZXN0 TXVsdGlwcm9jZXNzLmNwcCBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Mkd0ay9U ZXN0TXVsdGlwcm9jZXNzLmNwcAppbmRleCBlMzc4MzY5Li4wMjBhZDM1IDEwMDY0NAotLS0gYS9U b29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdDJHdGsvVGVzdE11bHRpcHJvY2Vzcy5jcHAK KysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXQyR3RrL1Rlc3RNdWx0aXByb2Nl c3MuY3BwCkBAIC0yNDAsNiArMjQwLDIyIEBAIHN0YXRpYyB2b2lkIHRlc3RNdWx0aXByb2Nlc3NX ZWJWaWV3Q3JlYXRlUmVhZHlDbG9zZShVSUNsaWVudE11bHRpcHJvY2Vzc1Rlc3QqIHRlCiAgICAg Z19hc3NlcnRfY21wdWludCh0ZXN0LT5tX2luaXRpYWxpemVXZWJFeHRlbnNpb25zU2lnbmFsQ291 bnQsID09LCAxKTsKIH0KIAorc3RhdGljIHZvaWQgdGVzdFdlYlByb2Nlc3NMaW1pdChNdWx0aXBy b2Nlc3NUZXN0KiB0ZXN0LCBnY29uc3Rwb2ludGVyKQoreworICAgIGdfYXNzZXJ0X2NtcHVpbnQo d2Via2l0X3dlYl9jb250ZXh0X2dldF93ZWJfcHJvY2Vzc19jb3VudF9saW1pdCh0ZXN0LT5tX3dl YkNvbnRleHQuZ2V0KCkpLCA9PSwgMCk7CisKKyAgICB3ZWJraXRfd2ViX2NvbnRleHRfc2V0X3dl Yl9wcm9jZXNzX2NvdW50X2xpbWl0KHRlc3QtPm1fd2ViQ29udGV4dC5nZXQoKSwgMSk7CisgICAg Z19hc3NlcnRfY21wdWludCh3ZWJraXRfd2ViX2NvbnRleHRfZ2V0X3dlYl9wcm9jZXNzX2NvdW50 X2xpbWl0KHRlc3QtPm1fd2ViQ29udGV4dC5nZXQoKSksID09LCAxKTsKKworICAgIC8vIENyZWF0 ZSB0d28gd2ViIHZpZXdzIGJ1dCB0aGVyZSBzaG91bGQgYmUgb25seSBvbmUgd2ViIHByb2Nlc3Mu CisgICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IG51bVZpZXdzOyBpKyspIHsKKyAgICAgICAg dGVzdC0+bG9hZFdlYlZpZXdBbmRXYWl0VW50aWxMb2FkZWQoaSk7CisgICAgICAgIGdfYXNzZXJ0 KFdFQktJVF9JU19XRUJfVklFVyh0ZXN0LT5tX3dlYlZpZXdzW2ldLmdldCgpKSk7CisgICAgfQor CisgICAgZ19hc3NlcnRfY21wdWludCh0ZXN0LT5tX2luaXRpYWxpemVXZWJFeHRlbnNpb25zU2ln bmFsQ291bnQsID09LCAxKTsKK30KKwogdm9pZCBiZWZvcmVBbGwoKQogewogICAgIC8vIENoZWNr IHRoYXQgZGVmYXVsdCBzZXR0aW5nIGlzIHRoZSBvbmUgc3RhdGVkIGluIHRoZSBkb2N1bWVudGF0 aW9uCkBAIC0yNTksNiArMjc1LDcgQEAgdm9pZCBiZWZvcmVBbGwoKQogCiAgICAgTXVsdGlwcm9j ZXNzVGVzdDo6YWRkKCJXZWJLaXRXZWJDb250ZXh0IiwgInByb2Nlc3MtcGVyLXdlYi12aWV3Iiwg dGVzdFByb2Nlc3NQZXJXZWJWaWV3KTsKICAgICBVSUNsaWVudE11bHRpcHJvY2Vzc1Rlc3Q6OmFk ZCgiV2ViS2l0V2ViVmlldyIsICJtdWx0aXByb2Nlc3MtY3JlYXRlLXJlYWR5LWNsb3NlIiwgdGVz dE11bHRpcHJvY2Vzc1dlYlZpZXdDcmVhdGVSZWFkeUNsb3NlKTsKKyAgICBNdWx0aXByb2Nlc3NU ZXN0OjphZGQoIldlYktpdFdlYkNvbnRleHQiLCAid2ViLXByb2Nlc3MtbGltaXQiLCB0ZXN0V2Vi UHJvY2Vzc0xpbWl0KTsKIH0KIAogdm9pZCBhZnRlckFsbCgpCg== 257257 2015-07-22 02:46:20 -0700 2015-07-27 07:46:23 -0700 Updated patch wk2-web-process-count-limit.diff text/plain 7201 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCAxYWRjZmIwLi43Mjk2MjNhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTgg QEAKIDIwMTUtMDctMjIgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgogCisgICAgICAgIFtHVEtdIEFkZCBBUEkgdG8gc2V0IHRoZSBtYXhpbXVtIG51bWJlciBvZiB3 ZWIgcHJvY2Vzc2VzIHBlciBXZWJLaXRXZWJDb250ZXh0CisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDcxMDgKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYkNv bnRleHQuY3BwOgorICAgICAgICAod2Via2l0X3dlYl9jb250ZXh0X3NldF93ZWJfcHJvY2Vzc19j b3VudF9saW1pdCk6CisgICAgICAgICh3ZWJraXRfd2ViX2NvbnRleHRfZ2V0X3dlYl9wcm9jZXNz X2NvdW50X2xpbWl0KToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJDb250 ZXh0Lmg6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9ndGsvZG9jcy93ZWJraXQyZ3RrLTQuMC1z ZWN0aW9ucy50eHQ6CisKKzIwMTUtMDctMjIgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNp YUBpZ2FsaWEuY29tPgorCiAgICAgICAgIFVucmV2aWV3ZWQuIEZpeCBzb21lIHdhcm5pbmdzIHdo ZW4gZ2VuZXJhdGluZyBHVEsrIEhUTUwgQVBJIGRvY3MuCiAKICAgICAgICAgKiBVSVByb2Nlc3Mv QVBJL2d0ay9kb2NzL3dlYmtpdDJndGstZG9jcy5zZ21sOiBBZGQKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYkNvbnRleHQuY3BwIGIvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViQ29udGV4dC5jcHAKaW5kZXggMDg2 ZDRlYy4uOWU1MWQxOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9n dGsvV2ViS2l0V2ViQ29udGV4dC5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9ndGsvV2ViS2l0V2ViQ29udGV4dC5jcHAKQEAgLTExNTgsNyArMTE1OCw3IEBAIHZvaWQgd2Vi a2l0X3dlYl9jb250ZXh0X2FsbG93X3Rsc19jZXJ0aWZpY2F0ZV9mb3JfaG9zdChXZWJLaXRXZWJD b250ZXh0KiBjb250ZXh0CiAgKiB0aGUgcmVzdCBvZiB0aGUgV2ViVmlld3MgaW4gdGhlIGFwcGxp Y2F0aW9uIHdpbGwgc3RpbGwgZnVuY3Rpb24KICAqIG5vcm1hbGx5LgogICoKLSAqIFRoaXMgbWV0 aG9kICoqbXVzdCBiZSBjYWxsZWQgYmVmb3JlIGFueSBvdGhlciBmdW5jdGlvbnMqKiwKKyAqIFRo aXMgbWV0aG9kICoqbXVzdCBiZSBjYWxsZWQgYmVmb3JlIGFueSB3ZWIgcHJvY2VzcyBoYXMgYmVl biBjcmVhdGVkKiosCiAgKiBhcyBlYXJseSBhcyBwb3NzaWJsZSBpbiB5b3VyIGFwcGxpY2F0aW9u LiBDYWxsaW5nIGl0IGxhdGVyIHdpbGwgbWFrZQogICogeW91ciBhcHBsaWNhdGlvbiBjcmFzaC4K ICAqCkBAIC0xMTk1LDYgKzExOTUsNDcgQEAgV2ViS2l0UHJvY2Vzc01vZGVsIHdlYmtpdF93ZWJf Y29udGV4dF9nZXRfcHJvY2Vzc19tb2RlbChXZWJLaXRXZWJDb250ZXh0KiBjb250ZXgKICAgICBy ZXR1cm4gdG9XZWJLaXRQcm9jZXNzTW9kZWwoY29udGV4dC0+cHJpdi0+Y29udGV4dC0+cHJvY2Vz c01vZGVsKCkpOwogfQogCisvKioKKyAqIHdlYmtpdF93ZWJfY29udGV4dF9zZXRfd2ViX3Byb2Nl c3NfY291bnRfbGltaXQ6CisgKiBAY29udGV4dDogdGhlICNXZWJLaXRXZWJDb250ZXh0CisgKiBA bGltaXQ6IHRoZSBtYXhpbXVtIG51bWJlciBvZiB3ZWIgcHJvY2Vzc2VzCisgKgorICogU2V0cyB0 aGUgbWF4aW11bSBudW1iZXIgb2Ygd2ViIHByb2Nlc3NlcyB0aGF0IGNhbiBiZSBjcmVhdGVkIGF0 IHRoZSBzYW1lIHRpbWUgZm9yIHRoZSBAY29udGV4dC4KKyAqIFRoZSBkZWZhdWx0IHZhbHVlIGlz IDAgYW5kIG1lYW5zIG5vIGxpbWl0LgorICoKKyAqIFRoaXMgbWV0aG9kICoqbXVzdCBiZSBjYWxs ZWQgYmVmb3JlIGFueSB3ZWIgcHJvY2VzcyBoYXMgYmVlbiBjcmVhdGVkKiosCisgKiBhcyBlYXJs eSBhcyBwb3NzaWJsZSBpbiB5b3VyIGFwcGxpY2F0aW9uLiBDYWxsaW5nIGl0IGxhdGVyIHdpbGwg bWFrZQorICogeW91ciBhcHBsaWNhdGlvbiBjcmFzaC4KKyAqCisgKiBTaW5jZTogMi4xMAorICov Cit2b2lkIHdlYmtpdF93ZWJfY29udGV4dF9zZXRfd2ViX3Byb2Nlc3NfY291bnRfbGltaXQoV2Vi S2l0V2ViQ29udGV4dCogY29udGV4dCwgZ3VpbnQgbGltaXQpCit7CisgICAgZ19yZXR1cm5faWZf ZmFpbChXRUJLSVRfSVNfV0VCX0NPTlRFWFQoY29udGV4dCkpOworCisgICAgaWYgKGxpbWl0ID09 IGNvbnRleHQtPnByaXYtPmNvbnRleHQtPmNvbmZpZ3VyYXRpb24oKS5tYXhpbXVtUHJvY2Vzc0Nv dW50KCkpCisgICAgICAgIHJldHVybjsKKworICAgIGNvbnRleHQtPnByaXYtPmNvbnRleHQtPnNl dE1heGltdW1OdW1iZXJPZlByb2Nlc3NlcyhsaW1pdCk7Cit9CisKKy8qKgorICogd2Via2l0X3dl Yl9jb250ZXh0X2dldF93ZWJfcHJvY2Vzc19jb3VudF9saW1pdDoKKyAqIEBjb250ZXh0OiB0aGUg I1dlYktpdFdlYkNvbnRleHQKKyAqCisgKiBHZXRzIHRoZSBtYXhpbXVtIG51bWJlciBvZiB3ZWIg cHJvY2Vzc2VzIHRoYXQgY2FuIGJlIGNyZWF0ZWQgYXQgdGhlIHNhbWUgdGltZSBmb3IgdGhlIEBj b250ZXh0LgorICoKKyAqIFJldHVybnM6IHRoZSBtYXhpbXVtIGxpbWl0IG9mIHdlYiBwcm9jZXNz ZXMsIG9yIDAgaWYgdGhlcmUgaXNuJ3QgYSBsaW1pdC4KKyAqCisgKiBTaW5jZTogMi4xMAorICov CitndWludCB3ZWJraXRfd2ViX2NvbnRleHRfZ2V0X3dlYl9wcm9jZXNzX2NvdW50X2xpbWl0KFdl YktpdFdlYkNvbnRleHQqIGNvbnRleHQpCit7CisgICAgZ19yZXR1cm5fdmFsX2lmX2ZhaWwoV0VC S0lUX0lTX1dFQl9DT05URVhUKGNvbnRleHQpLCAwKTsKKworICAgIHJldHVybiBjb250ZXh0LT5w cml2LT5jb250ZXh0LT5jb25maWd1cmF0aW9uKCkubWF4aW11bVByb2Nlc3NDb3VudCgpOworfQor CiBXZWJLaXREb3dubG9hZCogd2Via2l0V2ViQ29udGV4dEdldE9yQ3JlYXRlRG93bmxvYWQoRG93 bmxvYWRQcm94eSogZG93bmxvYWRQcm94eSkKIHsKICAgICBHUmVmUHRyPFdlYktpdERvd25sb2Fk PiBkb3dubG9hZCA9IGRvd25sb2Fkc01hcCgpLmdldChkb3dubG9hZFByb3h5KTsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYkNvbnRleHQuaCBi L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYkNvbnRleHQuaAppbmRl eCA0ZGE0NWQ5Li5jZDU1NDg2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL2d0ay9XZWJLaXRXZWJDb250ZXh0LmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9ndGsvV2ViS2l0V2ViQ29udGV4dC5oCkBAIC0xNjIsNiArMTYyLDEzIEBAIFdFQktJVF9B UEkgV2ViS2l0Q2FjaGVNb2RlbAogd2Via2l0X3dlYl9jb250ZXh0X2dldF9jYWNoZV9tb2RlbCAg ICAgICAgICAgICAgICAgIChXZWJLaXRXZWJDb250ZXh0ICAgICAgICAgICAgICAqY29udGV4dCk7 CiAKIFdFQktJVF9BUEkgdm9pZAord2Via2l0X3dlYl9jb250ZXh0X3NldF93ZWJfcHJvY2Vzc19j b3VudF9saW1pdCAgICAgIChXZWJLaXRXZWJDb250ZXh0ICAgICAgICAgICAgICAqY29udGV4dCwK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZ3Vp bnQgICAgICAgICAgICAgICAgICAgICAgICAgIGxpbWl0KTsKKworV0VCS0lUX0FQSSBndWludAor d2Via2l0X3dlYl9jb250ZXh0X2dldF93ZWJfcHJvY2Vzc19jb3VudF9saW1pdCAgICAgIChXZWJL aXRXZWJDb250ZXh0ICAgICAgICAgICAgICAqY29udGV4dCk7CisKK1dFQktJVF9BUEkgdm9pZAog d2Via2l0X3dlYl9jb250ZXh0X2NsZWFyX2NhY2hlICAgICAgICAgICAgICAgICAgICAgIChXZWJL aXRXZWJDb250ZXh0ICAgICAgICAgICAgICAqY29udGV4dCk7CiAKIFdFQktJVF9BUEkgV2ViS2l0 RG93bmxvYWQgKgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsv ZG9jcy93ZWJraXQyZ3RrLTQuMC1zZWN0aW9ucy50eHQgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvQVBJL2d0ay9kb2NzL3dlYmtpdDJndGstNC4wLXNlY3Rpb25zLnR4dAppbmRleCAxOGQ4NjEx Li5jNmEyNWFjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9k b2NzL3dlYmtpdDJndGstNC4wLXNlY3Rpb25zLnR4dAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL2d0ay9kb2NzL3dlYmtpdDJndGstNC4wLXNlY3Rpb25zLnR4dApAQCAtMzMsNiAr MzMsOCBAQCB3ZWJraXRfd2ViX2NvbnRleHRfbmV3X3dpdGhfd2Vic2l0ZV9kYXRhX21hbmFnZXIK IHdlYmtpdF93ZWJfY29udGV4dF9nZXRfd2Vic2l0ZV9kYXRhX21hbmFnZXIKIHdlYmtpdF93ZWJf Y29udGV4dF9nZXRfY2FjaGVfbW9kZWwKIHdlYmtpdF93ZWJfY29udGV4dF9zZXRfY2FjaGVfbW9k ZWwKK3dlYmtpdF93ZWJfY29udGV4dF9nZXRfd2ViX3Byb2Nlc3NfY291bnRfbGltaXQKK3dlYmtp dF93ZWJfY29udGV4dF9zZXRfd2ViX3Byb2Nlc3NfY291bnRfbGltaXQKIHdlYmtpdF93ZWJfY29u dGV4dF9jbGVhcl9jYWNoZQogd2Via2l0X3dlYl9jb250ZXh0X2Rvd25sb2FkX3VyaQogd2Via2l0 X3dlYl9jb250ZXh0X2dldF9jb29raWVfbWFuYWdlcgpkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdl TG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IDljY2M2ZDcuLjNmMDI5NjYgMTAwNjQ0Ci0tLSBh L1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAor MjAxNS0wNy0yMiAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CisK KyAgICAgICAgW0dUS10gQWRkIEFQSSB0byBzZXQgdGhlIG1heGltdW0gbnVtYmVyIG9mIHdlYiBw cm9jZXNzZXMgcGVyIFdlYktpdFdlYkNvbnRleHQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTE0NzEwOAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIEFkZCB0ZXN0IGNhc2UgdG8gY2hlY2sgdGhlIHdlYiBwcm9j ZXNzIGxpbWl0LgorCisgICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXQyR3RrL1Rl c3RNdWx0aXByb2Nlc3MuY3BwOgorICAgICAgICAodGVzdFdlYlByb2Nlc3NMaW1pdCk6CisgICAg ICAgIChiZWZvcmVBbGwpOgorCiAyMDE1LTA3LTIyICBYYWJpZXIgUm9kcmlndWV6IENhbHZhciAg PGNhbHZhcmlzQGlnYWxpYS5jb20+CiAKICAgICAgICAgW2NoZWNrLXdlYmtpdC1zdHlsZV0gLmx1 dC5oIGZpbGVzIHNob3VsZG4ndCByYWlzZSBhIHNvcnRpbmcgaXNzdWUKZGlmZiAtLWdpdCBhL1Rv b2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Mkd0ay9UZXN0TXVsdGlwcm9jZXNzLmNwcCBi L1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Mkd0ay9UZXN0TXVsdGlwcm9jZXNzLmNw cAppbmRleCBlMzc4MzY5Li4wMjBhZDM1IDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJ L1Rlc3RzL1dlYktpdDJHdGsvVGVzdE11bHRpcHJvY2Vzcy5jcHAKKysrIGIvVG9vbHMvVGVzdFdl YktpdEFQSS9UZXN0cy9XZWJLaXQyR3RrL1Rlc3RNdWx0aXByb2Nlc3MuY3BwCkBAIC0yNDAsNiAr MjQwLDIyIEBAIHN0YXRpYyB2b2lkIHRlc3RNdWx0aXByb2Nlc3NXZWJWaWV3Q3JlYXRlUmVhZHlD bG9zZShVSUNsaWVudE11bHRpcHJvY2Vzc1Rlc3QqIHRlCiAgICAgZ19hc3NlcnRfY21wdWludCh0 ZXN0LT5tX2luaXRpYWxpemVXZWJFeHRlbnNpb25zU2lnbmFsQ291bnQsID09LCAxKTsKIH0KIAor c3RhdGljIHZvaWQgdGVzdFdlYlByb2Nlc3NMaW1pdChNdWx0aXByb2Nlc3NUZXN0KiB0ZXN0LCBn Y29uc3Rwb2ludGVyKQoreworICAgIGdfYXNzZXJ0X2NtcHVpbnQod2Via2l0X3dlYl9jb250ZXh0 X2dldF93ZWJfcHJvY2Vzc19jb3VudF9saW1pdCh0ZXN0LT5tX3dlYkNvbnRleHQuZ2V0KCkpLCA9 PSwgMCk7CisKKyAgICB3ZWJraXRfd2ViX2NvbnRleHRfc2V0X3dlYl9wcm9jZXNzX2NvdW50X2xp bWl0KHRlc3QtPm1fd2ViQ29udGV4dC5nZXQoKSwgMSk7CisgICAgZ19hc3NlcnRfY21wdWludCh3 ZWJraXRfd2ViX2NvbnRleHRfZ2V0X3dlYl9wcm9jZXNzX2NvdW50X2xpbWl0KHRlc3QtPm1fd2Vi Q29udGV4dC5nZXQoKSksID09LCAxKTsKKworICAgIC8vIENyZWF0ZSB0d28gd2ViIHZpZXdzIGJ1 dCB0aGVyZSBzaG91bGQgYmUgb25seSBvbmUgd2ViIHByb2Nlc3MuCisgICAgZm9yICh1bnNpZ25l ZCBpID0gMDsgaSA8IG51bVZpZXdzOyBpKyspIHsKKyAgICAgICAgdGVzdC0+bG9hZFdlYlZpZXdB bmRXYWl0VW50aWxMb2FkZWQoaSk7CisgICAgICAgIGdfYXNzZXJ0KFdFQktJVF9JU19XRUJfVklF Vyh0ZXN0LT5tX3dlYlZpZXdzW2ldLmdldCgpKSk7CisgICAgfQorCisgICAgZ19hc3NlcnRfY21w dWludCh0ZXN0LT5tX2luaXRpYWxpemVXZWJFeHRlbnNpb25zU2lnbmFsQ291bnQsID09LCAxKTsK K30KKwogdm9pZCBiZWZvcmVBbGwoKQogewogICAgIC8vIENoZWNrIHRoYXQgZGVmYXVsdCBzZXR0 aW5nIGlzIHRoZSBvbmUgc3RhdGVkIGluIHRoZSBkb2N1bWVudGF0aW9uCkBAIC0yNTksNiArMjc1 LDcgQEAgdm9pZCBiZWZvcmVBbGwoKQogCiAgICAgTXVsdGlwcm9jZXNzVGVzdDo6YWRkKCJXZWJL aXRXZWJDb250ZXh0IiwgInByb2Nlc3MtcGVyLXdlYi12aWV3IiwgdGVzdFByb2Nlc3NQZXJXZWJW aWV3KTsKICAgICBVSUNsaWVudE11bHRpcHJvY2Vzc1Rlc3Q6OmFkZCgiV2ViS2l0V2ViVmlldyIs ICJtdWx0aXByb2Nlc3MtY3JlYXRlLXJlYWR5LWNsb3NlIiwgdGVzdE11bHRpcHJvY2Vzc1dlYlZp ZXdDcmVhdGVSZWFkeUNsb3NlKTsKKyAgICBNdWx0aXByb2Nlc3NUZXN0OjphZGQoIldlYktpdFdl YkNvbnRleHQiLCAid2ViLXByb2Nlc3MtbGltaXQiLCB0ZXN0V2ViUHJvY2Vzc0xpbWl0KTsKIH0K IAogdm9pZCBhZnRlckFsbCgpCg==