69840 2011-10-11 07:43:52 -0700 Fix build with GLib 2.31 2012-05-26 16:40:04 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 0 tomeu.vizoso gustavo gustavo levin+threading mrobinson silouck webkit.review.bot xan.lopez oldest_to_newest 481625 0 tomeu.vizoso 2011-10-11 07:43:52 -0700 Fix build with GLib 2.31 481626 1 110514 tomeu.vizoso 2011-10-11 07:45:30 -0700 Created attachment 110514 Patch 481636 2 110514 gyuyoung.kim 2011-10-11 08:02:29 -0700 Comment on attachment 110514 Patch Attachment 110514 did not pass efl-ews (efl): Output: http://queues.webkit.org/results/10028526 481638 3 110514 gustavo 2011-10-11 08:08:58 -0700 Comment on attachment 110514 Patch This partially defeats the purpose of the GTypedefs.h header, which was intended mainly to avoid including glib.h and a few other headers, and is lacking a ChangeLog entry (I know, it sucks) which you can generate with ./Tools/Scripts/prepare-ChangeLog. I see two ways going forward: 1 - give up on avoiding including glib (and then removing all of the relevant typedefs) 2 - stop using GMutex; there was some discussion in webkit-dev about dropping non-pthread/non-win32 implementations, I wonder if we could just go that route? 482398 4 110683 gustavo 2011-10-12 07:24:29 -0700 Created attachment 110683 Patch 482399 5 gustavo 2011-10-12 07:26:15 -0700 The only usage of GMutex/GCond remaining after this is inside the gstreamer backend and does not use the GOwnPtr support. We can make it use wtf threading in a follow up. 482430 6 110683 mrobinson 2011-10-12 08:40:58 -0700 Comment on attachment 110683 Patch This breaks Win32 GTK+, but if possible, it should switch to ThreadingWin.cpp instead. 482473 7 110683 gustavo 2011-10-12 09:54:42 -0700 Comment on attachment 110683 Patch Clearing flags on attachment: 110683 Committed r97269: <http://trac.webkit.org/changeset/97269> 482475 8 gustavo 2011-10-12 09:54:50 -0700 All reviewed patches have been landed. Closing bug. 634685 9 yael 2012-05-26 16:40:04 -0700 *** Bug 72085 has been marked as a duplicate of this bug. *** 110514 2011-10-11 07:45:30 -0700 2011-10-12 07:24:18 -0700 Patch bug-69840-20111011164528.patch text/plain 982 tomeu.vizoso U3VidmVyc2lvbiBSZXZpc2lvbjogOTU1MzMKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS93dGYvZ29iamVjdC9HVHlwZWRlZnMuaCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS93dGYv Z29iamVjdC9HVHlwZWRlZnMuaAppbmRleCA4NTQ4YWNhODliMWExNWQ3Y2NhNDA1NmRlNGVjNjY4 Y2QzNmU1NWY1Li4yMmMwZDFmZDg3MTNjY2EzYzJjNTY1MDY4MzEwZTUzNGY2NjE0NWVkIDEwMDY0 NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvd3RmL2dvYmplY3QvR1R5cGVkZWZzLmgKKysr IGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3d0Zi9nb2JqZWN0L0dUeXBlZGVmcy5oCkBAIC0yMyw2 ICsyMyw4IEBACiAvKiBWYW5pbGxhIEMgY29kZSBkb2VzIG5vdCBzZWVtIHRvIGJlIGFibGUgdG8g aGFuZGxlIGZvcndhcmQtZGVjbGFyYXRpb24gdHlwZWRlZnMuICovCiAjaWZkZWYgIF9fY3BsdXNw bHVzCiAKKyNpbmNsdWRlIDxnbGliLmg+CisKIHR5cGVkZWYgY2hhciBnY2hhcjsKIHR5cGVkZWYg ZG91YmxlIGdkb3VibGU7CiB0eXBlZGVmIGZsb2F0IGdmbG9hdDsKQEAgLTUzLDcgKzU1LDEzIEBA IHR5cGVkZWYgc3RydWN0IF9HRmlsZSBHRmlsZTsKIHR5cGVkZWYgc3RydWN0IF9HSGFzaFRhYmxl IEdIYXNoVGFibGU7CiB0eXBlZGVmIHN0cnVjdCBfR0lucHV0U3RyZWFtIEdJbnB1dFN0cmVhbTsK IHR5cGVkZWYgc3RydWN0IF9HTGlzdCBHTGlzdDsKKworI2lmIEdMSUJfQ0hFQ0tfVkVSU0lPTigy LCAzMSwgMCkKK3R5cGVkZWYgdW5pb24gX0dNdXRleCBHTXV0ZXg7CisjZWxzZQogdHlwZWRlZiBz dHJ1Y3QgX0dNdXRleCBHTXV0ZXg7CisjZW5kaWYKKwogdHlwZWRlZiBzdHJ1Y3QgX0dQYXR0ZXJu U3BlYyBHUGF0dGVyblNwZWM7CiB0eXBlZGVmIHN0cnVjdCBfR1BvbGxhYmxlT3V0cHV0U3RyZWFt IEdQb2xsYWJsZU91dHB1dFN0cmVhbTsKIHR5cGVkZWYgc3RydWN0IF9HU29ja2V0Q2xpZW50IEdT b2NrZXRDbGllbnQ7Cg== 110683 2011-10-12 07:24:29 -0700 2011-10-12 09:54:42 -0700 Patch bug-69840-20111012112427.patch text/plain 13095 gustavo U3VidmVyc2lvbiBSZXZpc2lvbjogOTcxNTAKZGlmZiAtLWdpdCBhL0NoYW5nZUxvZyBiL0NoYW5n ZUxvZwppbmRleCAyNGFkNTliYjA5MDQ2NTNlOTBkMWMwODY5Y2M2NTVmZmUzM2I3NjFhLi45NjAw ZDFjMjVkZTJjZjkwMTY5NDMwM2Y4OTUwYWMxYjcyMjhjNjU2IDEwMDY0NAotLS0gYS9DaGFuZ2VM b2cKKysrIGIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMTEtMTAtMTIgIEd1c3Rhdm8g Tm9yb25oYSBTaWx2YSAgPGd1c3Rhdm8ubm9yb25oYUBjb2xsYWJvcmEuY28udWs+CisKKyAgICAg ICAgRml4IGJ1aWxkIHdpdGggR0xpYiAyLjMxCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD02OTg0MAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgICogY29uZmlndXJlLmFjOiBhZGQgY2hlY2sgZm9yIHB0aHJlYWQg cndsb2NrIHN1cHBvcnQuCisKIDIwMTEtMTAtMTEgIFRvciBBcm5lIFZlc3Riw7ggIDx0b3IuYXJu ZS52ZXN0Ym9Abm9raWEuY29tPgogCiAgICAgICAgIFtRdF0gUmVtb3ZlIGFsbCByZWZlcmVuY2Vz IHRvIFFURElSX2J1aWxkIGFuZCBzdGFuZGFsb25lX3BhY2thZ2UKZGlmZiAtLWdpdCBhL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvQ2hhbmdl TG9nCmluZGV4IGJiZGY0NGI1MWE0ZGFiYWMxMDlkZThlOWYwZjIzNTU4YTIwOWVlM2MuLjgzMjky ZmQyOTBiYmQyNzdhOTJmNzlmMWY5ZGIzM2VjNWU5YTkwMjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5n ZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDExLTEwLTEyICBHdXN0YXZvIE5vcm9uaGEgU2lsdmEg IDxndXN0YXZvLm5vcm9uaGFAY29sbGFib3JhLmNvLnVrPgorCisgICAgICAgIEZpeCBidWlsZCB3 aXRoIEdMaWIgMi4zMQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9Njk4NDAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICAqIEdOVW1ha2VmaWxlLmxpc3QuYW06IHJlbW92ZWQgVGhyZWFkaW5nR3RrLmNwcC4KKyAg ICAgICAgKiB3dGYvVGhyZWFkaW5nUHJpbWl0aXZlcy5oOiByZW1vdmUgR1RLKy1zcGVjaWZpYyBk ZWZpbml0aW9ucy4KKyAgICAgICAgKiB3dGYvZ29iamVjdC9HT3duUHRyLmNwcDogcmVtb3ZlIEdD b25kIGFuZCBHTXV0ZXggc3BlY2lhbGl6YXRpb25zLgorICAgICAgICAqIHd0Zi9nb2JqZWN0L0dP d25QdHIuaDogZGl0dG8uCisgICAgICAgICogd3RmL2dvYmplY3QvR1R5cGVkZWZzLmg6IHJlbW92 ZSBHQ29uZCBhbmQgR011dGV4IGZvcndhcmQgZGVjbGFyYXRpb25zLgorICAgICAgICAqIHd0Zi9n dGsvVGhyZWFkaW5nR3RrLmNwcDogUmVtb3ZlZC4KKwogMjAxMS0xMC0xMSAgVG9yIEFybmUgVmVz dGLDuCAgPHRvci5hcm5lLnZlc3Rib0Bub2tpYS5jb20+CiAKICAgICAgICAgW1F0XSBSZW1vdmUg YWxsIHJlZmVyZW5jZXMgdG8gUVRESVJfYnVpbGQgYW5kIHN0YW5kYWxvbmVfcGFja2FnZQpkaWZm IC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL0dOVW1ha2VmaWxlLmxpc3QuYW0gYi9Tb3Vy Y2UvSmF2YVNjcmlwdENvcmUvR05VbWFrZWZpbGUubGlzdC5hbQppbmRleCA2YzQ2NzcwYzkxMDVl MjZkMzhkMzI5ZTU3ZTU4NTU1YzcyOGQ5YmNiLi41ZTcwNDA2MzY5MTE4YjFlYmU3NTRlYmM0OWI2 NGRmNzdjYmNjODlhIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvR05VbWFrZWZp bGUubGlzdC5hbQorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvR05VbWFrZWZpbGUubGlzdC5h bQpAQCAtNTMzLDcgKzUzMyw2IEBAIGphdmFzY3JpcHRjb3JlX3NvdXJjZXMgKz0gXAogCVNvdXJj ZS9KYXZhU2NyaXB0Q29yZS93dGYvZ29iamVjdC9HUmVmUHRyLmggXAogCVNvdXJjZS9KYXZhU2Ny aXB0Q29yZS93dGYvZ29iamVjdC9HVHlwZWRlZnMuaCBcCiAJU291cmNlL0phdmFTY3JpcHRDb3Jl L3d0Zi9ndGsvTWFpblRocmVhZEd0ay5jcHAgXAotCVNvdXJjZS9KYXZhU2NyaXB0Q29yZS93dGYv Z3RrL1RocmVhZGluZ0d0ay5jcHAgXAogCVNvdXJjZS9KYXZhU2NyaXB0Q29yZS93dGYvSGFzaENv dW50ZWRTZXQuaCBcCiAJU291cmNlL0phdmFTY3JpcHRDb3JlL3d0Zi9IYXNoRnVuY3Rpb25zLmgg XAogCVNvdXJjZS9KYXZhU2NyaXB0Q29yZS93dGYvSGFzaEl0ZXJhdG9ycy5oIFwKZGlmZiAtLWdp dCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS93dGYvVGhyZWFkaW5nUHJpbWl0aXZlcy5oIGIvU291 cmNlL0phdmFTY3JpcHRDb3JlL3d0Zi9UaHJlYWRpbmdQcmltaXRpdmVzLmgKaW5kZXggODMxYTk5 ZTI2ZmY1ZTQzZTk4YjliODg0MzVkNDFhMDI4NGFjZGFiMC4uOWYyNjNhZTVjOTg1ZjVhYmJlMjlj MjQ3YmEwNGRiMGUzNzNhMmUyMCAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3d0 Zi9UaHJlYWRpbmdQcmltaXRpdmVzLmgKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3d0Zi9U aHJlYWRpbmdQcmltaXRpdmVzLmgKQEAgLTQ0LDggKzQ0LDYgQEAKIAogI2lmIFVTRShQVEhSRUFE UykKICNpbmNsdWRlIDxwdGhyZWFkLmg+Ci0jZWxpZiBQTEFURk9STShHVEspCi0jaW5jbHVkZSAi R093blB0ci5oIgogI2VuZGlmCiAKICNpZiBQTEFURk9STShRVCkKQEAgLTY2LDEwICs2NCw2IEBA IHR5cGVkZWYgcHRocmVhZF9yd2xvY2tfdCBQbGF0Zm9ybVJlYWRXcml0ZUxvY2s7CiB0eXBlZGVm IHZvaWQqIFBsYXRmb3JtUmVhZFdyaXRlTG9jazsKICNlbmRpZgogdHlwZWRlZiBwdGhyZWFkX2Nv bmRfdCBQbGF0Zm9ybUNvbmRpdGlvbjsKLSNlbGlmIFBMQVRGT1JNKEdUSykKLXR5cGVkZWYgR093 blB0cjxHTXV0ZXg+IFBsYXRmb3JtTXV0ZXg7Ci10eXBlZGVmIHZvaWQqIFBsYXRmb3JtUmVhZFdy aXRlTG9jazsgLy8gRklYTUU6IEltcGxlbWVudC4KLXR5cGVkZWYgR093blB0cjxHQ29uZD4gUGxh dGZvcm1Db25kaXRpb247CiAjZWxpZiBQTEFURk9STShRVCkKIHR5cGVkZWYgUVRfUFJFUEVORF9O QU1FU1BBQ0UoUU11dGV4KSogUGxhdGZvcm1NdXRleDsKIHR5cGVkZWYgdm9pZCogUGxhdGZvcm1S ZWFkV3JpdGVMb2NrOyAvLyBGSVhNRTogSW1wbGVtZW50LgpkaWZmIC0tZ2l0IGEvU291cmNlL0ph dmFTY3JpcHRDb3JlL3d0Zi9nb2JqZWN0L0dPd25QdHIuY3BwIGIvU291cmNlL0phdmFTY3JpcHRD b3JlL3d0Zi9nb2JqZWN0L0dPd25QdHIuY3BwCmluZGV4IDdjNTFlZTFiZDZmM2I1M2JhYzY0YmFi NDg0NmQ4NmMyNDAzZmVjZjAuLjUwYzdiOWZmYzE3ZTJmNTk0MjUxNTliYWFhZjg5ZTZiNjkzMTUy MWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS93dGYvZ29iamVjdC9HT3duUHRy LmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvd3RmL2dvYmplY3QvR093blB0ci5jcHAK QEAgLTM3LDE4ICszNyw2IEBAIHRlbXBsYXRlIDw+IHZvaWQgZnJlZU93bmVkR1B0cjxHTGlzdD4o R0xpc3QqIHB0cikKICAgICBnX2xpc3RfZnJlZShwdHIpOwogfQogCi10ZW1wbGF0ZSA8PiB2b2lk IGZyZWVPd25lZEdQdHI8R0NvbmQ+KEdDb25kKiBwdHIpCi17Ci0gICAgaWYgKHB0cikKLSAgICAg ICAgZ19jb25kX2ZyZWUocHRyKTsKLX0KLQotdGVtcGxhdGUgPD4gdm9pZCBmcmVlT3duZWRHUHRy PEdNdXRleD4oR011dGV4KiBwdHIpCi17Ci0gICAgaWYgKHB0cikKLSAgICAgICAgZ19tdXRleF9m cmVlKHB0cik7Ci19Ci0KIHRlbXBsYXRlIDw+IHZvaWQgZnJlZU93bmVkR1B0cjxHUGF0dGVyblNw ZWM+KEdQYXR0ZXJuU3BlYyogcHRyKQogewogICAgIGlmIChwdHIpCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvSmF2YVNjcmlwdENvcmUvd3RmL2dvYmplY3QvR093blB0ci5oIGIvU291cmNlL0phdmFTY3Jp cHRDb3JlL3d0Zi9nb2JqZWN0L0dPd25QdHIuaAppbmRleCA4YzdlODM3MmY3M2ZmNzkwODQxYjU5 YThmOTE0ZDBkOWE2NTVmOGIyLi45ZmY4NWM1YTRmMGI2ZjY3ODZmZDI1NGYwMWRjMDYxOGFjMWU3 MGZmIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvd3RmL2dvYmplY3QvR093blB0 ci5oCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS93dGYvZ29iamVjdC9HT3duUHRyLmgKQEAg LTM1LDggKzM1LDYgQEAgbmFtZXNwYWNlIFdURiB7CiB0ZW1wbGF0ZSA8dHlwZW5hbWUgVD4gaW5s aW5lIHZvaWQgZnJlZU93bmVkR1B0cihUKiBwdHIpOwogdGVtcGxhdGU8PiB2b2lkIGZyZWVPd25l ZEdQdHI8R0Vycm9yPihHRXJyb3IqKTsKIHRlbXBsYXRlPD4gdm9pZCBmcmVlT3duZWRHUHRyPEdM aXN0PihHTGlzdCopOwotdGVtcGxhdGU8PiB2b2lkIGZyZWVPd25lZEdQdHI8R0NvbmQ+KEdDb25k Kik7Ci10ZW1wbGF0ZTw+IHZvaWQgZnJlZU93bmVkR1B0cjxHTXV0ZXg+KEdNdXRleCopOwogdGVt cGxhdGU8PiB2b2lkIGZyZWVPd25lZEdQdHI8R1BhdHRlcm5TcGVjPihHUGF0dGVyblNwZWMqKTsK IHRlbXBsYXRlPD4gdm9pZCBmcmVlT3duZWRHUHRyPEdEaXI+KEdEaXIqKTsKIApkaWZmIC0tZ2l0 IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3d0Zi9nb2JqZWN0L0dUeXBlZGVmcy5oIGIvU291cmNl L0phdmFTY3JpcHRDb3JlL3d0Zi9nb2JqZWN0L0dUeXBlZGVmcy5oCmluZGV4IGM4NzhmMzNjNDcw ZDdlN2Q2ZTEwYWIyMTM0ZmFiOTA1YjEzMWMxMDAuLjY2Y2VkZDZkMjZhN2I1NGJkM2FkYzhiNDcx ZGU1ZDJhNWM3OTgxZmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS93dGYvZ29i amVjdC9HVHlwZWRlZnMuaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvd3RmL2dvYmplY3Qv R1R5cGVkZWZzLmgKQEAgLTM5LDcgKzM5LDYgQEAgdHlwZWRlZiB2b2lkKiBncG9pbnRlcjsKIHR5 cGVkZWYgc3RydWN0IF9HQXN5bmNSZXN1bHQgR0FzeW5jUmVzdWx0OwogdHlwZWRlZiBzdHJ1Y3Qg X0dDYW5jZWxsYWJsZSBHQ2FuY2VsbGFibGU7CiB0eXBlZGVmIHN0cnVjdCBfR0NoYXJzZXRDb252 ZXJ0ZXIgR0NoYXJzZXRDb252ZXJ0ZXI7Ci10eXBlZGVmIHN0cnVjdCBfR0NvbmQgR0NvbmQ7CiB0 eXBlZGVmIHN0cnVjdCBfR0RpciBHRGlyOwogdHlwZWRlZiBzdHJ1Y3QgX0dka0F0b20qIEdka0F0 b207CiB0eXBlZGVmIHN0cnVjdCBfR2RrQ3Vyc29yIEdka0N1cnNvcjsKQEAgLTUyLDcgKzUxLDYg QEAgdHlwZWRlZiBzdHJ1Y3QgX0dGaWxlIEdGaWxlOwogdHlwZWRlZiBzdHJ1Y3QgX0dIYXNoVGFi bGUgR0hhc2hUYWJsZTsKIHR5cGVkZWYgc3RydWN0IF9HSW5wdXRTdHJlYW0gR0lucHV0U3RyZWFt OwogdHlwZWRlZiBzdHJ1Y3QgX0dMaXN0IEdMaXN0OwotdHlwZWRlZiBzdHJ1Y3QgX0dNdXRleCBH TXV0ZXg7CiB0eXBlZGVmIHN0cnVjdCBfR1BhdHRlcm5TcGVjIEdQYXR0ZXJuU3BlYzsKIHR5cGVk ZWYgc3RydWN0IF9HUG9sbGFibGVPdXRwdXRTdHJlYW0gR1BvbGxhYmxlT3V0cHV0U3RyZWFtOwog dHlwZWRlZiBzdHJ1Y3QgX0dTb2NrZXRDbGllbnQgR1NvY2tldENsaWVudDsKZGlmZiAtLWdpdCBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS93dGYvZ3RrL1RocmVhZGluZ0d0ay5jcHAgYi9Tb3VyY2Uv SmF2YVNjcmlwdENvcmUvd3RmL2d0ay9UaHJlYWRpbmdHdGsuY3BwCmRlbGV0ZWQgZmlsZSBtb2Rl IDEwMDY0NAppbmRleCAxZjI0M2VlNmIwNmQ4MzAzYjU1ZWIwOTk4YjA2YzgzOTBkMzliYjdjLi4w MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwCi0tLSBhL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS93dGYvZ3RrL1RocmVhZGluZ0d0ay5jcHAKKysrIC9kZXYvbnVsbApAQCAtMSwy NTcgKzAsMCBAQAotLyoKLSAqIENvcHlyaWdodCAoQykgMjAwNywgMjAwOCBBcHBsZSBJbmMuIEFs bCByaWdodHMgcmVzZXJ2ZWQuCi0gKiBDb3B5cmlnaHQgKEMpIDIwMDcgSnVzdGluIEhheWdvb2Qg KGpoYXlnb29kQHJlYWt0aXguY29tKQotICoKLSAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4g c291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAotICogbW9kaWZpY2F0aW9u LCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCi0g KiBhcmUgbWV0OgotICoKLSAqIDEuICBSZWRpc3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVz dCByZXRhaW4gdGhlIGFib3ZlIGNvcHlyaWdodAotICogICAgIG5vdGljZSwgdGhpcyBsaXN0IG9m IGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lci4KLSAqIDIuICBSZWRpc3Ry aWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhlIGFib3ZlIGNvcHlyaWdo dAotICogICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dp bmcgZGlzY2xhaW1lciBpbiB0aGUKLSAqICAgICBkb2N1bWVudGF0aW9uIGFuZC9vciBvdGhlciBt YXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUgZGlzdHJpYnV0aW9uLgotICogMy4gIE5laXRoZXIg dGhlIG5hbWUgb2YgQXBwbGUgSW5jLiAoIkFwcGxlIikgbm9yIHRoZSBuYW1lcyBvZgotICogICAg IGl0cyBjb250cmlidXRvcnMgbWF5IGJlIHVzZWQgdG8gZW5kb3JzZSBvciBwcm9tb3RlIHByb2R1 Y3RzIGRlcml2ZWQKLSAqICAgICBmcm9tIHRoaXMgc29mdHdhcmUgd2l0aG91dCBzcGVjaWZpYyBw cmlvciB3cml0dGVuIHBlcm1pc3Npb24uCi0gKgotICogVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURF RCBCWSBBUFBMRSBBTkQgSVRTIENPTlRSSUJVVE9SUyAiQVMgSVMiIEFORCBBTlkKLSAqIEVYUFJF U1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywg VEhFIElNUExJRUQKLSAqIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRBQklMSVRZIEFORCBGSVRORVNT IEZPUiBBIFBBUlRJQ1VMQVIgUFVSUE9TRSBBUkUKLSAqIERJU0NMQUlNRUQuIElOIE5PIEVWRU5U IFNIQUxMIEFQUExFIE9SIElUUyBDT05UUklCVVRPUlMgQkUgTElBQkxFIEZPUiBBTlkKLSAqIERJ UkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUwsIFNQRUNJQUwsIEVYRU1QTEFSWSwgT1IgQ09OU0VR VUVOVElBTCBEQU1BR0VTCi0gKiAoSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sIFBST0NV UkVNRU5UIE9GIFNVQlNUSVRVVEUgR09PRFMgT1IgU0VSVklDRVM7Ci0gKiBMT1NTIE9GIFVTRSwg REFUQSwgT1IgUFJPRklUUzsgT1IgQlVTSU5FU1MgSU5URVJSVVBUSU9OKSBIT1dFVkVSIENBVVNF RCBBTkQKLSAqIE9OIEFOWSBUSEVPUlkgT0YgTElBQklMSVRZLCBXSEVUSEVSIElOIENPTlRSQUNU LCBTVFJJQ1QgTElBQklMSVRZLCBPUiBUT1JUCi0gKiAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1Ig T1RIRVJXSVNFKSBBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UgT0YKLSAqIFRISVMg U09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1B R0UuCi0gKi8KLQotI2luY2x1ZGUgImNvbmZpZy5oIgotI2luY2x1ZGUgIlRocmVhZGluZy5oIgot Ci0jaWYgIVVTRShQVEhSRUFEUykKLQotI2luY2x1ZGUgIkN1cnJlbnRUaW1lLmgiCi0jaW5jbHVk ZSAiRGF0ZU1hdGguaCIKLSNpbmNsdWRlICJkdG9hLmgiCi0jaW5jbHVkZSAiSGFzaE1hcC5oIgot I2luY2x1ZGUgIk1haW5UaHJlYWQuaCIKLSNpbmNsdWRlICJSYW5kb21OdW1iZXJTZWVkLmgiCi0j aW5jbHVkZSA8d3RmL1N0ZExpYkV4dHJhcy5oPgotI2luY2x1ZGUgPHd0Zi9XVEZUaHJlYWREYXRh Lmg+Ci0KLSNpbmNsdWRlIDxnbGliLmg+Ci0jaW5jbHVkZSA8bGltaXRzLmg+Ci0KLW5hbWVzcGFj ZSBXVEYgewotCi10eXBlZGVmIEhhc2hNYXA8VGhyZWFkSWRlbnRpZmllciwgR1RocmVhZCo+IFRo cmVhZE1hcDsKLQotc3RhdGljIE11dGV4KiBhdG9taWNhbGx5SW5pdGlhbGl6ZWRTdGF0aWNNdXRl eDsKLQotc3RhdGljIE11dGV4JiB0aHJlYWRNYXBNdXRleCgpCi17Ci0gICAgREVGSU5FX1NUQVRJ Q19MT0NBTChNdXRleCwgbXV0ZXgsICgpKTsKLSAgICByZXR1cm4gbXV0ZXg7Ci19Ci0KLXZvaWQg aW5pdGlhbGl6ZVRocmVhZGluZygpCi17Ci0gICAgaWYgKCFnX3RocmVhZF9zdXBwb3J0ZWQoKSkK LSAgICAgICAgZ190aHJlYWRfaW5pdChOVUxMKTsKLSAgICBBU1NFUlQoZ190aHJlYWRfc3VwcG9y dGVkKCkpOwotCi0gICAgaWYgKCFhdG9taWNhbGx5SW5pdGlhbGl6ZWRTdGF0aWNNdXRleCkgewot ICAgICAgICAvLyBTdHJpbmdJbXBsOjplbXB0eSgpIGRvZXMgbm90IGNvbnN0cnVjdCBpdHMgc3Rh dGljIHN0cmluZyBpbiBhIHRocmVhZHNhZmUgZmFzaGlvbiwKLSAgICAgICAgLy8gc28gZW5zdXJl IGl0IGhhcyBiZWVuIGluaXRpYWxpemVkIGZyb20gaGVyZS4KLSAgICAgICAgU3RyaW5nSW1wbDo6 ZW1wdHkoKTsKLSAgICAgICAgYXRvbWljYWxseUluaXRpYWxpemVkU3RhdGljTXV0ZXggPSBuZXcg TXV0ZXg7Ci0gICAgICAgIHRocmVhZE1hcE11dGV4KCk7Ci0gICAgICAgIGluaXRpYWxpemVSYW5k b21OdW1iZXJHZW5lcmF0b3IoKTsKLSAgICAgICAgd3RmVGhyZWFkRGF0YSgpOwotICAgICAgICBz X2R0b2FQNU11dGV4ID0gbmV3IE11dGV4OwotICAgICAgICBpbml0aWFsaXplRGF0ZXMoKTsKLSAg ICB9Ci19Ci0KLXZvaWQgbG9ja0F0b21pY2FsbHlJbml0aWFsaXplZFN0YXRpY011dGV4KCkKLXsK LSAgICBBU1NFUlQoYXRvbWljYWxseUluaXRpYWxpemVkU3RhdGljTXV0ZXgpOwotICAgIGF0b21p Y2FsbHlJbml0aWFsaXplZFN0YXRpY011dGV4LT5sb2NrKCk7Ci19Ci0KLXZvaWQgdW5sb2NrQXRv bWljYWxseUluaXRpYWxpemVkU3RhdGljTXV0ZXgoKQotewotICAgIGF0b21pY2FsbHlJbml0aWFs aXplZFN0YXRpY011dGV4LT51bmxvY2soKTsKLX0KLQotc3RhdGljIFRocmVhZE1hcCYgdGhyZWFk TWFwKCkKLXsKLSAgICBERUZJTkVfU1RBVElDX0xPQ0FMKFRocmVhZE1hcCwgbWFwLCAoKSk7Ci0g ICAgcmV0dXJuIG1hcDsKLX0KLQotc3RhdGljIFRocmVhZElkZW50aWZpZXIgaWRlbnRpZmllckJ5 R3RocmVhZEhhbmRsZShHVGhyZWFkKiYgdGhyZWFkKQotewotICAgIE11dGV4TG9ja2VyIGxvY2tl cih0aHJlYWRNYXBNdXRleCgpKTsKLQotICAgIFRocmVhZE1hcDo6aXRlcmF0b3IgaSA9IHRocmVh ZE1hcCgpLmJlZ2luKCk7Ci0gICAgZm9yICg7IGkgIT0gdGhyZWFkTWFwKCkuZW5kKCk7ICsraSkg ewotICAgICAgICBpZiAoaS0+c2Vjb25kID09IHRocmVhZCkKLSAgICAgICAgICAgIHJldHVybiBp LT5maXJzdDsKLSAgICB9Ci0KLSAgICByZXR1cm4gMDsKLX0KLQotc3RhdGljIFRocmVhZElkZW50 aWZpZXIgZXN0YWJsaXNoSWRlbnRpZmllckZvclRocmVhZChHVGhyZWFkKiYgdGhyZWFkKQotewot ICAgIEFTU0VSVCghaWRlbnRpZmllckJ5R3RocmVhZEhhbmRsZSh0aHJlYWQpKTsKLQotICAgIE11 dGV4TG9ja2VyIGxvY2tlcih0aHJlYWRNYXBNdXRleCgpKTsKLQotICAgIHN0YXRpYyBUaHJlYWRJ ZGVudGlmaWVyIGlkZW50aWZpZXJDb3VudCA9IDE7Ci0KLSAgICB0aHJlYWRNYXAoKS5hZGQoaWRl bnRpZmllckNvdW50LCB0aHJlYWQpOwotCi0gICAgcmV0dXJuIGlkZW50aWZpZXJDb3VudCsrOwot fQotCi1zdGF0aWMgR1RocmVhZCogdGhyZWFkRm9ySWRlbnRpZmllcihUaHJlYWRJZGVudGlmaWVy IGlkKQotewotICAgIE11dGV4TG9ja2VyIGxvY2tlcih0aHJlYWRNYXBNdXRleCgpKTsKLQotICAg IHJldHVybiB0aHJlYWRNYXAoKS5nZXQoaWQpOwotfQotCi1zdGF0aWMgdm9pZCBjbGVhclRocmVh ZEZvcklkZW50aWZpZXIoVGhyZWFkSWRlbnRpZmllciBpZCkKLXsKLSAgICBNdXRleExvY2tlciBs b2NrZXIodGhyZWFkTWFwTXV0ZXgoKSk7Ci0KLSAgICBBU1NFUlQodGhyZWFkTWFwKCkuY29udGFp bnMoaWQpKTsKLQotICAgIHRocmVhZE1hcCgpLnJlbW92ZShpZCk7Ci19Ci0KLVRocmVhZElkZW50 aWZpZXIgY3JlYXRlVGhyZWFkSW50ZXJuYWwoVGhyZWFkRnVuY3Rpb24gZW50cnlQb2ludCwgdm9p ZCogZGF0YSwgY29uc3QgY2hhciopCi17Ci0gICAgR1RocmVhZCogdGhyZWFkOwotICAgIGlmICgh KHRocmVhZCA9IGdfdGhyZWFkX2NyZWF0ZShlbnRyeVBvaW50LCBkYXRhLCBUUlVFLCAwKSkpIHsK LSAgICAgICAgTE9HX0VSUk9SKCJGYWlsZWQgdG8gY3JlYXRlIHRocmVhZCBhdCBlbnRyeSBwb2lu dCAlcCB3aXRoIGRhdGEgJXAiLCBlbnRyeVBvaW50LCBkYXRhKTsKLSAgICAgICAgcmV0dXJuIDA7 Ci0gICAgfQotCi0gICAgVGhyZWFkSWRlbnRpZmllciB0aHJlYWRJRCA9IGVzdGFibGlzaElkZW50 aWZpZXJGb3JUaHJlYWQodGhyZWFkKTsKLSAgICByZXR1cm4gdGhyZWFkSUQ7Ci19Ci0KLXZvaWQg aW5pdGlhbGl6ZUN1cnJlbnRUaHJlYWRJbnRlcm5hbChjb25zdCBjaGFyKikKLXsKLX0KLQotaW50 IHdhaXRGb3JUaHJlYWRDb21wbGV0aW9uKFRocmVhZElkZW50aWZpZXIgdGhyZWFkSUQsIHZvaWQq KiByZXN1bHQpCi17Ci0gICAgQVNTRVJUKHRocmVhZElEKTsKLQotICAgIEdUaHJlYWQqIHRocmVh ZCA9IHRocmVhZEZvcklkZW50aWZpZXIodGhyZWFkSUQpOwotCi0gICAgdm9pZCogam9pblJlc3Vs dCA9IGdfdGhyZWFkX2pvaW4odGhyZWFkKTsKLSAgICBpZiAocmVzdWx0KQotICAgICAgICAqcmVz dWx0ID0gam9pblJlc3VsdDsKLQotICAgIGNsZWFyVGhyZWFkRm9ySWRlbnRpZmllcih0aHJlYWRJ RCk7Ci0gICAgcmV0dXJuIDA7Ci19Ci0KLXZvaWQgZGV0YWNoVGhyZWFkKFRocmVhZElkZW50aWZp ZXIpCi17Ci19Ci0KLVRocmVhZElkZW50aWZpZXIgY3VycmVudFRocmVhZCgpCi17Ci0gICAgR1Ro cmVhZCogY3VycmVudFRocmVhZCA9IGdfdGhyZWFkX3NlbGYoKTsKLSAgICBpZiAoVGhyZWFkSWRl bnRpZmllciBpZCA9IGlkZW50aWZpZXJCeUd0aHJlYWRIYW5kbGUoY3VycmVudFRocmVhZCkpCi0g ICAgICAgIHJldHVybiBpZDsKLSAgICByZXR1cm4gZXN0YWJsaXNoSWRlbnRpZmllckZvclRocmVh ZChjdXJyZW50VGhyZWFkKTsKLX0KLQotdm9pZCB5aWVsZCgpCi17Ci0gICAgZ190aHJlYWRfeWll bGQoKTsKLX0KLQotTXV0ZXg6Ok11dGV4KCkKLSAgICA6IG1fbXV0ZXgoZ19tdXRleF9uZXcoKSkK LXsKLX0KLQotTXV0ZXg6On5NdXRleCgpCi17Ci19Ci0KLXZvaWQgTXV0ZXg6OmxvY2soKQotewot ICAgIGdfbXV0ZXhfbG9jayhtX211dGV4LmdldCgpKTsKLX0KLQotYm9vbCBNdXRleDo6dHJ5TG9j aygpCi17Ci0gICAgcmV0dXJuIGdfbXV0ZXhfdHJ5bG9jayhtX211dGV4LmdldCgpKTsKLX0KLQot dm9pZCBNdXRleDo6dW5sb2NrKCkKLXsKLSAgICBnX211dGV4X3VubG9jayhtX211dGV4LmdldCgp KTsKLX0KLQotVGhyZWFkQ29uZGl0aW9uOjpUaHJlYWRDb25kaXRpb24oKQotICAgIDogbV9jb25k aXRpb24oZ19jb25kX25ldygpKQotewotfQotCi1UaHJlYWRDb25kaXRpb246On5UaHJlYWRDb25k aXRpb24oKQotewotfQotCi12b2lkIFRocmVhZENvbmRpdGlvbjo6d2FpdChNdXRleCYgbXV0ZXgp Ci17Ci0gICAgZ19jb25kX3dhaXQobV9jb25kaXRpb24uZ2V0KCksIG11dGV4LmltcGwoKS5nZXQo KSk7Ci19Ci0KLWJvb2wgVGhyZWFkQ29uZGl0aW9uOjp0aW1lZFdhaXQoTXV0ZXgmIG11dGV4LCBk b3VibGUgYWJzb2x1dGVUaW1lKQotewotICAgIC8vIFRpbWUgaXMgaW4gdGhlIHBhc3QgLSByZXR1 cm4gcmlnaHQgYXdheS4KLSAgICBpZiAoYWJzb2x1dGVUaW1lIDwgY3VycmVudFRpbWUoKSkKLSAg ICAgICAgcmV0dXJuIGZhbHNlOwotICAgIAotICAgIC8vIFRpbWUgaXMgdG9vIGZhciBpbiB0aGUg ZnV0dXJlIGZvciBnX2NvbmRfdGltZWRfd2FpdCAtIHdhaXQgZm9yZXZlci4KLSAgICBpZiAoYWJz b2x1dGVUaW1lID4gSU5UX01BWCkgewotICAgICAgICB3YWl0KG11dGV4KTsKLSAgICAgICAgcmV0 dXJuIHRydWU7Ci0gICAgfQotCi0gICAgaW50IHRpbWVTZWNvbmRzID0gc3RhdGljX2Nhc3Q8aW50 PihhYnNvbHV0ZVRpbWUpOwotICAgIGludCB0aW1lTWljcm9zZWNvbmRzID0gc3RhdGljX2Nhc3Q8 aW50PigoYWJzb2x1dGVUaW1lIC0gdGltZVNlY29uZHMpICogMTAwMDAwMC4wKTsKLSAgICAKLSAg ICBHVGltZVZhbCB0YXJnZXRUaW1lOwotICAgIHRhcmdldFRpbWUudHZfc2VjID0gdGltZVNlY29u ZHM7Ci0gICAgdGFyZ2V0VGltZS50dl91c2VjID0gdGltZU1pY3Jvc2Vjb25kczsKLQotICAgIHJl dHVybiBnX2NvbmRfdGltZWRfd2FpdChtX2NvbmRpdGlvbi5nZXQoKSwgbXV0ZXguaW1wbCgpLmdl dCgpLCAmdGFyZ2V0VGltZSk7Ci19Ci0KLXZvaWQgVGhyZWFkQ29uZGl0aW9uOjpzaWduYWwoKQot ewotICAgIGdfY29uZF9zaWduYWwobV9jb25kaXRpb24uZ2V0KCkpOwotfQotCi12b2lkIFRocmVh ZENvbmRpdGlvbjo6YnJvYWRjYXN0KCkKLXsKLSAgICBnX2NvbmRfYnJvYWRjYXN0KG1fY29uZGl0 aW9uLmdldCgpKTsKLX0KLQotCi19Ci0KLSNlbmRpZiAvLyAhVVNFKFBUSFJFQURTKQpkaWZmIC0t Z2l0IGEvY29uZmlndXJlLmFjIGIvY29uZmlndXJlLmFjCmluZGV4IDIxNzFkOGRjNzU5ZjViYWU1 M2Q1ZDg0ZmVkYzAwZjA3ZjRlZTg2OGIuLjc2NzU5NDYwYmUwZDNmNTM2MzM1YjdmNDBjYjFjZmJk Mjk0ZjE0M2UgMTAwNjQ0Ci0tLSBhL2NvbmZpZ3VyZS5hYworKysgYi9jb25maWd1cmUuYWMKQEAg LTExMSw2ICsxMTEsOSBAQCBpZiB0ZXN0ICIkb3Nfd2luMzIiID0gIm5vIjsgdGhlbgogQUNfQ0hF Q0tfSEVBREVSUyhbcHRocmVhZC5oXSwKICAgICAgICAgICAgICAgICAgQUNfREVGSU5FKFtIQVZF X1BUSFJFQURfSF0sWzFdLFtEZWZpbmUgaWYgcHRocmVhZCBleGlzdHNdKSwKICAgICAgICAgICAg ICAgICAgQUNfTVNHX0VSUk9SKFtwdGhyZWFkIHN1cHBvcnQgaXMgcmVxdWlyZWQgdG8gYnVpbGQg V2ViS2l0XSkpCitBQ19DSEVDS19MSUIocHRocmVhZCwgcHRocmVhZF9yd2xvY2tfaW5pdCwKKyAg ICAgICAgICAgICAgICAgQUNfREVGSU5FKFtIQVZFX1BUSFJFQURfUldMT0NLXSxbMV0sW0RlZmlu ZSBpZiBwdGhyZWFkIHJ3bG9jayBpcyBwcmVzZW50XSksCisgICAgICAgICAgICAgICAgIEFDX01T R19XQVJOKFtwdGhyZWFkIHJ3bG9jayBzdXBwb3J0IGlzIG5vdCBhdmFpbGFibGVdKSkKIGZpCiAK ICMgY2hlY2sgZm9yIGxpYmpwZWcgdGhlIHdheSBHdGsgZG9lcyBpdC4K