233967 2021-12-07 18:55:32 -0800 Add a version of ThreadAssertions that treats UI and Web thread as the same 2024-07-30 11:12:04 -0700 1 1 1 Unclassified WebKit Web Template Framework WebKit Local Build Unspecified Unspecified NEW https://bugs.webkit.org/show_bug.cgi?id=185330 https://bugs.webkit.org/show_bug.cgi?id=277299 InRadar P2 Normal --- 1 heycam heycam benjamin cdumez cmarcelo ddkilzer ews-watchlist kkinnunen simon.fraser webkit-bug-importer oldest_to_newest 1821338 0 heycam 2021-12-07 18:55:32 -0800 ThreadAssertions has so far been used exclusively within WebCore. Since WebCore rarely needs to distinguish between the UI thread and the Web thread, make ThreadAssertions treat them the same so that it can be used in situations where objects are interacted with in both. 1821339 1 446277 heycam 2021-12-07 18:56:24 -0800 Created attachment 446277 Patch 1821341 2 heycam 2021-12-07 18:59:10 -0800 (In reply to Cameron McCormack (:heycam) from comment #0) > ThreadAssertions has so far been used exclusively within WebCore. That is completely false; it's been used exclusively within WebKit. Perhaps ThreadAssertions needs an option to choose whether to use isMainThread() for main thread checking. 1821351 3 heycam 2021-12-07 20:13:32 -0800 I thought I'd templatize ThreadAssertion with a parameter that indicates whether to use isMainThread() to check for main-threadedness, but that seemed to confuse clang into thinking the relevant capability was not acquired. Forthcoming patch just duplicates the ThreadAssertion class with this different behavior. Comments on a better name welcome. 1821352 4 446283 heycam 2021-12-07 20:14:02 -0800 Created attachment 446283 Patch 1821390 5 446283 kkinnunen 2021-12-07 22:23:05 -0800 Comment on attachment 446283 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=446283&action=review > Source/WTF/wtf/ThreadAssertions.h:130 > would mainThread named assertion work for you instead? example in ThreadAssertionsTest.cpp 1821401 6 446283 kkinnunen 2021-12-07 22:35:35 -0800 Comment on attachment 446283 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=446283&action=review > Source/WTF/wtf/ThreadAssertions.h:76 > +class WTF_CAPABILITY_LOCK MainOrOtherThreadAssertion { Could you name it as "SequenceAssertion". E.g. a "sequence" is a ..sequence.. where actions happen serially. (As implemented by a work queue, or gcd queue) 1824210 7 webkit-bug-importer 2021-12-14 18:56:15 -0800 <rdar://problem/86501473> 446277 2021-12-07 18:56:24 -0800 2021-12-07 20:13:58 -0800 Patch bug-233967-20211208135622.patch text/plain 2275 heycam U3VidmVyc2lvbiBSZXZpc2lvbjogMjg2NjM3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IGIxZmZjY2Q1MDFlNzM3OThkZWMzMGM5 MDVkZDAzZTM5NjhiZTU2NTkuLjk0NDNlNDMxNzk3NTE1MzFmOGE5MjFkYzMzYzc0NmMzZGM3MTEx YTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMjEtMTItMDcgIENhbWVyb24gTWNDb3JtYWNrICA8 aGV5Y2FtQGFwcGxlLmNvbT4KKworICAgICAgICBNYWtlIFRocmVhZEFzc2VydGlvbnMgdHJlYXQg VUkgYW5kIFdlYiB0aHJlYWQgYXMgdGhlIHNhbWUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMzk2NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFRocmVhZEFzc2VydGlvbnMgaGFzIHNvIGZhciBiZWVuIHVz ZWQgZXhjbHVzaXZlbHkgd2l0aGluIFdlYkNvcmUuCisgICAgICAgIFNpbmNlIFdlYkNvcmUgcmFy ZWx5IG5lZWRzIHRvIGRpc3Rpbmd1aXNoIGJldHdlZW4gdGhlIFVJIHRocmVhZAorICAgICAgICBh bmQgdGhlIFdlYiB0aHJlYWQsIG1ha2UgVGhyZWFkQXNzZXJ0aW9ucyB0cmVhdCB0aGVtIHRoZSBz YW1lIHNvCisgICAgICAgIHRoYXQgaXQgY2FuIGJlIHVzZWQgaW4gc2l0dWF0aW9ucyB3aGVyZSBv YmplY3RzIGFyZSBpbnRlcmFjdGVkCisgICAgICAgIHdpdGggaW4gYm90aC4KKworICAgICAgICAq IHd0Zi9UaHJlYWRBc3NlcnRpb25zLmg6CisgICAgICAgIChXVEY6OldURl9BU1NFUlRTX0FDUVVJ UkVEX0xPQ0spOgorCiAyMDIxLTEyLTA3ICBTaWh1aSBMaXUgIDxzaWh1aV9saXVAYXBwbGUuY29t PgogCiAgICAgICAgIEZldGNoIGFuZCByZW1vdmUgZmlsZSBzeXN0ZW0gZGF0YSB2aWEgV0tXZWJz aXRlRGF0YVN0b3JlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL3d0Zi9UaHJlYWRBc3NlcnRpb25z LmggYi9Tb3VyY2UvV1RGL3d0Zi9UaHJlYWRBc3NlcnRpb25zLmgKaW5kZXggMWNhMTZiNGQwNTg5 YzkwMjE2ZDBlYmUwMGE5NzA4MzJkOGVhMGVkNy4uMzlkYTM3NjE4N2UxMzY1ODdlOGE1OWUwN2Q0 MjhjYjYzYjBlZTY1MSAxMDA2NDQKLS0tIGEvU291cmNlL1dURi93dGYvVGhyZWFkQXNzZXJ0aW9u cy5oCisrKyBiL1NvdXJjZS9XVEYvd3RmL1RocmVhZEFzc2VydGlvbnMuaApAQCAtNTEsNyArNTEs NyBAQCBwdWJsaWM6CiAgICAgZW51bSBVbmluaXRpYWxpemVkVGFnIHsgVW5pbml0aWFsaXplZCB9 OwogICAgIGNvbnN0ZXhwciBUaHJlYWRBc3NlcnRpb24oVW5pbml0aWFsaXplZFRhZykKICNpZiBB U1NFUlRfRU5BQkxFRAotICAgICAgICA6IG1fdWlkKDApIC8vIFRocmVhZDo6dWlkKCkgZG9lcyBu b3QgcmV0dXJuIHRoaXMuCisgICAgICAgIDogbV91aWQoKQogI2VuZGlmCiAgICAgewogICAgIH0K QEAgLTU5LDE0ICs1OSwxNSBAQCBwdWJsaWM6CiAgICAgdm9pZCByZXNldCgpIHsgKnRoaXMgPSBU aHJlYWRBc3NlcnRpb24geyB9OyB9CiBwcml2YXRlOgogI2lmIEFTU0VSVF9FTkFCTEVECi0gICAg dWludDMyX3QgbV91aWQgeyBUaHJlYWQ6OmN1cnJlbnQoKS51aWQoKSB9OworICAgIHN0ZDo6b3B0 aW9uYWw8dWludDMyX3Q+IG1fdWlkIHsgY3VycmVudFRocmVhZFVJRCgpIH07CisgICAgc3RhdGlj IHVpbnQzMl90IGN1cnJlbnRUaHJlYWRVSUQoKSB7IHJldHVybiBpc01haW5UaHJlYWQoKSA/IDAg OiBUaHJlYWQ6OmN1cnJlbnQoKS51aWQoKTsgfQogI2VuZGlmCiAgICAgZnJpZW5kIHZvaWQgYXNz ZXJ0SXNDdXJyZW50KGNvbnN0IFRocmVhZEFzc2VydGlvbiYpOwogfTsKIAogaW5saW5lIHZvaWQg YXNzZXJ0SXNDdXJyZW50KGNvbnN0IFRocmVhZEFzc2VydGlvbiYgdGhyZWFkQXNzZXJ0aW9uKSBX VEZfQVNTRVJUU19BQ1FVSVJFRF9MT0NLKHRocmVhZEFzc2VydGlvbikKIHsKLSAgICBBU1NFUlRf VU5VU0VEKHRocmVhZEFzc2VydGlvbiwgVGhyZWFkOjpjdXJyZW50KCkudWlkKCkgPT0gdGhyZWFk QXNzZXJ0aW9uLm1fdWlkKTsKKyAgICBBU1NFUlRfVU5VU0VEKHRocmVhZEFzc2VydGlvbiwgdGhy ZWFkQXNzZXJ0aW9uLm1fdWlkICYmIFRocmVhZEFzc2VydGlvbjo6Y3VycmVudFRocmVhZFVJRCgp ID09ICp0aHJlYWRBc3NlcnRpb24ubV91aWQpOwogfQogCiAvLyBUeXBlIGZvciBnbG9iYWxseSBu YW1lZCBhc3NlcnRpb25zIGZvciBkZXNjcmliaW5nIGFjY2VzcyByZXF1aXJlbWVudHMuCg== 446283 2021-12-07 20:14:02 -0800 2021-12-07 23:22:02 -0800 Patch bug-233967-20211208151401.patch text/plain 4095 heycam U3VidmVyc2lvbiBSZXZpc2lvbjogMjg2NjM3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IGIxZmZjY2Q1MDFlNzM3OThkZWMzMGM5 MDVkZDAzZTM5NjhiZTU2NTkuLjcyOTRhY2Q2YjNjMThmYzExNzExOTIxYjg3YjUxY2I2NzY1ZjYw NWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMjEtMTItMDcgIENhbWVyb24gTWNDb3JtYWNrICA8 aGV5Y2FtQGFwcGxlLmNvbT4KKworICAgICAgICBBZGQgYSB2ZXJzaW9uIG9mIFRocmVhZEFzc2Vy dGlvbiB0aGF0IHRyZWF0cyBVSSBhbmQgV2ViIHRocmVhZCBhcyB0aGUgc2FtZQorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMzOTY3CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhyZWFkQXNzZXJ0aW9uIGhh cyBzbyBmYXIgYmVlbiB1c2VkIGV4Y2x1c2l2ZWx5IHdpdGhpbiBXZWJLaXQKKyAgICAgICAgd2hl cmUgaXQgZG9lc24ndCBtYWtlIHNlbnNlIHRvIGNvbmZsYXRlIHRoZSBVSSBhbmQgV2ViIHRocmVh ZHMuCisgICAgICAgIEZvciB1c2UgaW4gV2ViQ29yZSwgaXQncyBtdWNoIG1vcmUgY29tbW9uIHRv IHVzZSBpc01haW5UaHJlYWQoKQorICAgICAgICB0byBjaGVjayBmb3IgZWl0aGVyIHRoZSBVSSBv ciBXZWIgVGhyZWFkcy4gVGhpcyBwYXRjaCBhZGRzIGEKKyAgICAgICAgdmVyc2lvbiBvZiBUaHJl YWRBc3NlcnRpb24gdGhhdCB0cmVhdHMgdGhlIFVJIGFuZCBXZWIgdGhyZWFkcworICAgICAgICBh cyB0aGUgc2FtZSBieSB1c2luZyBpc01haW5UaHJlYWQuCisKKyAgICAgICAgKiB3dGYvVGhyZWFk QXNzZXJ0aW9ucy5oOgorICAgICAgICAoV1RGOjpXVEZfQVNTRVJUU19BQ1FVSVJFRF9MT0NLKToK KwogMjAyMS0xMi0wNyAgU2lodWkgTGl1ICA8c2lodWlfbGl1QGFwcGxlLmNvbT4KIAogICAgICAg ICBGZXRjaCBhbmQgcmVtb3ZlIGZpbGUgc3lzdGVtIGRhdGEgdmlhIFdLV2Vic2l0ZURhdGFTdG9y ZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dURi93dGYvVGhyZWFkQXNzZXJ0aW9ucy5oIGIvU291cmNl L1dURi93dGYvVGhyZWFkQXNzZXJ0aW9ucy5oCmluZGV4IDFjYTE2YjRkMDU4OWM5MDIxNmQwZWJl MDBhOTcwODMyZDhlYTBlZDcuLmQyMWE1Y2JlNjJhMWQ1NTk5NmVlZWQzY2Y5N2YxNzFiMjg4M2Mx ZGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvd3RmL1RocmVhZEFzc2VydGlvbnMuaAorKysgYi9T b3VyY2UvV1RGL3d0Zi9UaHJlYWRBc3NlcnRpb25zLmgKQEAgLTMyLDExICszMiwxOSBAQAogCiBu YW1lc3BhY2UgV1RGIHsKIAotLy8gQSB0eXBlIHRvIHVzZSBmb3IgYXNzZXJ0aW5nIHRoYXQgcHJp dmF0ZSBtZW1iZXIgZnVuY3Rpb25zIG9yIHByaXZhdGUgbWVtYmVyIHZhcmlhYmxlcwotLy8gb2Yg YSBjbGFzcyBhcmUgYWNjZXNzZWQgZnJvbSBjb3JyZWN0IHRocmVhZHMuCi0vLyBTdXBwb3J0cyBy dW4tdGltZSBjaGVja2luZyB3aXRoIGFzc2VydGlvbiBlbmFibGVkIGJ1aWxkcy4KLS8vIFN1cHBv cnRzIGNvbXBpbGUtdGltZSBkZWNsYXJhdGlvbiBhbmQgY2hlY2tpbmcuCisvLyBUeXBlcyB0byBh c3NlcnQgdGhhdCBwcml2YXRlIG1lbWJlciBmdW5jdGlvbnMgb3IgcHJpdmF0ZSBtZW1iZXIgdmFy aWFibGVzIG9mCisvLyBhIGNsYXNzIGFyZSBhY2Nlc3NlZCBmcm9tIGNvcnJlY3QgdGhyZWFkcy4K Ky8vCisvLyBVc2UgVGhyZWFkQXNzZXJ0aW9uIGlmIHRoZSBVSSBhbmQgV2ViIHRocmVhZHMgc2hv dWxkIGJlIGNvbnNpZGVyZWQgZGlzdGluY3QsCisvLyBhbmQgTWFpbk9yT3RoZXJUaHJlYWRBc3Nl cnRpb24gaWYgdGhleSBzaG91bGQgYmUgY29uc2lkZXJlZCB0aGUgc2FtZS4KKy8vCisvLyBTdXBw b3J0czoKKy8vCisvLyAgICogcnVuLXRpbWUgY2hlY2tpbmcgd2l0aCBhc3NlcnRpb24gZW5hYmxl ZCBidWlsZHMKKy8vICAgKiBjb21waWxlLXRpbWUgZGVjbGFyYXRpb24gYW5kIGNoZWNraW5nCisv LwogLy8gRXhhbXBsZToKKy8vCiAvLyBzdHJ1Y3QgTXlDbGFzcyB7CiAvLyAgICAgdm9pZCBkb1Rh c2soKSB7IGFzc2VydElzQ3VycmVudChtX293bmVyVGhyZWFkKTsgZG9UYXNrSW1wbCgpOyB9CiAv LyAgICAgdGVtcGxhdGU8dHlwZW5hbWU+IHZvaWQgZG9UYXNrQ29tcGlsZUZhaWx1cmUoKSB7IGRv VGFza0ltcGwoKTsgfQpAQCAtNDUsNiArNTMsNyBAQCBuYW1lc3BhY2UgV1RGIHsKIC8vICAgICBp bnQgbV92YWx1ZSBXVEZfR1VBUkRFRF9CWV9MT0NLKG1fb3duZXJUaHJlYWQpIHsgMCB9OwogLy8g ICAgIE5PX1VOSVFVRV9BRERSRVNTIFRocmVhZEFzc2VydGlvbiBtX293bmVyVGhyZWFkOwogLy8g fTsKKwogY2xhc3MgV1RGX0NBUEFCSUxJVFlfTE9DSyBUaHJlYWRBc3NlcnRpb24gewogcHVibGlj OgogICAgIFRocmVhZEFzc2VydGlvbigpID0gZGVmYXVsdDsKQEAgLTY0LDExICs3MywzNSBAQCBw cml2YXRlOgogICAgIGZyaWVuZCB2b2lkIGFzc2VydElzQ3VycmVudChjb25zdCBUaHJlYWRBc3Nl cnRpb24mKTsKIH07CiAKK2NsYXNzIFdURl9DQVBBQklMSVRZX0xPQ0sgTWFpbk9yT3RoZXJUaHJl YWRBc3NlcnRpb24geworcHVibGljOgorICAgIE1haW5Pck90aGVyVGhyZWFkQXNzZXJ0aW9uKCkg PSBkZWZhdWx0OworICAgIGVudW0gVW5pbml0aWFsaXplZFRhZyB7IFVuaW5pdGlhbGl6ZWQgfTsK KyAgICBjb25zdGV4cHIgTWFpbk9yT3RoZXJUaHJlYWRBc3NlcnRpb24oVW5pbml0aWFsaXplZFRh ZykKKyNpZiBBU1NFUlRfRU5BQkxFRAorICAgICAgICA6IG1fdWlkKCkKKyNlbmRpZgorICAgIHsK KyAgICB9CisgICAgfk1haW5Pck90aGVyVGhyZWFkQXNzZXJ0aW9uKCkgeyBhc3NlcnRJc0N1cnJl bnQoKnRoaXMpOyB9CisgICAgdm9pZCByZXNldCgpIHsgKnRoaXMgPSBNYWluT3JPdGhlclRocmVh ZEFzc2VydGlvbiB7IH07IH0KK3ByaXZhdGU6CisjaWYgQVNTRVJUX0VOQUJMRUQKKyAgICBzdGQ6 Om9wdGlvbmFsPHVpbnQzMl90PiBtX3VpZCB7IGlzTWFpblRocmVhZCgpID8gMCA6IFRocmVhZDo6 Y3VycmVudCgpLnVpZCgpIH07CisjZW5kaWYKKyAgICBmcmllbmQgdm9pZCBhc3NlcnRJc0N1cnJl bnQoY29uc3QgTWFpbk9yT3RoZXJUaHJlYWRBc3NlcnRpb24mKTsKK307CisKIGlubGluZSB2b2lk IGFzc2VydElzQ3VycmVudChjb25zdCBUaHJlYWRBc3NlcnRpb24mIHRocmVhZEFzc2VydGlvbikg V1RGX0FTU0VSVFNfQUNRVUlSRURfTE9DSyh0aHJlYWRBc3NlcnRpb24pCiB7CiAgICAgQVNTRVJU X1VOVVNFRCh0aHJlYWRBc3NlcnRpb24sIFRocmVhZDo6Y3VycmVudCgpLnVpZCgpID09IHRocmVh ZEFzc2VydGlvbi5tX3VpZCk7CiB9CiAKK2lubGluZSB2b2lkIGFzc2VydElzQ3VycmVudChjb25z dCBNYWluT3JPdGhlclRocmVhZEFzc2VydGlvbiYgdGhyZWFkQXNzZXJ0aW9uKSBXVEZfQVNTRVJU U19BQ1FVSVJFRF9MT0NLKHRocmVhZEFzc2VydGlvbikKK3sKKyAgICBBU1NFUlRfVU5VU0VEKHRo cmVhZEFzc2VydGlvbiwgdGhyZWFkQXNzZXJ0aW9uLm1fdWlkICYmIChpc01haW5UaHJlYWQoKSA/ IDAgOiBUaHJlYWQ6OmN1cnJlbnQoKS51aWQoKSkgPT0gKnRocmVhZEFzc2VydGlvbi5tX3VpZCk7 Cit9CisKIC8vIFR5cGUgZm9yIGdsb2JhbGx5IG5hbWVkIGFzc2VydGlvbnMgZm9yIGRlc2NyaWJp bmcgYWNjZXNzIHJlcXVpcmVtZW50cy4KIC8vIENhbiBiZSB1c2VkLCBmb3IgZXhhbXBsZSwgdG8g cmVxdWlyZSB0aGF0IGEgdmFyaWFibGUgaXMgYWNjZXNzZWQgb25seSBpbgogLy8gYSBrbm93biBu YW1lZCB0aHJlYWQuCkBAIC05Niw2ICsxMjksNyBAQCBpbmxpbmUgdm9pZCBhc3NlcnRJc01haW5S dW5Mb29wKCkgV1RGX0FTU0VSVFNfQUNRVUlSRURfTE9DSyhtYWluUnVuTG9vcCkgeyBBU1NFUgog fQogCiB1c2luZyBXVEY6OlRocmVhZEFzc2VydGlvbjsKK3VzaW5nIFdURjo6TWFpbk9yT3RoZXJU aHJlYWRBc3NlcnRpb247CiB1c2luZyBXVEY6OmFzc2VydElzQ3VycmVudDsKIHVzaW5nIFdURjo6 TmFtZWRBc3NlcnRpb247CiB1c2luZyBXVEY6OmFzc2VydElzTWFpblRocmVhZDsK