35379 2010-02-25 04:59:37 -0800 Make the context that was passed to the ThreadFunction accessible. 2010-02-25 06:49:23 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 0 jochen webkit-unassigned commit-queue jorlow oldest_to_newest 193679 0 jochen 2010-02-25 04:59:37 -0800 Make the context that was passed to the ThreadFunction accessible. 193680 1 49477 jochen 2010-02-25 05:03:55 -0800 Created attachment 49477 Patch 193682 2 jochen 2010-02-25 05:08:47 -0800 I can't think of any way to test this using a layout test 193689 3 49477 jorlow 2010-02-25 05:34:27 -0800 Comment on attachment 49477 Patch r=me but because there are nits to fix, cq=- > --- a/JavaScriptCore/wtf/ThreadingPthreads.cpp > +++ b/JavaScriptCore/wtf/ThreadingPthreads.cpp > @@ -53,7 +53,13 @@ > > namespace WTF { > > -typedef HashMap<ThreadIdentifier, pthread_t> ThreadMap; > +typedef struct { > + pthread_t handle; > + void* context; > +} ThreadInfo; > + extra new line > + > +typedef HashMap<ThreadIdentifier, ThreadInfo> ThreadMap; > > static Mutex* atomicallyInitializedStaticMutex; > 193694 4 49481 jochen 2010-02-25 05:50:02 -0800 Created attachment 49481 patch 193705 5 49481 commit-queue 2010-02-25 06:49:18 -0800 Comment on attachment 49481 patch Clearing flags on attachment: 49481 Committed r55234: <http://trac.webkit.org/changeset/55234> 193706 6 commit-queue 2010-02-25 06:49:23 -0800 All reviewed patches have been landed. Closing bug. 49477 2010-02-25 05:03:55 -0800 2010-02-25 05:49:57 -0800 Patch bug-35379-20100225140353.patch text/plain 7545 jochen ZGlmZiAtLWdpdCBhL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZyBiL0phdmFTY3JpcHRDb3JlL0No YW5nZUxvZwppbmRleCA3NWQyMjhkLi45MTM3NmNhIDEwMDY0NAotLS0gYS9KYXZhU2NyaXB0Q29y ZS9DaGFuZ2VMb2cKKysrIGIvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzEg QEAKKzIwMTAtMDItMjUgIEpvY2hlbiBFaXNpbmdlciAgPGpvY2hlbkBjaHJvbWl1bS5vcmc+CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTWFrZSB0aGUg Y29udGV4dCB0aGF0IHdhcyBwYXNzZWQgdG8gdGhlIFRocmVhZEZ1bmN0aW9uIGFjY2Vzc2libGUu CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNTM3OQor CisgICAgICAgICogd3RmL1RocmVhZGluZy5oOgorICAgICAgICAqIHd0Zi9UaHJlYWRpbmdOb25l LmNwcDoKKyAgICAgICAgKFdURjo6dGhyZWFkQ29udGV4dCk6CisgICAgICAgICogd3RmL1RocmVh ZGluZ1B0aHJlYWRzLmNwcDoKKyAgICAgICAgKFdURjo6KToKKyAgICAgICAgKFdURjo6aWRlbnRp ZmllckJ5UHRocmVhZEhhbmRsZSk6CisgICAgICAgIChXVEY6OmVzdGFibGlzaElkZW50aWZpZXJG b3JQdGhyZWFkSGFuZGxlKToKKyAgICAgICAgKFdURjo6cHRocmVhZEhhbmRsZUZvcklkZW50aWZp ZXIpOgorICAgICAgICAoV1RGOjpjb250ZXh0Rm9ySWRlbnRpZmllcik6CisgICAgICAgIChXVEY6 OmNyZWF0ZVRocmVhZEludGVybmFsKToKKyAgICAgICAgKFdURjo6Y3VycmVudFRocmVhZCk6Cisg ICAgICAgIChXVEY6OnRocmVhZENvbnRleHQpOgorICAgICAgICAqIHd0Zi9UaHJlYWRpbmdXaW4u Y3BwOgorICAgICAgICAoV1RGOjopOgorICAgICAgICAoV1RGOjp0aHJlYWRNYXApOgorICAgICAg ICAoV1RGOjpzdG9yZVRocmVhZEhhbmRsZUJ5SWRlbnRpZmllcik6CisgICAgICAgIChXVEY6OnRo cmVhZEhhbmRsZUZvcklkZW50aWZpZXIpOgorICAgICAgICAoV1RGOjpjb250ZXh0Rm9ySWRlbnRp Zmllcik6CisgICAgICAgIChXVEY6OmNyZWF0ZVRocmVhZEludGVybmFsKToKKyAgICAgICAgKFdU Rjo6dGhyZWFkQ29udGV4dCk6CisKIDIwMTAtMDItMjMgIEd1c3Rhdm8gTm9yb25oYSBTaWx2YSAg PGduc0Bnbm9tZS5vcmc+CiAKICAgICAgICAgUnViYmVyLXN0YW1wZWQgYnkgRGltaXRyaSBHbGF6 a292LgpkaWZmIC0tZ2l0IGEvSmF2YVNjcmlwdENvcmUvd3RmL1RocmVhZGluZy5oIGIvSmF2YVNj cmlwdENvcmUvd3RmL1RocmVhZGluZy5oCmluZGV4IGI3YTJmMDguLmI1MjI5MTUgMTAwNjQ0Ci0t LSBhL0phdmFTY3JpcHRDb3JlL3d0Zi9UaHJlYWRpbmcuaAorKysgYi9KYXZhU2NyaXB0Q29yZS93 dGYvVGhyZWFkaW5nLmgKQEAgLTEyNyw2ICsxMjcsNyBAQCBUaHJlYWRJZGVudGlmaWVyIGN1cnJl bnRUaHJlYWQoKTsKIGJvb2wgaXNNYWluVGhyZWFkKCk7CiBpbnQgd2FpdEZvclRocmVhZENvbXBs ZXRpb24oVGhyZWFkSWRlbnRpZmllciwgdm9pZCoqKTsKIHZvaWQgZGV0YWNoVGhyZWFkKFRocmVh ZElkZW50aWZpZXIpOwordm9pZCogdGhyZWFkQ29udGV4dChUaHJlYWRJZGVudGlmaWVyKTsKIAog I2lmIFVTRShQVEhSRUFEUykKIHR5cGVkZWYgcHRocmVhZF9tdXRleF90IFBsYXRmb3JtTXV0ZXg7 CmRpZmYgLS1naXQgYS9KYXZhU2NyaXB0Q29yZS93dGYvVGhyZWFkaW5nTm9uZS5jcHAgYi9KYXZh U2NyaXB0Q29yZS93dGYvVGhyZWFkaW5nTm9uZS5jcHAKaW5kZXggMmU4YTI1OS4uY2ZjOWQzMSAx MDA2NDQKLS0tIGEvSmF2YVNjcmlwdENvcmUvd3RmL1RocmVhZGluZ05vbmUuY3BwCisrKyBiL0ph dmFTY3JpcHRDb3JlL3d0Zi9UaHJlYWRpbmdOb25lLmNwcApAQCAtNDEsNiArNDEsNyBAQCBpbnQg d2FpdEZvclRocmVhZENvbXBsZXRpb24oVGhyZWFkSWRlbnRpZmllciwgdm9pZCoqKSB7IHJldHVy biAwOyB9CiB2b2lkIGRldGFjaFRocmVhZChUaHJlYWRJZGVudGlmaWVyKSB7IH0KIFRocmVhZElk ZW50aWZpZXIgY3VycmVudFRocmVhZCgpIHsgcmV0dXJuIFRocmVhZElkZW50aWZpZXIoKTsgfQog Ym9vbCBpc01haW5UaHJlYWQoKSB7IHJldHVybiB0cnVlOyB9Cit2b2lkKiB0aHJlYWRDb250ZXh0 KFRocmVhZElkZW50aWZpZXIpIHsgcmV0dXJuIDA7IH0KIAogTXV0ZXg6Ok11dGV4KCkgeyB9CiBN dXRleDo6fk11dGV4KCkgeyB9CmRpZmYgLS1naXQgYS9KYXZhU2NyaXB0Q29yZS93dGYvVGhyZWFk aW5nUHRocmVhZHMuY3BwIGIvSmF2YVNjcmlwdENvcmUvd3RmL1RocmVhZGluZ1B0aHJlYWRzLmNw cAppbmRleCAyZmViODA4Li4yM2RiZTk3IDEwMDY0NAotLS0gYS9KYXZhU2NyaXB0Q29yZS93dGYv VGhyZWFkaW5nUHRocmVhZHMuY3BwCisrKyBiL0phdmFTY3JpcHRDb3JlL3d0Zi9UaHJlYWRpbmdQ dGhyZWFkcy5jcHAKQEAgLTUzLDcgKzUzLDEzIEBACiAKIG5hbWVzcGFjZSBXVEYgewogCi10eXBl ZGVmIEhhc2hNYXA8VGhyZWFkSWRlbnRpZmllciwgcHRocmVhZF90PiBUaHJlYWRNYXA7Cit0eXBl ZGVmIHN0cnVjdCB7CisgICAgcHRocmVhZF90IGhhbmRsZTsKKyAgICB2b2lkKiBjb250ZXh0Owor fSBUaHJlYWRJbmZvOworCisKK3R5cGVkZWYgSGFzaE1hcDxUaHJlYWRJZGVudGlmaWVyLCBUaHJl YWRJbmZvPiBUaHJlYWRNYXA7CiAKIHN0YXRpYyBNdXRleCogYXRvbWljYWxseUluaXRpYWxpemVk U3RhdGljTXV0ZXg7CiAKQEAgLTEwNSwxNCArMTExLDE0IEBAIHN0YXRpYyBUaHJlYWRJZGVudGlm aWVyIGlkZW50aWZpZXJCeVB0aHJlYWRIYW5kbGUoY29uc3QgcHRocmVhZF90JiBwdGhyZWFkSGFu ZGxlCiAKICAgICBUaHJlYWRNYXA6Oml0ZXJhdG9yIGkgPSB0aHJlYWRNYXAoKS5iZWdpbigpOwog ICAgIGZvciAoOyBpICE9IHRocmVhZE1hcCgpLmVuZCgpOyArK2kpIHsKLSAgICAgICAgaWYgKHB0 aHJlYWRfZXF1YWwoaS0+c2Vjb25kLCBwdGhyZWFkSGFuZGxlKSkKKyAgICAgICAgaWYgKHB0aHJl YWRfZXF1YWwoaS0+c2Vjb25kLmhhbmRsZSwgcHRocmVhZEhhbmRsZSkpCiAgICAgICAgICAgICBy ZXR1cm4gaS0+Zmlyc3Q7CiAgICAgfQogCiAgICAgcmV0dXJuIDA7CiB9CiAKLXN0YXRpYyBUaHJl YWRJZGVudGlmaWVyIGVzdGFibGlzaElkZW50aWZpZXJGb3JQdGhyZWFkSGFuZGxlKGNvbnN0IHB0 aHJlYWRfdCYgcHRocmVhZEhhbmRsZSkKK3N0YXRpYyBUaHJlYWRJZGVudGlmaWVyIGVzdGFibGlz aElkZW50aWZpZXJGb3JQdGhyZWFkSGFuZGxlKGNvbnN0IHB0aHJlYWRfdCYgcHRocmVhZEhhbmRs ZSwgdm9pZCogY29udGV4dCkKIHsKICAgICBBU1NFUlQoIWlkZW50aWZpZXJCeVB0aHJlYWRIYW5k bGUocHRocmVhZEhhbmRsZSkpOwogCkBAIC0xMjAsNyArMTI2LDEwIEBAIHN0YXRpYyBUaHJlYWRJ ZGVudGlmaWVyIGVzdGFibGlzaElkZW50aWZpZXJGb3JQdGhyZWFkSGFuZGxlKGNvbnN0IHB0aHJl YWRfdCYgcHRoCiAKICAgICBzdGF0aWMgVGhyZWFkSWRlbnRpZmllciBpZGVudGlmaWVyQ291bnQg PSAxOwogCi0gICAgdGhyZWFkTWFwKCkuYWRkKGlkZW50aWZpZXJDb3VudCwgcHRocmVhZEhhbmRs ZSk7CisgICAgVGhyZWFkSW5mbyBpbmZvOworICAgIGluZm8uaGFuZGxlID0gcHRocmVhZEhhbmRs ZTsKKyAgICBpbmZvLmNvbnRleHQgPSBjb250ZXh0OworICAgIHRocmVhZE1hcCgpLmFkZChpZGVu dGlmaWVyQ291bnQsIGluZm8pOwogCiAgICAgcmV0dXJuIGlkZW50aWZpZXJDb3VudCsrOwogfQpA QCAtMTI5LDkgKzEzOCwxNyBAQCBzdGF0aWMgcHRocmVhZF90IHB0aHJlYWRIYW5kbGVGb3JJZGVu dGlmaWVyKFRocmVhZElkZW50aWZpZXIgaWQpCiB7CiAgICAgTXV0ZXhMb2NrZXIgbG9ja2VyKHRo cmVhZE1hcE11dGV4KCkpOwogCi0gICAgcmV0dXJuIHRocmVhZE1hcCgpLmdldChpZCk7CisgICAg cmV0dXJuIHRocmVhZE1hcCgpLmdldChpZCkuaGFuZGxlOwogfQogCitzdGF0aWMgdm9pZCogY29u dGV4dEZvcklkZW50aWZpZXIoVGhyZWFkSWRlbnRpZmllciBpZCkKK3sKKyAgICBNdXRleExvY2tl ciBsb2NrZXIodGhyZWFkTWFwTXV0ZXgoKSk7CisKKyAgICByZXR1cm4gdGhyZWFkTWFwKCkuZ2V0 KGlkKS5jb250ZXh0OworfQorCisKIHZvaWQgY2xlYXJQdGhyZWFkSGFuZGxlRm9ySWRlbnRpZmll cihUaHJlYWRJZGVudGlmaWVyIGlkKQogewogICAgIE11dGV4TG9ja2VyIGxvY2tlcih0aHJlYWRN YXBNdXRleCgpKTsKQEAgLTE3NCw3ICsxOTEsNyBAQCBUaHJlYWRJZGVudGlmaWVyIGNyZWF0ZVRo cmVhZEludGVybmFsKFRocmVhZEZ1bmN0aW9uIGVudHJ5UG9pbnQsIHZvaWQqIGRhdGEsIGNvbgog ICAgICAgICBkZWxldGUgdGhyZWFkRGF0YTsKICAgICAgICAgcmV0dXJuIDA7CiAgICAgfQotICAg IHJldHVybiBlc3RhYmxpc2hJZGVudGlmaWVyRm9yUHRocmVhZEhhbmRsZSh0aHJlYWRIYW5kbGUp OworICAgIHJldHVybiBlc3RhYmxpc2hJZGVudGlmaWVyRm9yUHRocmVhZEhhbmRsZSh0aHJlYWRI YW5kbGUsIGRhdGEpOwogfQogI2Vsc2UKIFRocmVhZElkZW50aWZpZXIgY3JlYXRlVGhyZWFkSW50 ZXJuYWwoVGhyZWFkRnVuY3Rpb24gZW50cnlQb2ludCwgdm9pZCogZGF0YSwgY29uc3QgY2hhciop CkBAIC0xODUsNyArMjAyLDcgQEAgVGhyZWFkSWRlbnRpZmllciBjcmVhdGVUaHJlYWRJbnRlcm5h bChUaHJlYWRGdW5jdGlvbiBlbnRyeVBvaW50LCB2b2lkKiBkYXRhLCBjb24KICAgICAgICAgcmV0 dXJuIDA7CiAgICAgfQogCi0gICAgcmV0dXJuIGVzdGFibGlzaElkZW50aWZpZXJGb3JQdGhyZWFk SGFuZGxlKHRocmVhZEhhbmRsZSk7CisgICAgcmV0dXJuIGVzdGFibGlzaElkZW50aWZpZXJGb3JQ dGhyZWFkSGFuZGxlKHRocmVhZEhhbmRsZSwgZGF0YSk7CiB9CiAjZW5kaWYKIApAQCAtMjM1LDcg KzI1Miw3IEBAIFRocmVhZElkZW50aWZpZXIgY3VycmVudFRocmVhZCgpCiAgICAgICAgIHJldHVy biBpZDsKIAogICAgIC8vIE5vdCBhIFdURi1jcmVhdGVkIHRocmVhZCwgVGhyZWFkSWRlbnRpZmll ciBpcyBub3QgZXN0YWJsaXNoZWQgeWV0LgotICAgIGlkID0gZXN0YWJsaXNoSWRlbnRpZmllckZv clB0aHJlYWRIYW5kbGUocHRocmVhZF9zZWxmKCkpOworICAgIGlkID0gZXN0YWJsaXNoSWRlbnRp ZmllckZvclB0aHJlYWRIYW5kbGUocHRocmVhZF9zZWxmKCksIDApOwogICAgIFRocmVhZElkZW50 aWZpZXJEYXRhOjppbml0aWFsaXplKGlkKTsKICAgICByZXR1cm4gaWQ7CiB9CkBAIC0yNDksNiAr MjY2LDExIEBAIGJvb2wgaXNNYWluVGhyZWFkKCkKICNlbmRpZgogfQogCit2b2lkKiB0aHJlYWRD b250ZXh0KFRocmVhZElkZW50aWZpZXIgaWQpCit7CisgICAgcmV0dXJuIGNvbnRleHRGb3JJZGVu dGlmaWVyKGlkKTsgCit9CisKIE11dGV4OjpNdXRleCgpCiB7CiAgICAgcHRocmVhZF9tdXRleF9p bml0KCZtX211dGV4LCBOVUxMKTsKZGlmZiAtLWdpdCBhL0phdmFTY3JpcHRDb3JlL3d0Zi9UaHJl YWRpbmdXaW4uY3BwIGIvSmF2YVNjcmlwdENvcmUvd3RmL1RocmVhZGluZ1dpbi5jcHAKaW5kZXgg NzNjM2YwYy4uNzVkYTdiNCAxMDA2NDQKLS0tIGEvSmF2YVNjcmlwdENvcmUvd3RmL1RocmVhZGlu Z1dpbi5jcHAKKysrIGIvSmF2YVNjcmlwdENvcmUvd3RmL1RocmVhZGluZ1dpbi5jcHAKQEAgLTEx OCw2ICsxMTgsMTEgQEAgdHlwZWRlZiBzdHJ1Y3QgdGFnVEhSRUFETkFNRV9JTkZPIHsKIH0gVEhS RUFETkFNRV9JTkZPOwogI3ByYWdtYSBwYWNrKHBvcCkKIAordHlwZWRlZiBzdHJ1Y3QgeworICAg IEhBTkRMRSBoYW5kbGU7CisgICAgdm9pZCogY29udGV4dDsKK30gVGhyZWFkSW5mbzsKKwogdm9p ZCBpbml0aWFsaXplQ3VycmVudFRocmVhZEludGVybmFsKGNvbnN0IGNoYXIqIHN6VGhyZWFkTmFt ZSkKIHsKICAgICBUSFJFQUROQU1FX0lORk8gaW5mbzsKQEAgLTE2NSwyMyArMTcwLDMyIEBAIHZv aWQgaW5pdGlhbGl6ZVRocmVhZGluZygpCiAgICAgfQogfQogCi1zdGF0aWMgSGFzaE1hcDxEV09S RCwgSEFORExFPiYgdGhyZWFkTWFwKCkKK3N0YXRpYyBIYXNoTWFwPERXT1JELCBUaHJlYWRJbmZv PiYgdGhyZWFkTWFwKCkKIHsKLSAgICBzdGF0aWMgSGFzaE1hcDxEV09SRCwgSEFORExFPiBtYXA7 CisgICAgc3RhdGljIEhhc2hNYXA8RFdPUkQsIFRocmVhZEluZm8+IG1hcDsKICAgICByZXR1cm4g bWFwOwogfQogCi1zdGF0aWMgdm9pZCBzdG9yZVRocmVhZEhhbmRsZUJ5SWRlbnRpZmllcihEV09S RCB0aHJlYWRJRCwgSEFORExFIHRocmVhZEhhbmRsZSkKK3N0YXRpYyB2b2lkIHN0b3JlVGhyZWFk SGFuZGxlQnlJZGVudGlmaWVyKERXT1JEIHRocmVhZElELCBIQU5ETEUgdGhyZWFkSGFuZGxlLCB2 b2lkKiBjb250ZXh0KQogewogICAgIE11dGV4TG9ja2VyIGxvY2tlcih0aHJlYWRNYXBNdXRleCgp KTsKICAgICBBU1NFUlQoIXRocmVhZE1hcCgpLmNvbnRhaW5zKHRocmVhZElEKSk7Ci0gICAgdGhy ZWFkTWFwKCkuYWRkKHRocmVhZElELCB0aHJlYWRIYW5kbGUpOworICAgIFRocmVhZEluZm8gaW5m bzsKKyAgICBpbmZvLmhhbmRsZSA9IHRocmVhZEhhbmRsZTsKKyAgICBpbmZvLmNvbnRleHQgPSBj b250ZXh0OworICAgIHRocmVhZE1hcCgpLmFkZCh0aHJlYWRJRCwgaW5mbyk7CiB9CiAKIHN0YXRp YyBIQU5ETEUgdGhyZWFkSGFuZGxlRm9ySWRlbnRpZmllcihUaHJlYWRJZGVudGlmaWVyIGlkKQog ewogICAgIE11dGV4TG9ja2VyIGxvY2tlcih0aHJlYWRNYXBNdXRleCgpKTsKLSAgICByZXR1cm4g dGhyZWFkTWFwKCkuZ2V0KGlkKTsKKyAgICByZXR1cm4gdGhyZWFkTWFwKCkuZ2V0KGlkKS5oYW5k bGU7Cit9CisKK3N0YXRpYyB2b2lkKiBjb250ZXh0Rm9ySWRlbnRpZmllcihUaHJlYWRJZGVudGlm aWVyIGlkKQoreworICAgIE11dGV4TG9ja2VyIGxvY2tlcih0aHJlYWRNYXBNdXRleCgpKTsKKyAg ICByZXR1cm4gdGhyZWFkTWFwKCkuZ2V0KGlkKS5jb250ZXh0OwogfQogCiBzdGF0aWMgdm9pZCBj bGVhclRocmVhZEhhbmRsZUZvcklkZW50aWZpZXIoVGhyZWFkSWRlbnRpZmllciBpZCkKQEAgLTIz Nyw3ICsyNTEsNyBAQCBUaHJlYWRJZGVudGlmaWVyIGNyZWF0ZVRocmVhZEludGVybmFsKFRocmVh ZEZ1bmN0aW9uIGVudHJ5UG9pbnQsIHZvaWQqIGRhdGEsIGNvbgogICAgIH0KIAogICAgIHRocmVh ZElEID0gc3RhdGljX2Nhc3Q8VGhyZWFkSWRlbnRpZmllcj4odGhyZWFkSWRlbnRpZmllcik7Ci0g ICAgc3RvcmVUaHJlYWRIYW5kbGVCeUlkZW50aWZpZXIodGhyZWFkSWRlbnRpZmllciwgdGhyZWFk SGFuZGxlKTsKKyAgICBzdG9yZVRocmVhZEhhbmRsZUJ5SWRlbnRpZmllcih0aHJlYWRJZGVudGlm aWVyLCB0aHJlYWRIYW5kbGUsIGRhdGEpOwogCiAgICAgcmV0dXJuIHRocmVhZElEOwogfQpAQCAt MjgwLDYgKzI5NCwxMSBAQCBib29sIGlzTWFpblRocmVhZCgpCiAgICAgcmV0dXJuIGN1cnJlbnRU aHJlYWQoKSA9PSBtYWluVGhyZWFkSWRlbnRpZmllcjsKIH0KIAordm9pZCogdGhyZWFkQ29udGV4 dChUaHJlYWRJZGVudGlmaWVyIHRocmVhZElEKQoreworICAgIHJldHVybiBjb250ZXh0Rm9ySWRl bnRpZmllcih0aHJlYWRJRCk7Cit9CisKIE11dGV4OjpNdXRleCgpCiB7CiAgICAgbV9tdXRleC5t X3JlY3Vyc2lvbkNvdW50ID0gMDsK 49481 2010-02-25 05:50:02 -0800 2010-02-25 06:49:18 -0800 patch bug-35379-20100225145000.patch text/plain 7543 jochen ZGlmZiAtLWdpdCBhL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZyBiL0phdmFTY3JpcHRDb3JlL0No YW5nZUxvZwppbmRleCA3NWQyMjhkLi45MTM3NmNhIDEwMDY0NAotLS0gYS9KYXZhU2NyaXB0Q29y ZS9DaGFuZ2VMb2cKKysrIGIvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzEg QEAKKzIwMTAtMDItMjUgIEpvY2hlbiBFaXNpbmdlciAgPGpvY2hlbkBjaHJvbWl1bS5vcmc+CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTWFrZSB0aGUg Y29udGV4dCB0aGF0IHdhcyBwYXNzZWQgdG8gdGhlIFRocmVhZEZ1bmN0aW9uIGFjY2Vzc2libGUu CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNTM3OQor CisgICAgICAgICogd3RmL1RocmVhZGluZy5oOgorICAgICAgICAqIHd0Zi9UaHJlYWRpbmdOb25l LmNwcDoKKyAgICAgICAgKFdURjo6dGhyZWFkQ29udGV4dCk6CisgICAgICAgICogd3RmL1RocmVh ZGluZ1B0aHJlYWRzLmNwcDoKKyAgICAgICAgKFdURjo6KToKKyAgICAgICAgKFdURjo6aWRlbnRp ZmllckJ5UHRocmVhZEhhbmRsZSk6CisgICAgICAgIChXVEY6OmVzdGFibGlzaElkZW50aWZpZXJG b3JQdGhyZWFkSGFuZGxlKToKKyAgICAgICAgKFdURjo6cHRocmVhZEhhbmRsZUZvcklkZW50aWZp ZXIpOgorICAgICAgICAoV1RGOjpjb250ZXh0Rm9ySWRlbnRpZmllcik6CisgICAgICAgIChXVEY6 OmNyZWF0ZVRocmVhZEludGVybmFsKToKKyAgICAgICAgKFdURjo6Y3VycmVudFRocmVhZCk6Cisg ICAgICAgIChXVEY6OnRocmVhZENvbnRleHQpOgorICAgICAgICAqIHd0Zi9UaHJlYWRpbmdXaW4u Y3BwOgorICAgICAgICAoV1RGOjopOgorICAgICAgICAoV1RGOjp0aHJlYWRNYXApOgorICAgICAg ICAoV1RGOjpzdG9yZVRocmVhZEhhbmRsZUJ5SWRlbnRpZmllcik6CisgICAgICAgIChXVEY6OnRo cmVhZEhhbmRsZUZvcklkZW50aWZpZXIpOgorICAgICAgICAoV1RGOjpjb250ZXh0Rm9ySWRlbnRp Zmllcik6CisgICAgICAgIChXVEY6OmNyZWF0ZVRocmVhZEludGVybmFsKToKKyAgICAgICAgKFdU Rjo6dGhyZWFkQ29udGV4dCk6CisKIDIwMTAtMDItMjMgIEd1c3Rhdm8gTm9yb25oYSBTaWx2YSAg PGduc0Bnbm9tZS5vcmc+CiAKICAgICAgICAgUnViYmVyLXN0YW1wZWQgYnkgRGltaXRyaSBHbGF6 a292LgpkaWZmIC0tZ2l0IGEvSmF2YVNjcmlwdENvcmUvd3RmL1RocmVhZGluZy5oIGIvSmF2YVNj cmlwdENvcmUvd3RmL1RocmVhZGluZy5oCmluZGV4IGI3YTJmMDguLmI1MjI5MTUgMTAwNjQ0Ci0t LSBhL0phdmFTY3JpcHRDb3JlL3d0Zi9UaHJlYWRpbmcuaAorKysgYi9KYXZhU2NyaXB0Q29yZS93 dGYvVGhyZWFkaW5nLmgKQEAgLTEyNyw2ICsxMjcsNyBAQCBUaHJlYWRJZGVudGlmaWVyIGN1cnJl bnRUaHJlYWQoKTsKIGJvb2wgaXNNYWluVGhyZWFkKCk7CiBpbnQgd2FpdEZvclRocmVhZENvbXBs ZXRpb24oVGhyZWFkSWRlbnRpZmllciwgdm9pZCoqKTsKIHZvaWQgZGV0YWNoVGhyZWFkKFRocmVh ZElkZW50aWZpZXIpOwordm9pZCogdGhyZWFkQ29udGV4dChUaHJlYWRJZGVudGlmaWVyKTsKIAog I2lmIFVTRShQVEhSRUFEUykKIHR5cGVkZWYgcHRocmVhZF9tdXRleF90IFBsYXRmb3JtTXV0ZXg7 CmRpZmYgLS1naXQgYS9KYXZhU2NyaXB0Q29yZS93dGYvVGhyZWFkaW5nTm9uZS5jcHAgYi9KYXZh U2NyaXB0Q29yZS93dGYvVGhyZWFkaW5nTm9uZS5jcHAKaW5kZXggMmU4YTI1OS4uY2ZjOWQzMSAx MDA2NDQKLS0tIGEvSmF2YVNjcmlwdENvcmUvd3RmL1RocmVhZGluZ05vbmUuY3BwCisrKyBiL0ph dmFTY3JpcHRDb3JlL3d0Zi9UaHJlYWRpbmdOb25lLmNwcApAQCAtNDEsNiArNDEsNyBAQCBpbnQg d2FpdEZvclRocmVhZENvbXBsZXRpb24oVGhyZWFkSWRlbnRpZmllciwgdm9pZCoqKSB7IHJldHVy biAwOyB9CiB2b2lkIGRldGFjaFRocmVhZChUaHJlYWRJZGVudGlmaWVyKSB7IH0KIFRocmVhZElk ZW50aWZpZXIgY3VycmVudFRocmVhZCgpIHsgcmV0dXJuIFRocmVhZElkZW50aWZpZXIoKTsgfQog Ym9vbCBpc01haW5UaHJlYWQoKSB7IHJldHVybiB0cnVlOyB9Cit2b2lkKiB0aHJlYWRDb250ZXh0 KFRocmVhZElkZW50aWZpZXIpIHsgcmV0dXJuIDA7IH0KIAogTXV0ZXg6Ok11dGV4KCkgeyB9CiBN dXRleDo6fk11dGV4KCkgeyB9CmRpZmYgLS1naXQgYS9KYXZhU2NyaXB0Q29yZS93dGYvVGhyZWFk aW5nUHRocmVhZHMuY3BwIGIvSmF2YVNjcmlwdENvcmUvd3RmL1RocmVhZGluZ1B0aHJlYWRzLmNw cAppbmRleCAyZmViODA4Li5lODQxZjYyIDEwMDY0NAotLS0gYS9KYXZhU2NyaXB0Q29yZS93dGYv VGhyZWFkaW5nUHRocmVhZHMuY3BwCisrKyBiL0phdmFTY3JpcHRDb3JlL3d0Zi9UaHJlYWRpbmdQ dGhyZWFkcy5jcHAKQEAgLTUzLDcgKzUzLDEyIEBACiAKIG5hbWVzcGFjZSBXVEYgewogCi10eXBl ZGVmIEhhc2hNYXA8VGhyZWFkSWRlbnRpZmllciwgcHRocmVhZF90PiBUaHJlYWRNYXA7Cit0eXBl ZGVmIHN0cnVjdCB7CisgICAgcHRocmVhZF90IGhhbmRsZTsKKyAgICB2b2lkKiBjb250ZXh0Owor fSBUaHJlYWRJbmZvOworCit0eXBlZGVmIEhhc2hNYXA8VGhyZWFkSWRlbnRpZmllciwgVGhyZWFk SW5mbz4gVGhyZWFkTWFwOwogCiBzdGF0aWMgTXV0ZXgqIGF0b21pY2FsbHlJbml0aWFsaXplZFN0 YXRpY011dGV4OwogCkBAIC0xMDUsMTQgKzExMCwxNCBAQCBzdGF0aWMgVGhyZWFkSWRlbnRpZmll ciBpZGVudGlmaWVyQnlQdGhyZWFkSGFuZGxlKGNvbnN0IHB0aHJlYWRfdCYgcHRocmVhZEhhbmRs ZQogCiAgICAgVGhyZWFkTWFwOjppdGVyYXRvciBpID0gdGhyZWFkTWFwKCkuYmVnaW4oKTsKICAg ICBmb3IgKDsgaSAhPSB0aHJlYWRNYXAoKS5lbmQoKTsgKytpKSB7Ci0gICAgICAgIGlmIChwdGhy ZWFkX2VxdWFsKGktPnNlY29uZCwgcHRocmVhZEhhbmRsZSkpCisgICAgICAgIGlmIChwdGhyZWFk X2VxdWFsKGktPnNlY29uZC5oYW5kbGUsIHB0aHJlYWRIYW5kbGUpKQogICAgICAgICAgICAgcmV0 dXJuIGktPmZpcnN0OwogICAgIH0KIAogICAgIHJldHVybiAwOwogfQogCi1zdGF0aWMgVGhyZWFk SWRlbnRpZmllciBlc3RhYmxpc2hJZGVudGlmaWVyRm9yUHRocmVhZEhhbmRsZShjb25zdCBwdGhy ZWFkX3QmIHB0aHJlYWRIYW5kbGUpCitzdGF0aWMgVGhyZWFkSWRlbnRpZmllciBlc3RhYmxpc2hJ ZGVudGlmaWVyRm9yUHRocmVhZEhhbmRsZShjb25zdCBwdGhyZWFkX3QmIHB0aHJlYWRIYW5kbGUs IHZvaWQqIGNvbnRleHQpCiB7CiAgICAgQVNTRVJUKCFpZGVudGlmaWVyQnlQdGhyZWFkSGFuZGxl KHB0aHJlYWRIYW5kbGUpKTsKIApAQCAtMTIwLDcgKzEyNSwxMCBAQCBzdGF0aWMgVGhyZWFkSWRl bnRpZmllciBlc3RhYmxpc2hJZGVudGlmaWVyRm9yUHRocmVhZEhhbmRsZShjb25zdCBwdGhyZWFk X3QmIHB0aAogCiAgICAgc3RhdGljIFRocmVhZElkZW50aWZpZXIgaWRlbnRpZmllckNvdW50ID0g MTsKIAotICAgIHRocmVhZE1hcCgpLmFkZChpZGVudGlmaWVyQ291bnQsIHB0aHJlYWRIYW5kbGUp OworICAgIFRocmVhZEluZm8gaW5mbzsKKyAgICBpbmZvLmhhbmRsZSA9IHB0aHJlYWRIYW5kbGU7 CisgICAgaW5mby5jb250ZXh0ID0gY29udGV4dDsKKyAgICB0aHJlYWRNYXAoKS5hZGQoaWRlbnRp ZmllckNvdW50LCBpbmZvKTsKIAogICAgIHJldHVybiBpZGVudGlmaWVyQ291bnQrKzsKIH0KQEAg LTEyOSw5ICsxMzcsMTcgQEAgc3RhdGljIHB0aHJlYWRfdCBwdGhyZWFkSGFuZGxlRm9ySWRlbnRp ZmllcihUaHJlYWRJZGVudGlmaWVyIGlkKQogewogICAgIE11dGV4TG9ja2VyIGxvY2tlcih0aHJl YWRNYXBNdXRleCgpKTsKIAotICAgIHJldHVybiB0aHJlYWRNYXAoKS5nZXQoaWQpOworICAgIHJl dHVybiB0aHJlYWRNYXAoKS5nZXQoaWQpLmhhbmRsZTsKK30KKworc3RhdGljIHZvaWQqIGNvbnRl eHRGb3JJZGVudGlmaWVyKFRocmVhZElkZW50aWZpZXIgaWQpCit7CisgICAgTXV0ZXhMb2NrZXIg bG9ja2VyKHRocmVhZE1hcE11dGV4KCkpOworCisgICAgcmV0dXJuIHRocmVhZE1hcCgpLmdldChp ZCkuY29udGV4dDsKIH0KIAorCiB2b2lkIGNsZWFyUHRocmVhZEhhbmRsZUZvcklkZW50aWZpZXIo VGhyZWFkSWRlbnRpZmllciBpZCkKIHsKICAgICBNdXRleExvY2tlciBsb2NrZXIodGhyZWFkTWFw TXV0ZXgoKSk7CkBAIC0xNzQsNyArMTkwLDcgQEAgVGhyZWFkSWRlbnRpZmllciBjcmVhdGVUaHJl YWRJbnRlcm5hbChUaHJlYWRGdW5jdGlvbiBlbnRyeVBvaW50LCB2b2lkKiBkYXRhLCBjb24KICAg ICAgICAgZGVsZXRlIHRocmVhZERhdGE7CiAgICAgICAgIHJldHVybiAwOwogICAgIH0KLSAgICBy ZXR1cm4gZXN0YWJsaXNoSWRlbnRpZmllckZvclB0aHJlYWRIYW5kbGUodGhyZWFkSGFuZGxlKTsK KyAgICByZXR1cm4gZXN0YWJsaXNoSWRlbnRpZmllckZvclB0aHJlYWRIYW5kbGUodGhyZWFkSGFu ZGxlLCBkYXRhKTsKIH0KICNlbHNlCiBUaHJlYWRJZGVudGlmaWVyIGNyZWF0ZVRocmVhZEludGVy bmFsKFRocmVhZEZ1bmN0aW9uIGVudHJ5UG9pbnQsIHZvaWQqIGRhdGEsIGNvbnN0IGNoYXIqKQpA QCAtMTg1LDcgKzIwMSw3IEBAIFRocmVhZElkZW50aWZpZXIgY3JlYXRlVGhyZWFkSW50ZXJuYWwo VGhyZWFkRnVuY3Rpb24gZW50cnlQb2ludCwgdm9pZCogZGF0YSwgY29uCiAgICAgICAgIHJldHVy biAwOwogICAgIH0KIAotICAgIHJldHVybiBlc3RhYmxpc2hJZGVudGlmaWVyRm9yUHRocmVhZEhh bmRsZSh0aHJlYWRIYW5kbGUpOworICAgIHJldHVybiBlc3RhYmxpc2hJZGVudGlmaWVyRm9yUHRo cmVhZEhhbmRsZSh0aHJlYWRIYW5kbGUsIGRhdGEpOwogfQogI2VuZGlmCiAKQEAgLTIzNSw3ICsy NTEsNyBAQCBUaHJlYWRJZGVudGlmaWVyIGN1cnJlbnRUaHJlYWQoKQogICAgICAgICByZXR1cm4g aWQ7CiAKICAgICAvLyBOb3QgYSBXVEYtY3JlYXRlZCB0aHJlYWQsIFRocmVhZElkZW50aWZpZXIg aXMgbm90IGVzdGFibGlzaGVkIHlldC4KLSAgICBpZCA9IGVzdGFibGlzaElkZW50aWZpZXJGb3JQ dGhyZWFkSGFuZGxlKHB0aHJlYWRfc2VsZigpKTsKKyAgICBpZCA9IGVzdGFibGlzaElkZW50aWZp ZXJGb3JQdGhyZWFkSGFuZGxlKHB0aHJlYWRfc2VsZigpLCAwKTsKICAgICBUaHJlYWRJZGVudGlm aWVyRGF0YTo6aW5pdGlhbGl6ZShpZCk7CiAgICAgcmV0dXJuIGlkOwogfQpAQCAtMjQ5LDYgKzI2 NSwxMSBAQCBib29sIGlzTWFpblRocmVhZCgpCiAjZW5kaWYKIH0KIAordm9pZCogdGhyZWFkQ29u dGV4dChUaHJlYWRJZGVudGlmaWVyIGlkKQoreworICAgIHJldHVybiBjb250ZXh0Rm9ySWRlbnRp ZmllcihpZCk7IAorfQorCiBNdXRleDo6TXV0ZXgoKQogewogICAgIHB0aHJlYWRfbXV0ZXhfaW5p dCgmbV9tdXRleCwgTlVMTCk7CmRpZmYgLS1naXQgYS9KYXZhU2NyaXB0Q29yZS93dGYvVGhyZWFk aW5nV2luLmNwcCBiL0phdmFTY3JpcHRDb3JlL3d0Zi9UaHJlYWRpbmdXaW4uY3BwCmluZGV4IDcz YzNmMGMuLjc1ZGE3YjQgMTAwNjQ0Ci0tLSBhL0phdmFTY3JpcHRDb3JlL3d0Zi9UaHJlYWRpbmdX aW4uY3BwCisrKyBiL0phdmFTY3JpcHRDb3JlL3d0Zi9UaHJlYWRpbmdXaW4uY3BwCkBAIC0xMTgs NiArMTE4LDExIEBAIHR5cGVkZWYgc3RydWN0IHRhZ1RIUkVBRE5BTUVfSU5GTyB7CiB9IFRIUkVB RE5BTUVfSU5GTzsKICNwcmFnbWEgcGFjayhwb3ApCiAKK3R5cGVkZWYgc3RydWN0IHsKKyAgICBI QU5ETEUgaGFuZGxlOworICAgIHZvaWQqIGNvbnRleHQ7Cit9IFRocmVhZEluZm87CisKIHZvaWQg aW5pdGlhbGl6ZUN1cnJlbnRUaHJlYWRJbnRlcm5hbChjb25zdCBjaGFyKiBzelRocmVhZE5hbWUp CiB7CiAgICAgVEhSRUFETkFNRV9JTkZPIGluZm87CkBAIC0xNjUsMjMgKzE3MCwzMiBAQCB2b2lk IGluaXRpYWxpemVUaHJlYWRpbmcoKQogICAgIH0KIH0KIAotc3RhdGljIEhhc2hNYXA8RFdPUkQs IEhBTkRMRT4mIHRocmVhZE1hcCgpCitzdGF0aWMgSGFzaE1hcDxEV09SRCwgVGhyZWFkSW5mbz4m IHRocmVhZE1hcCgpCiB7Ci0gICAgc3RhdGljIEhhc2hNYXA8RFdPUkQsIEhBTkRMRT4gbWFwOwor ICAgIHN0YXRpYyBIYXNoTWFwPERXT1JELCBUaHJlYWRJbmZvPiBtYXA7CiAgICAgcmV0dXJuIG1h cDsKIH0KIAotc3RhdGljIHZvaWQgc3RvcmVUaHJlYWRIYW5kbGVCeUlkZW50aWZpZXIoRFdPUkQg dGhyZWFkSUQsIEhBTkRMRSB0aHJlYWRIYW5kbGUpCitzdGF0aWMgdm9pZCBzdG9yZVRocmVhZEhh bmRsZUJ5SWRlbnRpZmllcihEV09SRCB0aHJlYWRJRCwgSEFORExFIHRocmVhZEhhbmRsZSwgdm9p ZCogY29udGV4dCkKIHsKICAgICBNdXRleExvY2tlciBsb2NrZXIodGhyZWFkTWFwTXV0ZXgoKSk7 CiAgICAgQVNTRVJUKCF0aHJlYWRNYXAoKS5jb250YWlucyh0aHJlYWRJRCkpOwotICAgIHRocmVh ZE1hcCgpLmFkZCh0aHJlYWRJRCwgdGhyZWFkSGFuZGxlKTsKKyAgICBUaHJlYWRJbmZvIGluZm87 CisgICAgaW5mby5oYW5kbGUgPSB0aHJlYWRIYW5kbGU7CisgICAgaW5mby5jb250ZXh0ID0gY29u dGV4dDsKKyAgICB0aHJlYWRNYXAoKS5hZGQodGhyZWFkSUQsIGluZm8pOwogfQogCiBzdGF0aWMg SEFORExFIHRocmVhZEhhbmRsZUZvcklkZW50aWZpZXIoVGhyZWFkSWRlbnRpZmllciBpZCkKIHsK ICAgICBNdXRleExvY2tlciBsb2NrZXIodGhyZWFkTWFwTXV0ZXgoKSk7Ci0gICAgcmV0dXJuIHRo cmVhZE1hcCgpLmdldChpZCk7CisgICAgcmV0dXJuIHRocmVhZE1hcCgpLmdldChpZCkuaGFuZGxl OworfQorCitzdGF0aWMgdm9pZCogY29udGV4dEZvcklkZW50aWZpZXIoVGhyZWFkSWRlbnRpZmll ciBpZCkKK3sKKyAgICBNdXRleExvY2tlciBsb2NrZXIodGhyZWFkTWFwTXV0ZXgoKSk7CisgICAg cmV0dXJuIHRocmVhZE1hcCgpLmdldChpZCkuY29udGV4dDsKIH0KIAogc3RhdGljIHZvaWQgY2xl YXJUaHJlYWRIYW5kbGVGb3JJZGVudGlmaWVyKFRocmVhZElkZW50aWZpZXIgaWQpCkBAIC0yMzcs NyArMjUxLDcgQEAgVGhyZWFkSWRlbnRpZmllciBjcmVhdGVUaHJlYWRJbnRlcm5hbChUaHJlYWRG dW5jdGlvbiBlbnRyeVBvaW50LCB2b2lkKiBkYXRhLCBjb24KICAgICB9CiAKICAgICB0aHJlYWRJ RCA9IHN0YXRpY19jYXN0PFRocmVhZElkZW50aWZpZXI+KHRocmVhZElkZW50aWZpZXIpOwotICAg IHN0b3JlVGhyZWFkSGFuZGxlQnlJZGVudGlmaWVyKHRocmVhZElkZW50aWZpZXIsIHRocmVhZEhh bmRsZSk7CisgICAgc3RvcmVUaHJlYWRIYW5kbGVCeUlkZW50aWZpZXIodGhyZWFkSWRlbnRpZmll ciwgdGhyZWFkSGFuZGxlLCBkYXRhKTsKIAogICAgIHJldHVybiB0aHJlYWRJRDsKIH0KQEAgLTI4 MCw2ICsyOTQsMTEgQEAgYm9vbCBpc01haW5UaHJlYWQoKQogICAgIHJldHVybiBjdXJyZW50VGhy ZWFkKCkgPT0gbWFpblRocmVhZElkZW50aWZpZXI7CiB9CiAKK3ZvaWQqIHRocmVhZENvbnRleHQo VGhyZWFkSWRlbnRpZmllciB0aHJlYWRJRCkKK3sKKyAgICByZXR1cm4gY29udGV4dEZvcklkZW50 aWZpZXIodGhyZWFkSUQpOworfQorCiBNdXRleDo6TXV0ZXgoKQogewogICAgIG1fbXV0ZXgubV9y ZWN1cnNpb25Db3VudCA9IDA7Cg==