131328 2014-04-07 17:09:24 -0700 bmalloc: rolled out the tryLock experiment 2014-04-07 17:12:40 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 ggaren ggaren oldest_to_newest 998307 0 ggaren 2014-04-07 17:09:24 -0700 bmalloc: rolled out the tryLock experiment 998309 1 228778 ggaren 2014-04-07 17:10:04 -0700 Created attachment 228778 Patch 998311 2 ggaren 2014-04-07 17:12:40 -0700 Committed r166897: <http://trac.webkit.org/changeset/166897> 228778 2014-04-07 17:10:04 -0700 2014-04-07 17:12:14 -0700 Patch bug-131328-20140407170943.patch text/plain 15856 ggaren SW5kZXg6IFNvdXJjZS9ibWFsbG9jL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvYm1h bGxvYy9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2Njg5NikKKysrIFNvdXJjZS9ibWFsbG9jL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMxIEBACisyMDE0LTA0LTA3ICBHZW9mZnJl eSBHYXJlbiAgPGdnYXJlbkBhcHBsZS5jb20+CisKKyAgICAgICAgYm1hbGxvYzogcm9sbGVkIG91 dCB0aGUgdHJ5TG9jayBleHBlcmltZW50CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xMzEzMjgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBJdCB3YXNuJ3QgYSBzcGVlZHVwLgorCisgICAgICAgICogYm1hbGxv Yy54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qOgorICAgICAgICAqIGJtYWxsb2MvQWxsb2NhdG9y LmNwcDoKKyAgICAgICAgKGJtYWxsb2M6OkFsbG9jYXRvcjo6cHJvY2Vzc1NtYWxsQWxsb2NhdG9y TG9nKToKKyAgICAgICAgKGJtYWxsb2M6OkFsbG9jYXRvcjo6cHJvY2Vzc01lZGl1bUFsbG9jYXRv ckxvZyk6CisgICAgICAgICogYm1hbGxvYy9EZWFsbG9jYXRvci5jcHA6CisgICAgICAgIChibWFs bG9jOjpEZWFsbG9jYXRvcjo6cHJvY2Vzc09iamVjdExvZyk6CisgICAgICAgIChibWFsbG9jOjpE ZWFsbG9jYXRvcjo6ZGVhbGxvY2F0ZVNsb3dDYXNlKToKKyAgICAgICAgKGJtYWxsb2M6OkRlYWxs b2NhdG9yOjpkZWFsbG9jYXRlU21hbGxMaW5lKToKKyAgICAgICAgKGJtYWxsb2M6OkRlYWxsb2Nh dG9yOjpkZWFsbG9jYXRlTWVkaXVtTGluZSk6CisgICAgICAgICogYm1hbGxvYy9EZWFsbG9jYXRv ci5oOgorICAgICAgICAoYm1hbGxvYzo6RGVhbGxvY2F0b3I6OmRlYWxsb2NhdGVGYXN0Q2FzZSk6 CisgICAgICAgICogYm1hbGxvYy9IZWFwLmg6CisgICAgICAgIChibWFsbG9jOjpIZWFwOjpkZWFs bG9jYXRlU21hbGxMaW5lKToKKyAgICAgICAgKGJtYWxsb2M6OkhlYXA6OmRlYWxsb2NhdGVNZWRp dW1MaW5lKToKKyAgICAgICAgKiBibWFsbG9jL0xpbmUuaDoKKyAgICAgICAgKGJtYWxsb2M6Okxp bmU8VHJhaXRzPjo6ZGVyZWYpOgorICAgICAgICAqIGJtYWxsb2MvUGFnZS5oOgorICAgICAgICAo Ym1hbGxvYzo6UGFnZTxUcmFpdHM+OjpkZXJlZik6CisKIDIwMTQtMDQtMDcgIEdlb2ZmcmV5IEdh cmVuICA8Z2dhcmVuQGFwcGxlLmNvbT4KIAogICAgICAgICBibWFsbG9jCkluZGV4OiBTb3VyY2Uv Ym1hbGxvYy9ibWFsbG9jLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL2JtYWxsb2MvYm1hbGxvYy54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCShyZXZpc2lv biAxNjY4OTMpCisrKyBTb3VyY2UvYm1hbGxvYy9ibWFsbG9jLnhjb2RlcHJvai9wcm9qZWN0LnBi eHByb2oJKHdvcmtpbmcgY29weSkKQEAgLTcsOSArNyw5IEBACiAJb2JqZWN0cyA9IHsKIAogLyog QmVnaW4gUEJYQnVpbGRGaWxlIHNlY3Rpb24gKi8KLQkJMTRDQzM5MDUxOEVBNjI3RDAwNEFGRTM0 IC8qIGJtYWxsb2MuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJl ZiA9IDE0Q0MzOTA0MThFQTYyN0QwMDRBRkUzNCAvKiBibWFsbG9jLmggKi87IHNldHRpbmdzID0g e0FUVFJJQlVURVMgPSAoUHJpdmF0ZSwgKTsgfTsgfTsKKwkJMTQ0OEMzMDAxOEYzNzU0NjAwNTAy ODM5IC8qIG1ibWFsbG9jLmNwcCBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsg ZmlsZVJlZiA9IDE0NDhDMkZGMThGMzc1NDMwMDUwMjgzOSAvKiBtYm1hbGxvYy5jcHAgKi87IH07 CisJCTE0NDhDMzAxMThGMzc1NEMwMDUwMjgzOSAvKiBibWFsbG9jLmggaW4gSGVhZGVycyAqLyA9 IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAxNDQ4QzJGRTE4RjM3NTQzMDA1MDI4Mzkg LyogYm1hbGxvYy5oICovOyBzZXR0aW5ncyA9IHtBVFRSSUJVVEVTID0gKFByaXZhdGUsICk7IH07 IH07CiAJCTE0Q0MzOTRDMThFQTg4NTgwMDRBRkUzNCAvKiBsaWJibWFsbG9jLmEgaW4gRnJhbWV3 b3JrcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAxNEYyNzFCRTE4RUEzOTYz MDA4QzE1MkYgLyogbGliYm1hbGxvYy5hICovOyB9OwotCQkxNEQyODY4OTE4RUI3NTlBMDAxMjQy MEUgLyogbWJtYWxsb2MuY3BwIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBm aWxlUmVmID0gMTREMjg2ODgxOEVCNzU5QTAwMTI0MjBFIC8qIG1ibWFsbG9jLmNwcCAqLzsgfTsK IAkJMTRGMjcxQzMxOEVBMzk3ODAwOEMxNTJGIC8qIEFsbG9jYXRvci5jcHAgaW4gU291cmNlcyAq LyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAxNDVGNjg1NTE3OURDOENBMDBENjU1 OTggLyogQWxsb2NhdG9yLmNwcCAqLzsgfTsKIAkJMTRGMjcxQzQxOEVBMzk3QjAwOEMxNTJGIC8q IENhY2hlLmNwcCBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9 IDE0NDQ2OUU0MTdBNDZCRkUwMEY5RUExRCAvKiBDYWNoZS5jcHAgKi87IH07CiAJCTE0RjI3MUM1 MThFQTM5N0UwMDhDMTUyRiAvKiBEZWFsbG9jYXRvci5jcHAgaW4gU291cmNlcyAqLyA9IHtpc2Eg PSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAxNDVGNjg1OTE3OURDOTAyMDBENjU1OTggLyogRGVh bGxvY2F0b3IuY3BwICovOyB9OwpAQCAtNDgsNiArNDgsOCBAQAogCQkxNDQ0NjlFNTE3QTQ2QkZF MDBGOUVBMUQgLyogQ2FjaGUuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5j b2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBsaW5lRW5kaW5n ID0gMDsgbmFtZSA9IENhY2hlLmg7IHBhdGggPSBibWFsbG9jL0NhY2hlLmg7IHNvdXJjZVRyZWUg PSAiPGdyb3VwPiI7IHhjTGFuZ3VhZ2VTcGVjaWZpY2F0aW9uSWRlbnRpZmllciA9IHhjb2RlLmxh bmcub2JqY3BwOyB9OwogCQkxNDQ0NjlGRDE3QTYxRjFGMDBGOUVBMUQgLyogUGVyVGhyZWFkLmgg Ki8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3du RmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgbGluZUVuZGluZyA9IDA7IG5hbWUgPSBQZXJUaHJl YWQuaDsgcGF0aCA9IGJtYWxsb2MvUGVyVGhyZWFkLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7 IHhjTGFuZ3VhZ2VTcGVjaWZpY2F0aW9uSWRlbnRpZmllciA9IHhjb2RlLmxhbmcub2JqY3BwOyB9 OwogCQkxNDQ0NkEwNzE3QTYxRkE0MDBGOUVBMUQgLyogUGVyUHJvY2Vzcy5oICovID0ge2lzYSA9 IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0g c291cmNlY29kZS5jLmg7IG5hbWUgPSBQZXJQcm9jZXNzLmg7IHBhdGggPSBibWFsbG9jL1BlclBy b2Nlc3MuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKKwkJMTQ0OEMyRkUxOEYzNzU0MzAw NTAyODM5IC8qIGJtYWxsb2MuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBsYXN0S25v d25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBuYW1lID0gYm1hbGxvYy5oOyBwYXRoID0gYm1h bGxvYy9ibWFsbG9jLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CisJCTE0NDhDMkZGMThG Mzc1NDMwMDUwMjgzOSAvKiBtYm1hbGxvYy5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5j ZTsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IG5hbWUgPSBtYm1hbGxv Yy5jcHA7IHBhdGggPSBibWFsbG9jL21ibWFsbG9jLmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+ IjsgfTsKIAkJMTQ0RENFRDYxN0E2NDlEOTAwOTNCMkYyIC8qIE11dGV4LmggKi8gPSB7aXNhID0g UEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBz b3VyY2Vjb2RlLmMuaDsgbmFtZSA9IE11dGV4Lmg7IHBhdGggPSBibWFsbG9jL011dGV4Lmg7IHNv dXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTE0NERDRUQ4MTdBNzI4NTcwMDkzQjJGMiAvKiBN dXRleC5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsg bGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IG5hbWUgPSBNdXRleC5jcHA7 IHBhdGggPSBibWFsbG9jL011dGV4LmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJ MTQ0RjdCRkIxOEJGQzUxNzAwMzUzN0YzIC8qIFZNSGVhcC5jcHAgKi8gPSB7aXNhID0gUEJYRmls ZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vj b2RlLmNwcC5jcHA7IG5hbWUgPSBWTUhlYXAuY3BwOyBwYXRoID0gYm1hbGxvYy9WTUhlYXAuY3Bw OyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwpAQCAtNzQsOSArNzYsNyBAQAogCQkxNDdBQUE5 NzE4Q0U1RkI2MDAyMjAxRTQgLyogU21hbGxUcmFpdHMuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVm ZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUu Yy5oOyBuYW1lID0gU21hbGxUcmFpdHMuaDsgcGF0aCA9IGJtYWxsb2MvU21hbGxUcmFpdHMuaDsg c291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJMTQ4NTY1NUUxOEE0M0FGOTAwRUQ2OTQyIC8q IEJvdW5kYXJ5VGFnLmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5n ID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgbmFtZSA9IEJvdW5kYXJ5 VGFnLmg7IHBhdGggPSBibWFsbG9jL0JvdW5kYXJ5VGFnLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3Vw PiI7IH07CiAJCTE0ODU2NTYwMThBNDNEQkEwMEVENjk0MiAvKiBPYmplY3RUeXBlLmggKi8gPSB7 aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5 cGUgPSBzb3VyY2Vjb2RlLmMuaDsgbmFtZSA9IE9iamVjdFR5cGUuaDsgcGF0aCA9IGJtYWxsb2Mv T2JqZWN0VHlwZS5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwotCQkxNENDMzkwNDE4RUE2 MjdEMDA0QUZFMzQgLyogYm1hbGxvYy5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZp bGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IG5hbWUg PSBibWFsbG9jLmg7IHBhdGggPSBibWFsbG9jL2JtYWxsb2MuaDsgc291cmNlVHJlZSA9IFNPVVJD RV9ST09UOyB9OwogCQkxNENDMzk0NDE4RUE4NzQzMDA0QUZFMzQgLyogbGlibWJtYWxsb2MuZHls aWIgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZXhwbGljaXRGaWxlVHlwZSA9ICJjb21w aWxlZC5tYWNoLW8uZHlsaWIiOyBpbmNsdWRlSW5JbmRleCA9IDA7IHBhdGggPSBsaWJtYm1hbGxv Yy5keWxpYjsgc291cmNlVHJlZSA9IEJVSUxUX1BST0RVQ1RTX0RJUjsgfTsKLQkJMTREMjg2ODgx OEVCNzU5QTAwMTI0MjBFIC8qIG1ibWFsbG9jLmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJl bmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3Bw LmNwcDsgbmFtZSA9IG1ibWFsbG9jLmNwcDsgcGF0aCA9IGJtYWxsb2MvbWJtYWxsb2MuY3BwOyBz b3VyY2VUcmVlID0gU09VUkNFX1JPT1Q7IH07CiAJCTE0RDlEQjQ1MTdGMjQ0NzEwMEVBQUI3OSAv KiBGaXhlZFZlY3Rvci5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGlu ZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IGxpbmVFbmRpbmcgPSAw OyBuYW1lID0gRml4ZWRWZWN0b3IuaDsgcGF0aCA9IGJtYWxsb2MvRml4ZWRWZWN0b3IuaDsgc291 cmNlVHJlZSA9ICI8Z3JvdXA+IjsgeGNMYW5ndWFnZVNwZWNpZmljYXRpb25JZGVudGlmaWVyID0g eGNvZGUubGFuZy5vYmpjcHA7IH07CiAJCTE0REEzMjA3MTg4NUY5RTYwMDcyNjlFMCAvKiBMaW5l LmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtu b3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgbGluZUVuZGluZyA9IDA7IG5hbWUgPSBMaW5l Lmg7IHBhdGggPSBibWFsbG9jL0xpbmUuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgeGNMYW5n dWFnZVNwZWNpZmljYXRpb25JZGVudGlmaWVyID0geGNvZGUubGFuZy5vYmpjcHA7IH07CiAJCTE0 REEzMjBDMTg4NzVCMDkwMDcyNjlFMCAvKiBIZWFwLmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVy ZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMu aDsgbmFtZSA9IEhlYXAuaDsgcGF0aCA9IGJtYWxsb2MvSGVhcC5oOyBzb3VyY2VUcmVlID0gIjxn cm91cD4iOyB9OwpAQCAtMTAzLDEwICsxMDMsMTkgQEAKIC8qIEVuZCBQQlhGcmFtZXdvcmtzQnVp bGRQaGFzZSBzZWN0aW9uICovCiAKIC8qIEJlZ2luIFBCWEdyb3VwIHNlY3Rpb24gKi8KKwkJMTQ0 OEMyRkQxOEYzNzUyQjAwNTAyODM5IC8qIGFwaSAqLyA9IHsKKwkJCWlzYSA9IFBCWEdyb3VwOwor CQkJY2hpbGRyZW4gPSAoCisJCQkJMTQ0OEMyRkUxOEYzNzU0MzAwNTAyODM5IC8qIGJtYWxsb2Mu aCAqLywKKwkJCQkxNDQ4QzJGRjE4RjM3NTQzMDA1MDI4MzkgLyogbWJtYWxsb2MuY3BwICovLAor CQkJKTsKKwkJCW5hbWUgPSBhcGk7CisJCQlzb3VyY2VUcmVlID0gIjxncm91cD4iOworCQl9Owog CQkxNDVGNjgzNjE3OURDNDVGMDBENjU1OTggPSB7CiAJCQlpc2EgPSBQQlhHcm91cDsKIAkJCWNo aWxkcmVuID0gKAotCQkJCTE0RjI3MUI3MThFQTI4NUIwMDhDMTUyRiAvKiBhcGkgKi8sCisJCQkJ MTQ0OEMyRkQxOEYzNzUyQjAwNTAyODM5IC8qIGFwaSAqLywKIAkJCQkxNEQ5REI0RDE3RjI4NjVD MDBFQUFCNzkgLyogY2FjaGUgKi8sCiAJCQkJMTQ3QUFBOUMxOENFNjAxMDAwMjIwMUU0IC8qIGhl YXA6IGxhcmdlIHwgeGxhcmdlICovLAogCQkJCTE0N0FBQTlBMThDRTVGRDMwMDIyMDFFNCAvKiBo ZWFwOiBzbWFsbCB8IG1lZGl1bSAqLywKQEAgLTIwNywxNiArMjE2LDYgQEAKIAkJCW5hbWUgPSBz dGRsaWI7CiAJCQlzb3VyY2VUcmVlID0gIjxncm91cD4iOwogCQl9OwotCQkxNEYyNzFCNzE4RUEy ODVCMDA4QzE1MkYgLyogYXBpICovID0gewotCQkJaXNhID0gUEJYR3JvdXA7Ci0JCQljaGlsZHJl biA9ICgKLQkJCQkxNENDMzkwNDE4RUE2MjdEMDA0QUZFMzQgLyogYm1hbGxvYy5oICovLAotCQkJ CTE0RDI4Njg4MThFQjc1OUEwMDEyNDIwRSAvKiBtYm1hbGxvYy5jcHAgKi8sCi0JCQkpOwotCQkJ bmFtZSA9IGFwaTsKLQkJCXBhdGggPSBpbWFsbG9jOwotCQkJc291cmNlVHJlZSA9ICI8Z3JvdXA+ IjsKLQkJfTsKIC8qIEVuZCBQQlhHcm91cCBzZWN0aW9uICovCiAKIC8qIEJlZ2luIFBCWEhlYWRl cnNCdWlsZFBoYXNlIHNlY3Rpb24gKi8KQEAgLTIzMSw3ICsyMzAsNyBAQAogCQkJaXNhID0gUEJY SGVhZGVyc0J1aWxkUGhhc2U7CiAJCQlidWlsZEFjdGlvbk1hc2sgPSAyMTQ3NDgzNjQ3OwogCQkJ ZmlsZXMgPSAoCi0JCQkJMTRDQzM5MDUxOEVBNjI3RDAwNEFGRTM0IC8qIGJtYWxsb2MuaCBpbiBI ZWFkZXJzICovLAorCQkJCTE0NDhDMzAxMThGMzc1NEMwMDUwMjgzOSAvKiBibWFsbG9jLmggaW4g SGVhZGVycyAqLywKIAkJCSk7CiAJCQlydW5Pbmx5Rm9yRGVwbG95bWVudFBvc3Rwcm9jZXNzaW5n ID0gMDsKIAkJfTsKQEAgLTMwNSw3ICszMDQsNyBAQAogCQkJaXNhID0gUEJYU291cmNlc0J1aWxk UGhhc2U7CiAJCQlidWlsZEFjdGlvbk1hc2sgPSAyMTQ3NDgzNjQ3OwogCQkJZmlsZXMgPSAoCi0J CQkJMTREMjg2ODkxOEVCNzU5QTAwMTI0MjBFIC8qIG1ibWFsbG9jLmNwcCBpbiBTb3VyY2VzICov LAorCQkJCTE0NDhDMzAwMThGMzc1NDYwMDUwMjgzOSAvKiBtYm1hbGxvYy5jcHAgaW4gU291cmNl cyAqLywKIAkJCSk7CiAJCQlydW5Pbmx5Rm9yRGVwbG95bWVudFBvc3Rwcm9jZXNzaW5nID0gMDsK IAkJfTsKSW5kZXg6IFNvdXJjZS9ibWFsbG9jL2JtYWxsb2MvQWxsb2NhdG9yLmNwcAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvYm1hbGxvYy9ibWFsbG9jL0FsbG9jYXRvci5jcHAJKHJldmlzaW9uIDE2 Njg5MykKKysrIFNvdXJjZS9ibWFsbG9jL2JtYWxsb2MvQWxsb2NhdG9yLmNwcAkod29ya2luZyBj b3B5KQpAQCAtNzUsOSArNzUsOSBAQCB2b2lkIEFsbG9jYXRvcjo6cHJvY2Vzc1NtYWxsQWxsb2Nh dG9yTG9nCiAgICAgc3RkOjpsb2NrX2d1YXJkPE11dGV4PiBsb2NrKFBlclByb2Nlc3M8SGVhcD46 Om11dGV4KCkpOwogCiAgICAgZm9yIChhdXRvJiBsb2dFbnRyeSA6IG1fc21hbGxBbGxvY2F0b3JM b2cpIHsKLSAgICAgICAgaWYgKCFsb2dFbnRyeS5maXJzdC0+ZGVyZWYobG9nRW50cnkuc2Vjb25k KSkKKyAgICAgICAgaWYgKCFsb2dFbnRyeS5maXJzdC0+ZGVyZWYobG9jaywgbG9nRW50cnkuc2Vj b25kKSkKICAgICAgICAgICAgIGNvbnRpbnVlOwotICAgICAgICBtX2RlYWxsb2NhdG9yLmRlYWxs b2NhdGVTbWFsbExpbmUobG9nRW50cnkuZmlyc3QpOworICAgICAgICBtX2RlYWxsb2NhdG9yLmRl YWxsb2NhdGVTbWFsbExpbmUobG9jaywgbG9nRW50cnkuZmlyc3QpOwogICAgIH0KICAgICBtX3Nt YWxsQWxsb2NhdG9yTG9nLmNsZWFyKCk7CiB9CkBAIC05OCw5ICs5OCw5IEBAIHZvaWQgQWxsb2Nh dG9yOjpwcm9jZXNzTWVkaXVtQWxsb2NhdG9yTG8KICAgICBzdGQ6OmxvY2tfZ3VhcmQ8TXV0ZXg+ IGxvY2soUGVyUHJvY2VzczxIZWFwPjo6bXV0ZXgoKSk7CiAKICAgICBmb3IgKGF1dG8mIGxvZ0Vu dHJ5IDogbV9tZWRpdW1BbGxvY2F0b3JMb2cpIHsKLSAgICAgICAgaWYgKCFsb2dFbnRyeS5maXJz dC0+ZGVyZWYobG9nRW50cnkuc2Vjb25kKSkKKyAgICAgICAgaWYgKCFsb2dFbnRyeS5maXJzdC0+ ZGVyZWYobG9jaywgbG9nRW50cnkuc2Vjb25kKSkKICAgICAgICAgICAgIGNvbnRpbnVlOwotICAg ICAgICBtX2RlYWxsb2NhdG9yLmRlYWxsb2NhdGVNZWRpdW1MaW5lKGxvZ0VudHJ5LmZpcnN0KTsK KyAgICAgICAgbV9kZWFsbG9jYXRvci5kZWFsbG9jYXRlTWVkaXVtTGluZShsb2NrLCBsb2dFbnRy eS5maXJzdCk7CiAgICAgfQogICAgIG1fbWVkaXVtQWxsb2NhdG9yTG9nLmNsZWFyKCk7CiB9Cklu ZGV4OiBTb3VyY2UvYm1hbGxvYy9ibWFsbG9jL0RlYWxsb2NhdG9yLmNwcAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvYm1hbGxvYy9ibWFsbG9jL0RlYWxsb2NhdG9yLmNwcAkocmV2aXNpb24gMTY2ODkz KQorKysgU291cmNlL2JtYWxsb2MvYm1hbGxvYy9EZWFsbG9jYXRvci5jcHAJKHdvcmtpbmcgY29w eSkKQEAgLTY1LDE4ICs2NSwyMCBAQCB2b2lkIERlYWxsb2NhdG9yOjpkZWFsbG9jYXRlWExhcmdl KHZvaWQqCiAKIHZvaWQgRGVhbGxvY2F0b3I6OnByb2Nlc3NPYmplY3RMb2coKQogeworICAgIHN0 ZDo6bG9ja19ndWFyZDxNdXRleD4gbG9jayhQZXJQcm9jZXNzPEhlYXA+OjptdXRleCgpKTsKKyAg ICAKICAgICBmb3IgKGF1dG8gb2JqZWN0IDogbV9vYmplY3RMb2cpIHsKICAgICAgICAgaWYgKGlz U21hbGwob2JqZWN0KSkgewogICAgICAgICAgICAgU21hbGxMaW5lKiBsaW5lID0gU21hbGxMaW5l OjpnZXQob2JqZWN0KTsKLSAgICAgICAgICAgIGlmICghbGluZS0+ZGVyZWYoKSkKKyAgICAgICAg ICAgIGlmICghbGluZS0+ZGVyZWYobG9jaykpCiAgICAgICAgICAgICAgICAgY29udGludWU7Ci0g ICAgICAgICAgICBkZWFsbG9jYXRlU21hbGxMaW5lKGxpbmUpOworICAgICAgICAgICAgZGVhbGxv Y2F0ZVNtYWxsTGluZShsb2NrLCBsaW5lKTsKICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAg IEFTU0VSVChpc1NtYWxsT3JNZWRpdW0ob2JqZWN0KSk7CiAgICAgICAgICAgICBNZWRpdW1MaW5l KiBsaW5lID0gTWVkaXVtTGluZTo6Z2V0KG9iamVjdCk7Ci0gICAgICAgICAgICBpZiAoIWxpbmUt PmRlcmVmKCkpCisgICAgICAgICAgICBpZiAoIWxpbmUtPmRlcmVmKGxvY2spKQogICAgICAgICAg ICAgICAgIGNvbnRpbnVlOwotICAgICAgICAgICAgZGVhbGxvY2F0ZU1lZGl1bUxpbmUobGluZSk7 CisgICAgICAgICAgICBkZWFsbG9jYXRlTWVkaXVtTGluZShsb2NrLCBsaW5lKTsKICAgICAgICAg fQogICAgIH0KICAgICAKQEAgLTkxLDE3ICs5Myw3IEBAIHZvaWQgRGVhbGxvY2F0b3I6OmRlYWxs b2NhdGVTbG93Q2FzZSh2b2kKICAgICAgICAgcmV0dXJuOwogCiAgICAgaWYgKGlzU21hbGxPck1l ZGl1bShvYmplY3QpKSB7Ci0gICAgICAgIHN0ZDo6dW5pcXVlX2xvY2s8TXV0ZXg+IGxvY2soUGVy UHJvY2VzczxIZWFwPjo6bXV0ZXgoKSwgc3RkOjpkZWZlcl9sb2NrKTsKLSAgICAgICAgYm9vbCBk aWRMb2NrOwotICAgICAgICBpZiAobV9vYmplY3RMb2cuc2l6ZSgpID09IG1fb2JqZWN0TG9nLmNh cGFjaXR5KCkpIHsKLSAgICAgICAgICAgIGRpZExvY2sgPSB0cnVlOwotICAgICAgICAgICAgbG9j ay5sb2NrKCk7Ci0gICAgICAgIH0gZWxzZQotICAgICAgICAgICAgZGlkTG9jayA9IGxvY2sudHJ5 X2xvY2soKTsKLSAgICAgICAgCi0gICAgICAgIGlmIChkaWRMb2NrKQotICAgICAgICAgICAgcHJv Y2Vzc09iamVjdExvZygpOwotICAgICAgICAKKyAgICAgICAgcHJvY2Vzc09iamVjdExvZygpOwog ICAgICAgICBtX29iamVjdExvZy5wdXNoKG9iamVjdCk7CiAgICAgICAgIHJldHVybjsKICAgICB9 CkBAIC0xMTMsMTAgKzEwNSwxMCBAQCB2b2lkIERlYWxsb2NhdG9yOjpkZWFsbG9jYXRlU2xvd0Nh c2Uodm9pCiAgICAgcmV0dXJuIGRlYWxsb2NhdGVYTGFyZ2Uob2JqZWN0KTsKIH0KIAotdm9pZCBE ZWFsbG9jYXRvcjo6ZGVhbGxvY2F0ZVNtYWxsTGluZShTbWFsbExpbmUqIGxpbmUpCit2b2lkIERl YWxsb2NhdG9yOjpkZWFsbG9jYXRlU21hbGxMaW5lKHN0ZDo6bG9ja19ndWFyZDxNdXRleD4mIGxv Y2ssIFNtYWxsTGluZSogbGluZSkKIHsKICAgICBpZiAobV9zbWFsbExpbmVDYWNoZS5zaXplKCkg PT0gbV9zbWFsbExpbmVDYWNoZS5jYXBhY2l0eSgpKQotICAgICAgICByZXR1cm4gUGVyUHJvY2Vz czxIZWFwPjo6Z2V0RmFzdENhc2UoKS0+ZGVhbGxvY2F0ZVNtYWxsTGluZShsaW5lKTsKKyAgICAg ICAgcmV0dXJuIFBlclByb2Nlc3M8SGVhcD46OmdldEZhc3RDYXNlKCktPmRlYWxsb2NhdGVTbWFs bExpbmUobG9jaywgbGluZSk7CiAKICAgICBtX3NtYWxsTGluZUNhY2hlLnB1c2gobGluZSk7CiB9 CkBAIC0xMzQsMTAgKzEyNiwxMCBAQCBTbWFsbExpbmUqIERlYWxsb2NhdG9yOjphbGxvY2F0ZVNt YWxsTGluCiAgICAgcmV0dXJuIG1fc21hbGxMaW5lQ2FjaGUucG9wKCk7CiB9CiAKLXZvaWQgRGVh bGxvY2F0b3I6OmRlYWxsb2NhdGVNZWRpdW1MaW5lKE1lZGl1bUxpbmUqIGxpbmUpCit2b2lkIERl YWxsb2NhdG9yOjpkZWFsbG9jYXRlTWVkaXVtTGluZShzdGQ6OmxvY2tfZ3VhcmQ8TXV0ZXg+JiBs b2NrLCBNZWRpdW1MaW5lKiBsaW5lKQogewogICAgIGlmIChtX21lZGl1bUxpbmVDYWNoZS5zaXpl KCkgPT0gbV9tZWRpdW1MaW5lQ2FjaGUuY2FwYWNpdHkoKSkKLSAgICAgICAgcmV0dXJuIFBlclBy b2Nlc3M8SGVhcD46OmdldEZhc3RDYXNlKCktPmRlYWxsb2NhdGVNZWRpdW1MaW5lKGxpbmUpOwor ICAgICAgICByZXR1cm4gUGVyUHJvY2VzczxIZWFwPjo6Z2V0RmFzdENhc2UoKS0+ZGVhbGxvY2F0 ZU1lZGl1bUxpbmUobG9jaywgbGluZSk7CiAKICAgICBtX21lZGl1bUxpbmVDYWNoZS5wdXNoKGxp bmUpOwogfQpJbmRleDogU291cmNlL2JtYWxsb2MvYm1hbGxvYy9EZWFsbG9jYXRvci5oCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9ibWFsbG9jL2JtYWxsb2MvRGVhbGxvY2F0b3IuaAkocmV2aXNpb24g MTY2ODkzKQorKysgU291cmNlL2JtYWxsb2MvYm1hbGxvYy9EZWFsbG9jYXRvci5oCSh3b3JraW5n IGNvcHkpCkBAIC00NCwxMCArNDQsMTAgQEAgcHVibGljOgogICAgIGJvb2wgZGVhbGxvY2F0ZUZh c3RDYXNlKHZvaWQqKTsKICAgICB2b2lkIGRlYWxsb2NhdGVTbG93Q2FzZSh2b2lkKik7CiAKLSAg ICB2b2lkIGRlYWxsb2NhdGVTbWFsbExpbmUoU21hbGxMaW5lKik7CisgICAgdm9pZCBkZWFsbG9j YXRlU21hbGxMaW5lKHN0ZDo6bG9ja19ndWFyZDxNdXRleD4mLCBTbWFsbExpbmUqKTsKICAgICBT bWFsbExpbmUqIGFsbG9jYXRlU21hbGxMaW5lKCk7CiAKLSAgICB2b2lkIGRlYWxsb2NhdGVNZWRp dW1MaW5lKE1lZGl1bUxpbmUqKTsKKyAgICB2b2lkIGRlYWxsb2NhdGVNZWRpdW1MaW5lKHN0ZDo6 bG9ja19ndWFyZDxNdXRleD4mLCBNZWRpdW1MaW5lKik7CiAgICAgTWVkaXVtTGluZSogYWxsb2Nh dGVNZWRpdW1MaW5lKCk7CiAKIHByaXZhdGU6CkBAIC02Nyw3ICs2Nyw3IEBAIGlubGluZSBib29s IERlYWxsb2NhdG9yOjpkZWFsbG9jYXRlRmFzdEMKIAogICAgIEFTU0VSVChvYmplY3QpOwogCi0g ICAgaWYgKCEobV9vYmplY3RMb2cuc2l6ZSgpICUgKG1fb2JqZWN0TG9nLmNhcGFjaXR5KCkgLyA0 KSkpCisgICAgaWYgKG1fb2JqZWN0TG9nLnNpemUoKSA9PSBtX29iamVjdExvZy5jYXBhY2l0eSgp KQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICBtX29iamVjdExvZy5wdXNoKG9iamVjdCk7 CkluZGV4OiBTb3VyY2UvYm1hbGxvYy9ibWFsbG9jL0hlYXAuaAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvYm1hbGxvYy9ibWFsbG9jL0hlYXAuaAkocmV2aXNpb24gMTY2ODkzKQorKysgU291cmNlL2Jt YWxsb2MvYm1hbGxvYy9IZWFwLmgJKHdvcmtpbmcgY29weSkKQEAgLTUwLDEwICs1MCwxMCBAQCBw dWJsaWM6CiAgICAgSGVhcChzdGQ6OmxvY2tfZ3VhcmQ8TXV0ZXg+Jik7CiAgICAgCiAgICAgU21h bGxMaW5lKiBhbGxvY2F0ZVNtYWxsTGluZShzdGQ6OmxvY2tfZ3VhcmQ8TXV0ZXg+Jik7Ci0gICAg dm9pZCBkZWFsbG9jYXRlU21hbGxMaW5lKFNtYWxsTGluZSopOworICAgIHZvaWQgZGVhbGxvY2F0 ZVNtYWxsTGluZShzdGQ6OmxvY2tfZ3VhcmQ8TXV0ZXg+JiwgU21hbGxMaW5lKik7CiAKICAgICBN ZWRpdW1MaW5lKiBhbGxvY2F0ZU1lZGl1bUxpbmUoc3RkOjpsb2NrX2d1YXJkPE11dGV4PiYpOwot ICAgIHZvaWQgZGVhbGxvY2F0ZU1lZGl1bUxpbmUoTWVkaXVtTGluZSopOworICAgIHZvaWQgZGVh bGxvY2F0ZU1lZGl1bUxpbmUoc3RkOjpsb2NrX2d1YXJkPE11dGV4PiYsIE1lZGl1bUxpbmUqKTsK ICAgICAKICAgICB2b2lkKiBhbGxvY2F0ZUxhcmdlKHN0ZDo6bG9ja19ndWFyZDxNdXRleD4mLCBz aXplX3QpOwogICAgIHZvaWQgZGVhbGxvY2F0ZUxhcmdlKHN0ZDo6bG9ja19ndWFyZDxNdXRleD4m LCB2b2lkKik7CkBAIC05NCwxMCArOTQsMTAgQEAgcHJpdmF0ZToKICAgICBBc3luY1Rhc2s8SGVh cCwgZGVjbHR5cGUoJkhlYXA6OmNvbmN1cnJlbnRTY2F2ZW5nZSk+IG1fc2NhdmVuZ2VyOwogfTsK IAotaW5saW5lIHZvaWQgSGVhcDo6ZGVhbGxvY2F0ZVNtYWxsTGluZShTbWFsbExpbmUqIGxpbmUp CitpbmxpbmUgdm9pZCBIZWFwOjpkZWFsbG9jYXRlU21hbGxMaW5lKHN0ZDo6bG9ja19ndWFyZDxN dXRleD4mIGxvY2ssIFNtYWxsTGluZSogbGluZSkKIHsKICAgICBTbWFsbFBhZ2UqIHBhZ2UgPSBT bWFsbFBhZ2U6OmdldChsaW5lKTsKLSAgICBpZiAocGFnZS0+ZGVyZWYoKSkgeworICAgIGlmIChw YWdlLT5kZXJlZihsb2NrKSkgewogICAgICAgICBtX3NtYWxsUGFnZXMucHVzaChwYWdlKTsKICAg ICAgICAgbV9zY2F2ZW5nZXIucnVuKCk7CiAgICAgICAgIHJldHVybjsKQEAgLTExOSwxMCArMTE5 LDEwIEBAIGlubGluZSBTbWFsbExpbmUqIEhlYXA6OmFsbG9jYXRlU21hbGxMaW4KICAgICByZXR1 cm4gYWxsb2NhdGVTbWFsbExpbmVTbG93Q2FzZShsb2NrKTsKIH0KIAotaW5saW5lIHZvaWQgSGVh cDo6ZGVhbGxvY2F0ZU1lZGl1bUxpbmUoTWVkaXVtTGluZSogbGluZSkKK2lubGluZSB2b2lkIEhl YXA6OmRlYWxsb2NhdGVNZWRpdW1MaW5lKHN0ZDo6bG9ja19ndWFyZDxNdXRleD4mIGxvY2ssIE1l ZGl1bUxpbmUqIGxpbmUpCiB7CiAgICAgTWVkaXVtUGFnZSogcGFnZSA9IE1lZGl1bVBhZ2U6Omdl dChsaW5lKTsKLSAgICBpZiAocGFnZS0+ZGVyZWYoKSkgeworICAgIGlmIChwYWdlLT5kZXJlZihs b2NrKSkgewogICAgICAgICBtX21lZGl1bVBhZ2VzLnB1c2gocGFnZSk7CiAgICAgICAgIG1fc2Nh dmVuZ2VyLnJ1bigpOwogICAgICAgICByZXR1cm47CkluZGV4OiBTb3VyY2UvYm1hbGxvYy9ibWFs bG9jL0xpbmUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvYm1hbGxvYy9ibWFsbG9jL0xpbmUuaAko cmV2aXNpb24gMTY2ODkzKQorKysgU291cmNlL2JtYWxsb2MvYm1hbGxvYy9MaW5lLmgJKHdvcmtp bmcgY29weSkKQEAgLTQ2LDcgKzQ2LDcgQEAgcHVibGljOgogICAgIHN0YXRpYyBMaW5lKiBnZXQo dm9pZCopOwogCiAgICAgdm9pZCBjb25jdXJyZW50UmVmKHVuc2lnbmVkIGNoYXIgPSAxKTsKLSAg ICBib29sIGRlcmVmKHVuc2lnbmVkIGNoYXIgPSAxKTsKKyAgICBib29sIGRlcmVmKHN0ZDo6bG9j a19ndWFyZDxNdXRleD4mLCB1bnNpZ25lZCBjaGFyID0gMSk7CiAgICAgCiAgICAgY2hhciogYmVn aW4oKTsKICAgICBjaGFyKiBlbmQoKTsKQEAgLTg4LDcgKzg4LDcgQEAgaW5saW5lIHZvaWQgTGlu ZTxUcmFpdHM+Ojpjb25jdXJyZW50UmVmKAogfQogCiB0ZW1wbGF0ZTxjbGFzcyBUcmFpdHM+Ci1p bmxpbmUgYm9vbCBMaW5lPFRyYWl0cz46OmRlcmVmKHVuc2lnbmVkIGNoYXIgY291bnQpCitpbmxp bmUgYm9vbCBMaW5lPFRyYWl0cz46OmRlcmVmKHN0ZDo6bG9ja19ndWFyZDxNdXRleD4mLCB1bnNp Z25lZCBjaGFyIGNvdW50KQogewogICAgIEFTU0VSVChjb3VudCA8PSBtX3JlZkNvdW50KTsKICAg ICBtX3JlZkNvdW50IC09IGNvdW50OwpJbmRleDogU291cmNlL2JtYWxsb2MvYm1hbGxvYy9QYWdl LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL2JtYWxsb2MvYm1hbGxvYy9QYWdlLmgJKHJldmlzaW9u IDE2Njg5MykKKysrIFNvdXJjZS9ibWFsbG9jL2JtYWxsb2MvUGFnZS5oCSh3b3JraW5nIGNvcHkp CkBAIC00Niw3ICs0Niw3IEBAIHB1YmxpYzoKICAgICBzdGF0aWMgUGFnZSogZ2V0KExpbmUqKTsK IAogICAgIHZvaWQgcmVmKHN0ZDo6bG9ja19ndWFyZDxNdXRleD4mKTsKLSAgICBib29sIGRlcmVm KCk7CisgICAgYm9vbCBkZXJlZihzdGQ6OmxvY2tfZ3VhcmQ8TXV0ZXg+Jik7CiAgICAgdW5zaWdu ZWQgcmVmQ291bnQoc3RkOjpsb2NrX2d1YXJkPE11dGV4PiYpOwogICAgIAogICAgIExpbmUqIGJl Z2luKCk7CkBAIC02NCw3ICs2NCw3IEBAIGlubGluZSB2b2lkIFBhZ2U8VHJhaXRzPjo6cmVmKHN0 ZDo6bG9ja18KIH0KIAogdGVtcGxhdGU8dHlwZW5hbWUgVHJhaXRzPgotaW5saW5lIGJvb2wgUGFn ZTxUcmFpdHM+OjpkZXJlZigpCitpbmxpbmUgYm9vbCBQYWdlPFRyYWl0cz46OmRlcmVmKHN0ZDo6 bG9ja19ndWFyZDxNdXRleD4mKQogewogICAgIEFTU0VSVChtX3JlZkNvdW50KTsKICAgICAtLW1f cmVmQ291bnQ7Cg==