37937 2010-04-21 11:36:21 -0700 Wean JavaScriptCore off calls to isMainThread() 2010-04-21 13:59:33 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 sam webkit-unassigned oldest_to_newest 215427 0 sam 2010-04-21 11:36:21 -0700 JavaScriptCore should be weaned off isMainThread(). 215429 1 53976 sam 2010-04-21 11:39:38 -0700 Created attachment 53976 patch (not for review) Putting up patch to let the EWS try it out. 215473 2 53976 ggaren 2010-04-21 13:37:26 -0700 Comment on attachment 53976 patch (not for review) r=me 215489 3 sam 2010-04-21 13:59:33 -0700 Fixed in r58012. 53976 2010-04-21 11:39:38 -0700 2010-04-21 13:37:26 -0700 patch (not for review) patch.diff text/plain 16067 sam SW5kZXg6IEphdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBKYXZhU2NyaXB0 Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDU3OTk0KQorKysgSmF2YVNjcmlwdENvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMzUgQEAKKzIwMTAtMDQtMjEgIFNhbSBXZWlu aWcgIDxzYW1Ad2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBGaXggZm9yIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0zNzkzNworICAgICAgICBXZWFuIEphdmFTY3JpcHRDb3JlIG9mZiBjYWxscyB0byBpc01h aW5UaHJlYWQoKQorCisgICAgICAgICogQVBJL0pTQ29udGV4dFJlZi5jcHA6CisgICAgICAgIChK U0NvbnRleHRHcm91cENyZWF0ZSk6CisgICAgICAgICogSmF2YVNjcmlwdENvcmUuZXhwOgorICAg ICAgICAqIGludGVycHJldGVyL0ludGVycHJldGVyLmNwcDoKKyAgICAgICAgKEpTQzo6SW50ZXJw cmV0ZXI6OmV4ZWN1dGUpOgorICAgICAgICAoSlNDOjpJbnRlcnByZXRlcjo6cHJlcGFyZUZvclJl cGVhdENhbGwpOgorICAgICAgICAqIGludGVycHJldGVyL0ludGVycHJldGVyLmg6CisgICAgICAg IChKU0M6Oik6CisgICAgICAgICoganNjLmNwcDoKKyAgICAgICAgKG1haW4pOgorICAgICAgICAq IHJ1bnRpbWUvQXJyYXlQcm90b3R5cGUuY3BwOgorICAgICAgICAoSlNDOjphcnJheVByb3RvRnVu Y1RvU3RyaW5nKToKKyAgICAgICAgKEpTQzo6YXJyYXlQcm90b0Z1bmNUb0xvY2FsZVN0cmluZyk6 CisgICAgICAgIChKU0M6OmFycmF5UHJvdG9GdW5jSm9pbik6CisgICAgICAgICogcnVudGltZS9D b2xsZWN0b3IuY3BwOgorICAgICAgICAoSlNDOjpIZWFwOjpyZWdpc3RlclRocmVhZCk6CisgICAg ICAgICogcnVudGltZS9KU0dsb2JhbERhdGEuY3BwOgorICAgICAgICAoSlNDOjpKU0dsb2JhbERh dGE6OkpTR2xvYmFsRGF0YSk6CisgICAgICAgIChKU0M6OkpTR2xvYmFsRGF0YTo6Y3JlYXRlTm9u RGVmYXVsdCk6CisgICAgICAgIChKU0M6OkpTR2xvYmFsRGF0YTo6Y3JlYXRlKToKKyAgICAgICAg KEpTQzo6SlNHbG9iYWxEYXRhOjpjcmVhdGVMZWFrZWQpOgorICAgICAgICAoSlNDOjpKU0dsb2Jh bERhdGE6OnNoYXJlZEluc3RhbmNlKToKKyAgICAgICAgKiBydW50aW1lL0pTR2xvYmFsRGF0YS5o OgorICAgICAgICAoSlNDOjopOgorCiAyMDEwLTA0LTIxICBQYXRyaWNrIEdhbnN0ZXJlciAgPHBh cm9nYUBwYXJvZ2EuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERhcmluIEFkbGVyLgpJbmRl eDogSmF2YVNjcmlwdENvcmUvSmF2YVNjcmlwdENvcmUuZXhwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIEphdmFT Y3JpcHRDb3JlL0phdmFTY3JpcHRDb3JlLmV4cAkocmV2aXNpb24gNTc5OTQpCisrKyBKYXZhU2Ny aXB0Q29yZS9KYXZhU2NyaXB0Q29yZS5leHAJKHdvcmtpbmcgY29weSkKQEAgLTEyNCwxNCArMTI0 LDE0IEBAIF9fWk4zSlNDMTJEYXRlSW5zdGFuY2VDMUVQTlNfOUV4ZWNTdGF0ZUUKIF9fWk4zSlND MTJEYXRlSW5zdGFuY2VDMUVQTlNfOUV4ZWNTdGF0ZUVkCiBfX1pOM0pTQzEySlNHbG9iYWxEYXRh MTBDbGllbnREYXRhRDJFdgogX19aTjNKU0MxMkpTR2xvYmFsRGF0YTExanNBcnJheVZQdHJFCi1f X1pOM0pTQzEySlNHbG9iYWxEYXRhMTJjcmVhdGVMZWFrZWRFdgorX19aTjNKU0MxMkpTR2xvYmFs RGF0YTEyY3JlYXRlTGVha2VkRU5TXzE1VGhyZWFkU3RhY2tUeXBlRQogX19aTjNKU0MxMkpTR2xv YmFsRGF0YTEyanNTdHJpbmdWUHRyRQogX19aTjNKU0MxMkpTR2xvYmFsRGF0YTEyc3RvcFNhbXBs aW5nRXYKIF9fWk4zSlNDMTJKU0dsb2JhbERhdGExM3N0YXJ0U2FtcGxpbmdFdgogX19aTjNKU0Mx MkpTR2xvYmFsRGF0YTE0ZHVtcFNhbXBsZURhdGFFUE5TXzlFeGVjU3RhdGVFCiBfX1pOM0pTQzEy SlNHbG9iYWxEYXRhMTRyZXNldERhdGVDYWNoZUV2CiBfX1pOM0pTQzEySlNHbG9iYWxEYXRhMTRz aGFyZWRJbnN0YW5jZUV2Ci1fX1pOM0pTQzEySlNHbG9iYWxEYXRhNmNyZWF0ZUV2CitfX1pOM0pT QzEySlNHbG9iYWxEYXRhNmNyZWF0ZUVOU18xNVRocmVhZFN0YWNrVHlwZUUKIF9fWk4zSlNDMTJK U0dsb2JhbERhdGFEMUV2CiBfX1pOM0pTQzEyU2FtcGxpbmdUb29sNXNldHVwRXYKIF9fWk4zSlND MTJTbWFsbFN0cmluZ3MxN2NyZWF0ZUVtcHR5U3RyaW5nRVBOU18xMkpTR2xvYmFsRGF0YUUKSW5k ZXg6IEphdmFTY3JpcHRDb3JlL2pzYy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gSmF2YVNjcmlwdENvcmUv anNjLmNwcAkocmV2aXNpb24gNTc5OTQpCisrKyBKYXZhU2NyaXB0Q29yZS9qc2MuY3BwCSh3b3Jr aW5nIGNvcHkpCkBAIC0zNDYsNyArMzQ2LDcgQEAgaW50IG1haW4oaW50IGFyZ2MsIGNoYXIqKiBh cmd2KQogICAgIC8vIFdlIGNhbid0IHVzZSBkZXN0cnVjdG9ycyBpbiB0aGUgZm9sbG93aW5nIGNv ZGUgYmVjYXVzZSBpdCB1c2VzIFdpbmRvd3MKICAgICAvLyBTdHJ1Y3R1cmVkIEV4Y2VwdGlvbiBI YW5kbGluZwogICAgIGludCByZXMgPSAwOwotICAgIEpTR2xvYmFsRGF0YSogZ2xvYmFsRGF0YSA9 IEpTR2xvYmFsRGF0YTo6Y3JlYXRlKCkucmVsZWFzZVJlZigpOworICAgIEpTR2xvYmFsRGF0YSog Z2xvYmFsRGF0YSA9IEpTR2xvYmFsRGF0YTo6Y3JlYXRlKFRocmVhZFN0YWNrVHlwZUxhcmdlKS5y ZWxlYXNlUmVmKCk7CiAgICAgVFJZCiAgICAgICAgIHJlcyA9IGpzY21haW4oYXJnYywgYXJndiwg Z2xvYmFsRGF0YSk7CiAgICAgRVhDRVBUKHJlcyA9IDMpCkluZGV4OiBKYXZhU2NyaXB0Q29yZS9B UEkvSlNDb250ZXh0UmVmLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBKYXZhU2NyaXB0Q29yZS9BUEkvSlND b250ZXh0UmVmLmNwcAkocmV2aXNpb24gNTc5OTQpCisrKyBKYXZhU2NyaXB0Q29yZS9BUEkvSlND b250ZXh0UmVmLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDUsNyArNDUsNyBAQCB1c2luZyBuYW1l c3BhY2UgSlNDOwogSlNDb250ZXh0R3JvdXBSZWYgSlNDb250ZXh0R3JvdXBDcmVhdGUoKQogewog ICAgIGluaXRpYWxpemVUaHJlYWRpbmcoKTsKLSAgICByZXR1cm4gdG9SZWYoSlNHbG9iYWxEYXRh OjpjcmVhdGVOb25EZWZhdWx0KCkucmVsZWFzZVJlZigpKTsKKyAgICByZXR1cm4gdG9SZWYoSlNH bG9iYWxEYXRhOjpjcmVhdGVOb25EZWZhdWx0KFRocmVhZFN0YWNrVHlwZVNtYWxsKS5yZWxlYXNl UmVmKCkpOwogfQogCiBKU0NvbnRleHRHcm91cFJlZiBKU0NvbnRleHRHcm91cFJldGFpbihKU0Nv bnRleHRHcm91cFJlZiBncm91cCkKQEAgLTgzLDcgKzgzLDcgQEAgSlNHbG9iYWxDb250ZXh0UmVm IEpTR2xvYmFsQ29udGV4dENyZWF0ZQogICAgIGluaXRpYWxpemVUaHJlYWRpbmcoKTsKIAogICAg IEpTTG9jayBsb2NrKExvY2tGb3JSZWFsKTsKLSAgICBSZWZQdHI8SlNHbG9iYWxEYXRhPiBnbG9i YWxEYXRhID0gZ3JvdXAgPyBQYXNzUmVmUHRyPEpTR2xvYmFsRGF0YT4odG9KUyhncm91cCkpIDog SlNHbG9iYWxEYXRhOjpjcmVhdGVOb25EZWZhdWx0KCk7CisgICAgUmVmUHRyPEpTR2xvYmFsRGF0 YT4gZ2xvYmFsRGF0YSA9IGdyb3VwID8gUGFzc1JlZlB0cjxKU0dsb2JhbERhdGE+KHRvSlMoZ3Jv dXApKSA6IEpTR2xvYmFsRGF0YTo6Y3JlYXRlTm9uRGVmYXVsdChUaHJlYWRTdGFja1R5cGVTbWFs bCk7CiAKICAgICBBUElFbnRyeVNoaW0gZW50cnlTaGltKGdsb2JhbERhdGEuZ2V0KCksIGZhbHNl KTsKIApJbmRleDogSmF2YVNjcmlwdENvcmUvaW50ZXJwcmV0ZXIvSW50ZXJwcmV0ZXIuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIEphdmFTY3JpcHRDb3JlL2ludGVycHJldGVyL0ludGVycHJldGVyLmNwcAko cmV2aXNpb24gNTc5OTQpCisrKyBKYXZhU2NyaXB0Q29yZS9pbnRlcnByZXRlci9JbnRlcnByZXRl ci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTU4MCw4ICs1ODAsOCBAQCBKU1ZhbHVlIEludGVycHJl dGVyOjpleGVjdXRlKFByb2dyYW1FeGVjCiB7CiAgICAgQVNTRVJUKCFzY29wZUNoYWluLT5nbG9i YWxEYXRhLT5leGNlcHRpb24pOwogCi0gICAgaWYgKG1fcmVlbnRyeURlcHRoID49IE1heFNlY29u ZGFyeVRocmVhZFJlZW50cnlEZXB0aCkgewotICAgICAgICBpZiAoIWlzTWFpblRocmVhZCgpIHx8 IG1fcmVlbnRyeURlcHRoID49IE1heE1haW5UaHJlYWRSZWVudHJ5RGVwdGgpIHsKKyAgICBpZiAo bV9yZWVudHJ5RGVwdGggPj0gTWF4U21hbGxUaHJlYWRSZWVudHJ5RGVwdGgpIHsKKyAgICAgICAg aWYgKG1fcmVlbnRyeURlcHRoID49IGNhbGxGcmFtZS0+Z2xvYmFsRGF0YSgpLm1heFJlZW50cnlE ZXB0aCkgewogICAgICAgICAgICAgKmV4Y2VwdGlvbiA9IGNyZWF0ZVN0YWNrT3ZlcmZsb3dFcnJv cihjYWxsRnJhbWUpOwogICAgICAgICAgICAgcmV0dXJuIGpzTnVsbCgpOwogICAgICAgICB9CkBA IC02NDEsOCArNjQxLDggQEAgSlNWYWx1ZSBJbnRlcnByZXRlcjo6ZXhlY3V0ZShGdW5jdGlvbkV4 ZQogewogICAgIEFTU0VSVCghc2NvcGVDaGFpbi0+Z2xvYmFsRGF0YS0+ZXhjZXB0aW9uKTsKIAot ICAgIGlmIChtX3JlZW50cnlEZXB0aCA+PSBNYXhTZWNvbmRhcnlUaHJlYWRSZWVudHJ5RGVwdGgp IHsKLSAgICAgICAgaWYgKCFpc01haW5UaHJlYWQoKSB8fCBtX3JlZW50cnlEZXB0aCA+PSBNYXhN YWluVGhyZWFkUmVlbnRyeURlcHRoKSB7CisgICAgaWYgKG1fcmVlbnRyeURlcHRoID49IE1heFNt YWxsVGhyZWFkUmVlbnRyeURlcHRoKSB7CisgICAgICAgIGlmIChtX3JlZW50cnlEZXB0aCA+PSBj YWxsRnJhbWUtPmdsb2JhbERhdGEoKS5tYXhSZWVudHJ5RGVwdGgpIHsKICAgICAgICAgICAgICpl eGNlcHRpb24gPSBjcmVhdGVTdGFja092ZXJmbG93RXJyb3IoY2FsbEZyYW1lKTsKICAgICAgICAg ICAgIHJldHVybiBqc051bGwoKTsKICAgICAgICAgfQpAQCAtNzAzLDggKzcwMyw4IEBAIENhbGxG cmFtZUNsb3N1cmUgSW50ZXJwcmV0ZXI6OnByZXBhcmVGb3IKIHsKICAgICBBU1NFUlQoIXNjb3Bl Q2hhaW4tPmdsb2JhbERhdGEtPmV4Y2VwdGlvbik7CiAgICAgCi0gICAgaWYgKG1fcmVlbnRyeURl cHRoID49IE1heFNlY29uZGFyeVRocmVhZFJlZW50cnlEZXB0aCkgewotICAgICAgICBpZiAoIWlz TWFpblRocmVhZCgpIHx8IG1fcmVlbnRyeURlcHRoID49IE1heE1haW5UaHJlYWRSZWVudHJ5RGVw dGgpIHsKKyAgICBpZiAobV9yZWVudHJ5RGVwdGggPj0gTWF4U21hbGxUaHJlYWRSZWVudHJ5RGVw dGgpIHsKKyAgICAgICAgaWYgKG1fcmVlbnRyeURlcHRoID49IGNhbGxGcmFtZS0+Z2xvYmFsRGF0 YSgpLm1heFJlZW50cnlEZXB0aCkgewogICAgICAgICAgICAgKmV4Y2VwdGlvbiA9IGNyZWF0ZVN0 YWNrT3ZlcmZsb3dFcnJvcihjYWxsRnJhbWUpOwogICAgICAgICAgICAgcmV0dXJuIENhbGxGcmFt ZUNsb3N1cmUoKTsKICAgICAgICAgfQpAQCAtNzc5LDggKzc3OSw4IEBAIEpTVmFsdWUgSW50ZXJw cmV0ZXI6OmV4ZWN1dGUoRXZhbEV4ZWN1dGEKIHsKICAgICBBU1NFUlQoIXNjb3BlQ2hhaW4tPmds b2JhbERhdGEtPmV4Y2VwdGlvbik7CiAKLSAgICBpZiAobV9yZWVudHJ5RGVwdGggPj0gTWF4U2Vj b25kYXJ5VGhyZWFkUmVlbnRyeURlcHRoKSB7Ci0gICAgICAgIGlmICghaXNNYWluVGhyZWFkKCkg fHwgbV9yZWVudHJ5RGVwdGggPj0gTWF4TWFpblRocmVhZFJlZW50cnlEZXB0aCkgeworICAgIGlm IChtX3JlZW50cnlEZXB0aCA+PSBNYXhTbWFsbFRocmVhZFJlZW50cnlEZXB0aCkgeworICAgICAg ICBpZiAobV9yZWVudHJ5RGVwdGggPj0gY2FsbEZyYW1lLT5nbG9iYWxEYXRhKCkubWF4UmVlbnRy eURlcHRoKSB7CiAgICAgICAgICAgICAqZXhjZXB0aW9uID0gY3JlYXRlU3RhY2tPdmVyZmxvd0Vy cm9yKGNhbGxGcmFtZSk7CiAgICAgICAgICAgICByZXR1cm4ganNOdWxsKCk7CiAgICAgICAgIH0K SW5kZXg6IEphdmFTY3JpcHRDb3JlL2ludGVycHJldGVyL0ludGVycHJldGVyLmgKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gSmF2YVNjcmlwdENvcmUvaW50ZXJwcmV0ZXIvSW50ZXJwcmV0ZXIuaAkocmV2aXNpb24g NTc5OTQpCisrKyBKYXZhU2NyaXB0Q29yZS9pbnRlcnByZXRlci9JbnRlcnByZXRlci5oCSh3b3Jr aW5nIGNvcHkpCkBAIC02NCw3ICs2NCw3IEBAIG5hbWVzcGFjZSBKU0MgewogICAgICAgICBXaWxs RXhlY3V0ZVN0YXRlbWVudAogICAgIH07CiAKLSAgICBlbnVtIHsgTWF4TWFpblRocmVhZFJlZW50 cnlEZXB0aCA9IDI1NiwgTWF4U2Vjb25kYXJ5VGhyZWFkUmVlbnRyeURlcHRoID0gMzIgfTsKKyAg ICBlbnVtIHsgTWF4TGFyZ2VUaHJlYWRSZWVudHJ5RGVwdGggPSAyNTYsIE1heFNtYWxsVGhyZWFk UmVlbnRyeURlcHRoID0gMzIgfTsKIAogICAgIGNsYXNzIEludGVycHJldGVyIDogcHVibGljIEZh c3RBbGxvY0Jhc2UgewogICAgICAgICBmcmllbmQgY2xhc3MgSklUOwpJbmRleDogSmF2YVNjcmlw dENvcmUvcnVudGltZS9BcnJheVByb3RvdHlwZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gSmF2YVNjcmlw dENvcmUvcnVudGltZS9BcnJheVByb3RvdHlwZS5jcHAJKHJldmlzaW9uIDU3OTk0KQorKysgSmF2 YVNjcmlwdENvcmUvcnVudGltZS9BcnJheVByb3RvdHlwZS5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTE1Niw5ICsxNTYsOSBAQCBKU1ZhbHVlIEpTQ19IT1NUX0NBTEwgYXJyYXlQcm90b0Z1bmNUb1N0 CiAgICAgSlNBcnJheSogdGhpc09iaiA9IGFzQXJyYXkodGhpc1ZhbHVlKTsKICAgICAKICAgICBI YXNoU2V0PEpTT2JqZWN0Kj4mIGFycmF5VmlzaXRlZEVsZW1lbnRzID0gZXhlYy0+Z2xvYmFsRGF0 YSgpLmFycmF5VmlzaXRlZEVsZW1lbnRzOwotICAgIGlmIChhcnJheVZpc2l0ZWRFbGVtZW50cy5z aXplKCkgPj0gTWF4U2Vjb25kYXJ5VGhyZWFkUmVlbnRyeURlcHRoKSB7Ci0gICAgICAgIGlmICgh aXNNYWluVGhyZWFkKCkgfHwgYXJyYXlWaXNpdGVkRWxlbWVudHMuc2l6ZSgpID49IE1heE1haW5U aHJlYWRSZWVudHJ5RGVwdGgpCi0gICAgICAgICAgICByZXR1cm4gdGhyb3dFcnJvcihleGVjLCBS YW5nZUVycm9yLCAiTWF4aW11bSBjYWxsIHN0YWNrIHNpemUgZXhjZWVkZWQuIik7CisgICAgaWYg KGFycmF5VmlzaXRlZEVsZW1lbnRzLnNpemUoKSA+PSBNYXhTbWFsbFRocmVhZFJlZW50cnlEZXB0 aCkgeworICAgICAgICBpZiAoYXJyYXlWaXNpdGVkRWxlbWVudHMuc2l6ZSgpID49IGV4ZWMtPmds b2JhbERhdGEoKS5tYXhSZWVudHJ5RGVwdGgpCisgICAgICAgICAgICByZXR1cm4gdGhyb3dFcnJv cihleGVjLCBSYW5nZUVycm9yLCAiTWF4aW11bSBjYWxsIHN0YWNrIHNpemUgZXhjZWVkZWQuIik7 ICAgIAogICAgIH0KIAogICAgIGJvb2wgYWxyZWFkeVZpc2l0ZWQgPSAhYXJyYXlWaXNpdGVkRWxl bWVudHMuYWRkKHRoaXNPYmopLnNlY29uZDsKQEAgLTIxNCw5ICsyMTQsOSBAQCBKU1ZhbHVlIEpT Q19IT1NUX0NBTEwgYXJyYXlQcm90b0Z1bmNUb0xvCiAgICAgSlNPYmplY3QqIHRoaXNPYmogPSBh c0FycmF5KHRoaXNWYWx1ZSk7CiAKICAgICBIYXNoU2V0PEpTT2JqZWN0Kj4mIGFycmF5VmlzaXRl ZEVsZW1lbnRzID0gZXhlYy0+Z2xvYmFsRGF0YSgpLmFycmF5VmlzaXRlZEVsZW1lbnRzOwotICAg IGlmIChhcnJheVZpc2l0ZWRFbGVtZW50cy5zaXplKCkgPj0gTWF4U2Vjb25kYXJ5VGhyZWFkUmVl bnRyeURlcHRoKSB7Ci0gICAgICAgIGlmICghaXNNYWluVGhyZWFkKCkgfHwgYXJyYXlWaXNpdGVk RWxlbWVudHMuc2l6ZSgpID49IE1heE1haW5UaHJlYWRSZWVudHJ5RGVwdGgpCi0gICAgICAgICAg ICByZXR1cm4gdGhyb3dFcnJvcihleGVjLCBSYW5nZUVycm9yLCAiTWF4aW11bSBjYWxsIHN0YWNr IHNpemUgZXhjZWVkZWQuIik7CisgICAgaWYgKGFycmF5VmlzaXRlZEVsZW1lbnRzLnNpemUoKSA+ PSBNYXhTbWFsbFRocmVhZFJlZW50cnlEZXB0aCkgeworICAgICAgICBpZiAoYXJyYXlWaXNpdGVk RWxlbWVudHMuc2l6ZSgpID49IGV4ZWMtPmdsb2JhbERhdGEoKS5tYXhSZWVudHJ5RGVwdGgpCisg ICAgICAgICAgICByZXR1cm4gdGhyb3dFcnJvcihleGVjLCBSYW5nZUVycm9yLCAiTWF4aW11bSBj YWxsIHN0YWNrIHNpemUgZXhjZWVkZWQuIik7ICAgIAogICAgIH0KIAogICAgIGJvb2wgYWxyZWFk eVZpc2l0ZWQgPSAhYXJyYXlWaXNpdGVkRWxlbWVudHMuYWRkKHRoaXNPYmopLnNlY29uZDsKQEAg LTI1Miw5ICsyNTIsOSBAQCBKU1ZhbHVlIEpTQ19IT1NUX0NBTEwgYXJyYXlQcm90b0Z1bmNKb2lu CiAgICAgSlNPYmplY3QqIHRoaXNPYmogPSB0aGlzVmFsdWUudG9UaGlzT2JqZWN0KGV4ZWMpOwog CiAgICAgSGFzaFNldDxKU09iamVjdCo+JiBhcnJheVZpc2l0ZWRFbGVtZW50cyA9IGV4ZWMtPmds b2JhbERhdGEoKS5hcnJheVZpc2l0ZWRFbGVtZW50czsKLSAgICBpZiAoYXJyYXlWaXNpdGVkRWxl bWVudHMuc2l6ZSgpID49IE1heFNlY29uZGFyeVRocmVhZFJlZW50cnlEZXB0aCkgewotICAgICAg ICBpZiAoIWlzTWFpblRocmVhZCgpIHx8IGFycmF5VmlzaXRlZEVsZW1lbnRzLnNpemUoKSA+PSBN YXhNYWluVGhyZWFkUmVlbnRyeURlcHRoKQotICAgICAgICAgICAgcmV0dXJuIHRocm93RXJyb3Io ZXhlYywgUmFuZ2VFcnJvciwgIk1heGltdW0gY2FsbCBzdGFjayBzaXplIGV4Y2VlZGVkLiIpOwor ICAgIGlmIChhcnJheVZpc2l0ZWRFbGVtZW50cy5zaXplKCkgPj0gTWF4U21hbGxUaHJlYWRSZWVu dHJ5RGVwdGgpIHsKKyAgICAgICAgaWYgKGFycmF5VmlzaXRlZEVsZW1lbnRzLnNpemUoKSA+PSBl eGVjLT5nbG9iYWxEYXRhKCkubWF4UmVlbnRyeURlcHRoKQorICAgICAgICAgICAgcmV0dXJuIHRo cm93RXJyb3IoZXhlYywgUmFuZ2VFcnJvciwgIk1heGltdW0gY2FsbCBzdGFjayBzaXplIGV4Y2Vl ZGVkLiIpOyAgICAKICAgICB9CiAKICAgICBib29sIGFscmVhZHlWaXNpdGVkID0gIWFycmF5Vmlz aXRlZEVsZW1lbnRzLmFkZCh0aGlzT2JqKS5zZWNvbmQ7CkluZGV4OiBKYXZhU2NyaXB0Q29yZS9y dW50aW1lL0NvbGxlY3Rvci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gSmF2YVNjcmlwdENvcmUvcnVudGlt ZS9Db2xsZWN0b3IuY3BwCShyZXZpc2lvbiA1Nzk5NCkKKysrIEphdmFTY3JpcHRDb3JlL3J1bnRp bWUvQ29sbGVjdG9yLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNjM4LDcgKzYzOCw3IEBAIHZvaWQg SGVhcDo6bWFrZVVzYWJsZUZyb21NdWx0aXBsZVRocmVhZHMKIAogdm9pZCBIZWFwOjpyZWdpc3Rl clRocmVhZCgpCiB7Ci0gICAgQVNTRVJUKCFtX2dsb2JhbERhdGEtPm1haW5UaHJlYWRPbmx5IHx8 IGlzTWFpblRocmVhZCgpKTsKKyAgICBBU1NFUlQoIW1fZ2xvYmFsRGF0YS0+ZXhjbHVzaXZlVGhy ZWFkIHx8IG1fZ2xvYmFsRGF0YS0+ZXhjbHVzaXZlVGhyZWFkID09IGN1cnJlbnRUaHJlYWQoKSk7 CiAKICAgICBpZiAoIW1fY3VycmVudFRocmVhZFJlZ2lzdHJhciB8fCBwdGhyZWFkX2dldHNwZWNp ZmljKG1fY3VycmVudFRocmVhZFJlZ2lzdHJhcikpCiAgICAgICAgIHJldHVybjsKSW5kZXg6IEph dmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNHbG9iYWxEYXRhLmNwcAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBKYXZh U2NyaXB0Q29yZS9ydW50aW1lL0pTR2xvYmFsRGF0YS5jcHAJKHJldmlzaW9uIDU3OTk0KQorKysg SmF2YVNjcmlwdENvcmUvcnVudGltZS9KU0dsb2JhbERhdGEuY3BwCSh3b3JraW5nIGNvcHkpCkBA IC0xMDMsNyArMTAzLDcgQEAgdm9pZCBKU0dsb2JhbERhdGE6OnN0b3JlVlB0cnMoKQogICAgIGpz RnVuY3Rpb24tPn5KU0NlbGwoKTsKIH0KIAotSlNHbG9iYWxEYXRhOjpKU0dsb2JhbERhdGEoYm9v bCBpc1NoYXJlZCkKK0pTR2xvYmFsRGF0YTo6SlNHbG9iYWxEYXRhKGJvb2wgaXNTaGFyZWQsIFRo cmVhZFN0YWNrVHlwZSB0aHJlYWRTdGFja1R5cGUpCiAgICAgOiBpc1NoYXJlZEluc3RhbmNlKGlz U2hhcmVkKQogICAgICwgY2xpZW50RGF0YSgwKQogICAgICwgYXJyYXlUYWJsZShmYXN0TmV3PEhh c2hUYWJsZT4oSlNDOjphcnJheVRhYmxlKSkKQEAgLTE0Niw4ICsxNDYsOSBAQCBKU0dsb2JhbERh dGE6OkpTR2xvYmFsRGF0YShib29sIGlzU2hhcmVkCiAgICAgLCBtYXJrU3RhY2soanNBcnJheVZQ dHIpCiAgICAgLCBjYWNoZWRVVENPZmZzZXQoTmFOKQogICAgICwgd2Vha1JhbmRvbShzdGF0aWNf Y2FzdDxpbnQ+KGN1cnJlbnRUaW1lKCkpKQorICAgICwgbWF4UmVlbnRyeURlcHRoKHRocmVhZFN0 YWNrVHlwZSA9PSBUaHJlYWRTdGFja1R5cGVTbWFsbCA/IE1heFNtYWxsVGhyZWFkUmVlbnRyeURl cHRoIDogTWF4TGFyZ2VUaHJlYWRSZWVudHJ5RGVwdGgpCiAjaWZuZGVmIE5ERUJVRwotICAgICwg bWFpblRocmVhZE9ubHkoZmFsc2UpCisgICAgLCBleGNsdXNpdmVUaHJlYWQoMCkKICNlbmRpZgog ewogI2lmIFBMQVRGT1JNKE1BQykKQEAgLTE5NiwyMiArMTk3LDIyIEBAIEpTR2xvYmFsRGF0YTo6 fkpTR2xvYmFsRGF0YSgpCiAgICAgZGVsZXRlIGNsaWVudERhdGE7CiB9CiAKLVBhc3NSZWZQdHI8 SlNHbG9iYWxEYXRhPiBKU0dsb2JhbERhdGE6OmNyZWF0ZU5vbkRlZmF1bHQoKQorUGFzc1JlZlB0 cjxKU0dsb2JhbERhdGE+IEpTR2xvYmFsRGF0YTo6Y3JlYXRlTm9uRGVmYXVsdChUaHJlYWRTdGFj a1R5cGUgdHlwZSkKIHsKLSAgICByZXR1cm4gYWRvcHRSZWYobmV3IEpTR2xvYmFsRGF0YShmYWxz ZSkpOworICAgIHJldHVybiBhZG9wdFJlZihuZXcgSlNHbG9iYWxEYXRhKGZhbHNlLCB0eXBlKSk7 CiB9CiAKLVBhc3NSZWZQdHI8SlNHbG9iYWxEYXRhPiBKU0dsb2JhbERhdGE6OmNyZWF0ZSgpCitQ YXNzUmVmUHRyPEpTR2xvYmFsRGF0YT4gSlNHbG9iYWxEYXRhOjpjcmVhdGUoVGhyZWFkU3RhY2tU eXBlIHR5cGUpCiB7Ci0gICAgSlNHbG9iYWxEYXRhKiBnbG9iYWxEYXRhID0gbmV3IEpTR2xvYmFs RGF0YShmYWxzZSk7CisgICAgSlNHbG9iYWxEYXRhKiBnbG9iYWxEYXRhID0gbmV3IEpTR2xvYmFs RGF0YShmYWxzZSwgdHlwZSk7CiAgICAgd3RmVGhyZWFkRGF0YSgpLmluaXRpYWxpemVJZGVudGlm aWVyVGFibGUoZ2xvYmFsRGF0YS0+aWRlbnRpZmllclRhYmxlKTsKICAgICByZXR1cm4gYWRvcHRS ZWYoZ2xvYmFsRGF0YSk7CiB9CiAKLVBhc3NSZWZQdHI8SlNHbG9iYWxEYXRhPiBKU0dsb2JhbERh dGE6OmNyZWF0ZUxlYWtlZCgpCitQYXNzUmVmUHRyPEpTR2xvYmFsRGF0YT4gSlNHbG9iYWxEYXRh OjpjcmVhdGVMZWFrZWQoVGhyZWFkU3RhY2tUeXBlIHR5cGUpCiB7CiAgICAgU3RydWN0dXJlOjpz dGFydElnbm9yaW5nTGVha3MoKTsKLSAgICBSZWZQdHI8SlNHbG9iYWxEYXRhPiBkYXRhID0gY3Jl YXRlKCk7CisgICAgUmVmUHRyPEpTR2xvYmFsRGF0YT4gZGF0YSA9IGNyZWF0ZSh0eXBlKTsKICAg ICBTdHJ1Y3R1cmU6OnN0b3BJZ25vcmluZ0xlYWtzKCk7CiAgICAgcmV0dXJuIGRhdGEucmVsZWFz ZSgpOwogfQpAQCAtMjI1LDcgKzIyNiw3IEBAIEpTR2xvYmFsRGF0YSYgSlNHbG9iYWxEYXRhOjpz aGFyZWRJbnN0YW4KIHsKICAgICBKU0dsb2JhbERhdGEqJiBpbnN0YW5jZSA9IHNoYXJlZEluc3Rh bmNlSW50ZXJuYWwoKTsKICAgICBpZiAoIWluc3RhbmNlKSB7Ci0gICAgICAgIGluc3RhbmNlID0g bmV3IEpTR2xvYmFsRGF0YSh0cnVlKTsKKyAgICAgICAgaW5zdGFuY2UgPSBuZXcgSlNHbG9iYWxE YXRhKHRydWUsIFRocmVhZFN0YWNrVHlwZVNtYWxsKTsKICNpZiBFTkFCTEUoSlNDX01VTFRJUExF X1RIUkVBRFMpCiAgICAgICAgIGluc3RhbmNlLT5tYWtlVXNhYmxlRnJvbU11bHRpcGxlVGhyZWFk cygpOwogI2VuZGlmCkluZGV4OiBKYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTR2xvYmFsRGF0YS5o Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIEphdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNHbG9iYWxEYXRhLmgJKHJl dmlzaW9uIDU3OTk0KQorKysgSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU0dsb2JhbERhdGEuaAko d29ya2luZyBjb3B5KQpAQCAtODQsNiArODQsMTEgQEAgbmFtZXNwYWNlIEpTQyB7CiAgICAgICAg IGRvdWJsZSBpbmNyZW1lbnQ7CiAgICAgfTsKIAorICAgIGVudW0gVGhyZWFkU3RhY2tUeXBlIHsK KyAgICAgICAgVGhyZWFkU3RhY2tUeXBlTGFyZ2UsCisgICAgICAgIFRocmVhZFN0YWNrVHlwZVNt YWxsCisgICAgfTsKKwogICAgIGNsYXNzIEpTR2xvYmFsRGF0YSA6IHB1YmxpYyBSZWZDb3VudGVk PEpTR2xvYmFsRGF0YT4gewogICAgIHB1YmxpYzoKICAgICAgICAgc3RydWN0IENsaWVudERhdGEg ewpAQCAtOTMsOSArOTgsOSBAQCBuYW1lc3BhY2UgSlNDIHsKICAgICAgICAgc3RhdGljIGJvb2wg c2hhcmVkSW5zdGFuY2VFeGlzdHMoKTsKICAgICAgICAgc3RhdGljIEpTR2xvYmFsRGF0YSYgc2hh cmVkSW5zdGFuY2UoKTsKIAotICAgICAgICBzdGF0aWMgUGFzc1JlZlB0cjxKU0dsb2JhbERhdGE+ IGNyZWF0ZSgpOwotICAgICAgICBzdGF0aWMgUGFzc1JlZlB0cjxKU0dsb2JhbERhdGE+IGNyZWF0 ZUxlYWtlZCgpOwotICAgICAgICBzdGF0aWMgUGFzc1JlZlB0cjxKU0dsb2JhbERhdGE+IGNyZWF0 ZU5vbkRlZmF1bHQoKTsKKyAgICAgICAgc3RhdGljIFBhc3NSZWZQdHI8SlNHbG9iYWxEYXRhPiBj cmVhdGUoVGhyZWFkU3RhY2tUeXBlKTsKKyAgICAgICAgc3RhdGljIFBhc3NSZWZQdHI8SlNHbG9i YWxEYXRhPiBjcmVhdGVMZWFrZWQoVGhyZWFkU3RhY2tUeXBlKTsKKyAgICAgICAgc3RhdGljIFBh c3NSZWZQdHI8SlNHbG9iYWxEYXRhPiBjcmVhdGVOb25EZWZhdWx0KFRocmVhZFN0YWNrVHlwZSk7 CiAgICAgICAgIH5KU0dsb2JhbERhdGEoKTsKIAogI2lmIEVOQUJMRShKU0NfTVVMVElQTEVfVEhS RUFEUykKQEAgLTE4Nyw4ICsxOTIsOSBAQCBuYW1lc3BhY2UgSlNDIHsKICAgICAgICAgCiAgICAg ICAgIFdlYWtSYW5kb20gd2Vha1JhbmRvbTsKIAorICAgICAgICBpbnQgbWF4UmVlbnRyeURlcHRo OwogI2lmbmRlZiBOREVCVUcKLSAgICAgICAgYm9vbCBtYWluVGhyZWFkT25seTsKKyAgICAgICAg VGhyZWFkSWRlbnRpZmllciBleGNsdXNpdmVUaHJlYWQ7CiAjZW5kaWYKIAogICAgICAgICB2b2lk IHJlc2V0RGF0ZUNhY2hlKCk7CkBAIC0xOTcsNyArMjAzLDcgQEAgbmFtZXNwYWNlIEpTQyB7CiAg ICAgICAgIHZvaWQgc3RvcFNhbXBsaW5nKCk7CiAgICAgICAgIHZvaWQgZHVtcFNhbXBsZURhdGEo RXhlY1N0YXRlKiBleGVjKTsKICAgICBwcml2YXRlOgotICAgICAgICBKU0dsb2JhbERhdGEoYm9v bCBpc1NoYXJlZCk7CisgICAgICAgIEpTR2xvYmFsRGF0YShib29sIGlzU2hhcmVkLCBUaHJlYWRT dGFja1R5cGUpOwogICAgICAgICBzdGF0aWMgSlNHbG9iYWxEYXRhKiYgc2hhcmVkSW5zdGFuY2VJ bnRlcm5hbCgpOwogICAgICAgICB2b2lkIGNyZWF0ZU5hdGl2ZVRodW5rKCk7CiAgICAgfTsKSW5k ZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9nCShy ZXZpc2lvbiA1Nzk5NCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0x LDMgKzEsMTcgQEAKKzIwMTAtMDQtMjEgIFNhbSBXZWluaWcgIDxzYW1Ad2Via2l0Lm9yZz4KKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBGaXggZm9yIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNzkzNworICAgICAgICBXZWFu IEphdmFTY3JpcHRDb3JlIG9mZiBjYWxscyB0byBpc01haW5UaHJlYWQoKQorCisgICAgICAgIE5v IGNoYW5nZSBpbiBiZWhhdmlvci4KKworICAgICAgICAqIGJpbmRpbmdzL2pzL0pTRE9NV2luZG93 QmFzZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpKU0RPTVdpbmRvd0Jhc2U6OmNvbW1vbkpTR2xv YmFsRGF0YSk6CisgICAgICAgICogYmluZGluZ3MvanMvV29ya2VyU2NyaXB0Q29udHJvbGxlci5j cHA6CisgICAgICAgIChXZWJDb3JlOjpXb3JrZXJTY3JpcHRDb250cm9sbGVyOjpXb3JrZXJTY3Jp cHRDb250cm9sbGVyKToKKwogMjAxMC0wNC0yMSAgRGltaXRyaSBHbGF6a292ICA8ZGdsYXprb3ZA Y2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERhcmluIEFkbGVyLgpJbmRleDog V2ViQ29yZS9iaW5kaW5ncy9qcy9KU0RPTVdpbmRvd0Jhc2UuY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdl YkNvcmUvYmluZGluZ3MvanMvSlNET01XaW5kb3dCYXNlLmNwcAkocmV2aXNpb24gNTc5OTQpCisr KyBXZWJDb3JlL2JpbmRpbmdzL2pzL0pTRE9NV2luZG93QmFzZS5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTM2LDYgKzM2LDcgQEAKICNpbmNsdWRlICJTZWN1cml0eU9yaWdpbi5oIgogI2luY2x1ZGUg IlNldHRpbmdzLmgiCiAjaW5jbHVkZSAiV2ViQ29yZUpTQ2xpZW50RGF0YS5oIgorI2luY2x1ZGUg PHd0Zi9UaHJlYWRpbmcuaD4KICNpbmNsdWRlIDx3dGYvdGV4dC9DU3RyaW5nLmg+CiAKIHVzaW5n IG5hbWVzcGFjZSBKU0M7CkBAIC0xNTYsMTAgKzE1NywxMCBAQCBKU0dsb2JhbERhdGEqIEpTRE9N V2luZG93QmFzZTo6Y29tbW9uSlNHCiAKICAgICBzdGF0aWMgSlNHbG9iYWxEYXRhKiBnbG9iYWxE YXRhID0gMDsKICAgICBpZiAoIWdsb2JhbERhdGEpIHsKLSAgICAgICAgZ2xvYmFsRGF0YSA9IEpT R2xvYmFsRGF0YTo6Y3JlYXRlTGVha2VkKCkucmVsZWFzZVJlZigpOworICAgICAgICBnbG9iYWxE YXRhID0gSlNHbG9iYWxEYXRhOjpjcmVhdGVMZWFrZWQoVGhyZWFkU3RhY2tUeXBlTGFyZ2UpLnJl bGVhc2VSZWYoKTsKICAgICAgICAgZ2xvYmFsRGF0YS0+dGltZW91dENoZWNrZXIuc2V0VGltZW91 dEludGVydmFsKDEwMDAwKTsgLy8gMTAgc2Vjb25kcwogI2lmbmRlZiBOREVCVUcKLSAgICAgICAg Z2xvYmFsRGF0YS0+bWFpblRocmVhZE9ubHkgPSB0cnVlOworICAgICAgICBnbG9iYWxEYXRhLT5l eGNsdXNpdmVUaHJlYWQgPSBjdXJyZW50VGhyZWFkKCk7CiAjZW5kaWYKICAgICAgICAgaW5pdE5v cm1hbFdvcmxkQ2xpZW50RGF0YShnbG9iYWxEYXRhKTsKICAgICB9CkluZGV4OiBXZWJDb3JlL2Jp bmRpbmdzL2pzL1dvcmtlclNjcmlwdENvbnRyb2xsZXIuY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNv cmUvYmluZGluZ3MvanMvV29ya2VyU2NyaXB0Q29udHJvbGxlci5jcHAJKHJldmlzaW9uIDU3OTk0 KQorKysgV2ViQ29yZS9iaW5kaW5ncy9qcy9Xb3JrZXJTY3JpcHRDb250cm9sbGVyLmNwcAkod29y a2luZyBjb3B5KQpAQCAtNDgsNyArNDgsNyBAQCB1c2luZyBuYW1lc3BhY2UgSlNDOwogbmFtZXNw YWNlIFdlYkNvcmUgewogCiBXb3JrZXJTY3JpcHRDb250cm9sbGVyOjpXb3JrZXJTY3JpcHRDb250 cm9sbGVyKFdvcmtlckNvbnRleHQqIHdvcmtlckNvbnRleHQpCi0gICAgOiBtX2dsb2JhbERhdGEo SlNHbG9iYWxEYXRhOjpjcmVhdGUoKSkKKyAgICA6IG1fZ2xvYmFsRGF0YShKU0dsb2JhbERhdGE6 OmNyZWF0ZShUaHJlYWRTdGFja1R5cGVTbWFsbCkpCiAgICAgLCBtX3dvcmtlckNvbnRleHQod29y a2VyQ29udGV4dCkKICAgICAsIG1fZXhlY3V0aW9uRm9yYmlkZGVuKGZhbHNlKQogewo=