Title: [295243] branches/safari-613-branch
- Revision
- 295243
- Author
- repst...@apple.com
- Date
- 2022-06-03 16:21:52 -0700 (Fri, 03 Jun 2022)
Log Message
Revert 704644f751c332c5b1001936cf2cd0446f4bea18. rdar://problem/92380002
This reverts commit 704644f751c332c5b1001936cf2cd0446f4bea18.
Modified Paths
Diff
Modified: branches/safari-613-branch/Source/WTF/wtf/ThreadAssertions.h (295242 => 295243)
--- branches/safari-613-branch/Source/WTF/wtf/ThreadAssertions.h 2022-06-03 23:21:49 UTC (rev 295242)
+++ branches/safari-613-branch/Source/WTF/wtf/ThreadAssertions.h 2022-06-03 23:21:52 UTC (rev 295243)
@@ -41,11 +41,11 @@
// void doTask() { assertIsCurrent(m_ownerThread); doTaskImpl(); }
// template<typename> void doTaskCompileFailure() { doTaskImpl(); }
// private:
-// void doTaskImpl() WTF_REQUIRES_CAPABILITY(m_ownerThread);
-// int m_value WTF_GUARDED_BY_CAPABILITY(m_ownerThread) { 0 };
+// void doTaskImpl() WTF_REQUIRES_LOCK(m_ownerThread);
+// int m_value WTF_GUARDED_BY_LOCK(m_ownerThread) { 0 };
// NO_UNIQUE_ADDRESS ThreadAssertion m_ownerThread;
// };
-class WTF_CAPABILITY("is current") ThreadAssertion {
+class WTF_CAPABILITY_LOCK ThreadAssertion {
public:
ThreadAssertion() = default;
enum UninitializedTag { Uninitialized };
@@ -64,7 +64,7 @@
friend void assertIsCurrent(const ThreadAssertion&);
};
-inline void assertIsCurrent(const ThreadAssertion& threadAssertion) WTF_ASSERTS_ACQUIRED_CAPABILITY(threadAssertion)
+inline void assertIsCurrent(const ThreadAssertion& threadAssertion) WTF_ASSERTS_ACQUIRED_LOCK(threadAssertion)
{
ASSERT_UNUSED(threadAssertion, Thread::current().uid() == threadAssertion.m_uid);
}
@@ -74,8 +74,8 @@
// a known named thread.
// Example:
// extern NamedAssertion& mainThread;
-// inline void assertIsMainThread() WTF_ASSERTS_ACQUIRED_CAPABILITY(mainThread);
-// void myTask() WTF_REQUIRES_CAPABILITY(mainThread) { printf("my task is running"); }
+// inline void assertIsMainThread() WTF_ASSERTS_ACQUIRED_LOCK(mainThread);
+// void myTask() WTF_REQUIRES_LOCK(mainThread) { printf("my task is running"); }
// void runner() {
// assertIsMainThread();
// myTask();
@@ -83,15 +83,15 @@
// template<typename> runnerCompileFailure() {
// myTask();
// }
-class WTF_CAPABILITY("is current") NamedAssertion { };
+class WTF_CAPABILITY_LOCK NamedAssertion { };
-// To be used with WTF_REQUIRES_CAPABILITY(mainThread). Symbol is undefined.
+// To be used with WTF_REQUIRES_LOCK(mainThread). Symbol is undefined.
extern NamedAssertion& mainThread;
-inline void assertIsMainThread() WTF_ASSERTS_ACQUIRED_CAPABILITY(mainThread) { ASSERT(isMainThread()); }
+inline void assertIsMainThread() WTF_ASSERTS_ACQUIRED_LOCK(mainThread) { ASSERT(isMainThread()); }
-// To be used with WTF_REQUIRES_CAPABILITY(mainRunLoop). Symbol is undefined.
+// To be used with WTF_REQUIRES_LOCK(mainRunLoop). Symbol is undefined.
extern NamedAssertion& mainRunLoop;
-inline void assertIsMainRunLoop() WTF_ASSERTS_ACQUIRED_CAPABILITY(mainRunLoop) { ASSERT(isMainRunLoop()); }
+inline void assertIsMainRunLoop() WTF_ASSERTS_ACQUIRED_LOCK(mainRunLoop) { ASSERT(isMainRunLoop()); }
}
Modified: branches/safari-613-branch/Source/WTF/wtf/ThreadSafetyAnalysis.h (295242 => 295243)
--- branches/safari-613-branch/Source/WTF/wtf/ThreadSafetyAnalysis.h 2022-06-03 23:21:49 UTC (rev 295242)
+++ branches/safari-613-branch/Source/WTF/wtf/ThreadSafetyAnalysis.h 2022-06-03 23:21:52 UTC (rev 295243)
@@ -35,39 +35,21 @@
#define WTF_THREAD_ANNOTATION_ATTRIBUTE(x)
#endif
-#define WTF_ACQUIRES_CAPABILITY_IF(...) WTF_THREAD_ANNOTATION_ATTRIBUTE(try_acquire_capability(__VA_ARGS__))
-#define WTF_ACQUIRES_CAPABILITY(...) WTF_THREAD_ANNOTATION_ATTRIBUTE(acquire_capability(__VA_ARGS__))
-#define WTF_ACQUIRES_SHARED_CAPABILITY_IF(...) WTF_THREAD_ANNOTATION_ATTRIBUTE(try_acquire_shared_capability(__VA_ARGS__))
-#define WTF_ACQUIRES_SHARED_CAPABILITY(...) WTF_THREAD_ANNOTATION_ATTRIBUTE(acquire_shared_capability(__VA_ARGS__))
-#define WTF_ASSERTS_ACQUIRED_CAPABILITY(x) WTF_THREAD_ANNOTATION_ATTRIBUTE(assert_capability(x))
-#define WTF_ASSERTS_ACQUIRED_SHARED_CAPABILITY(x) WTF_THREAD_ANNOTATION_ATTRIBUTE(assert_shared_capability(x))
-#define WTF_CAPABILITY(name) WTF_THREAD_ANNOTATION_ATTRIBUTE(capability(name))
+#define WTF_ACQUIRES_LOCK_IF(...) WTF_THREAD_ANNOTATION_ATTRIBUTE(try_acquire_capability(__VA_ARGS__))
+#define WTF_ACQUIRES_LOCK(...) WTF_THREAD_ANNOTATION_ATTRIBUTE(acquire_capability(__VA_ARGS__))
+#define WTF_ACQUIRES_SHARED_LOCK_IF(...) WTF_THREAD_ANNOTATION_ATTRIBUTE(try_acquire_shared_capability(__VA_ARGS__))
+#define WTF_ACQUIRES_SHARED_LOCK(...) WTF_THREAD_ANNOTATION_ATTRIBUTE(acquire_shared_capability(__VA_ARGS__))
+#define WTF_ASSERTS_ACQUIRED_LOCK(x) WTF_THREAD_ANNOTATION_ATTRIBUTE(assert_capability(x))
+#define WTF_ASSERTS_ACQUIRED_SHARED_LOCK(x) WTF_THREAD_ANNOTATION_ATTRIBUTE(assert_shared_capability(x))
+#define WTF_CAPABILITY_LOCK WTF_THREAD_ANNOTATION_ATTRIBUTE(capability("mutex"))
#define WTF_CAPABILITY_SCOPED_LOCK WTF_THREAD_ANNOTATION_ATTRIBUTE(scoped_lockable)
-#define WTF_EXCLUDES_CAPABILITY(...) WTF_THREAD_ANNOTATION_ATTRIBUTE(locks_excluded(__VA_ARGS__))
-#define WTF_GUARDED_BY_CAPABILITY(x) WTF_THREAD_ANNOTATION_ATTRIBUTE(guarded_by(x))
+#define WTF_EXCLUDES_LOCK(...) WTF_THREAD_ANNOTATION_ATTRIBUTE(locks_excluded(__VA_ARGS__))
+#define WTF_GUARDED_BY_LOCK(x) WTF_THREAD_ANNOTATION_ATTRIBUTE(guarded_by(x))
#define WTF_IGNORES_THREAD_SAFETY_ANALYSIS WTF_THREAD_ANNOTATION_ATTRIBUTE(no_thread_safety_analysis)
-#define WTF_POINTEE_GUARDED_BY_CAPABILITY(x) WTF_THREAD_ANNOTATION_ATTRIBUTE(pt_guarded_by(x))
-#define WTF_RELEASES_GENERIC_CAPABILITY(...) WTF_THREAD_ANNOTATION_ATTRIBUTE(release_generic_capability(__VA_ARGS__))
-#define WTF_RELEASES_CAPABILITY(...) WTF_THREAD_ANNOTATION_ATTRIBUTE(release_capability(__VA_ARGS__))
-#define WTF_RELEASES_SHARED_CAPABILITY(...) WTF_THREAD_ANNOTATION_ATTRIBUTE(release_shared_capability(__VA_ARGS__))
-#define WTF_REQUIRES_CAPABILITY(...) WTF_THREAD_ANNOTATION_ATTRIBUTE(requires_capability(__VA_ARGS__))
-#define WTF_REQUIRES_SHARED_CAPABILITY(...) WTF_THREAD_ANNOTATION_ATTRIBUTE(requires_shared_capability(__VA_ARGS__))
-#define WTF_RETURNS_CAPABILITY(x) WTF_THREAD_ANNOTATION_ATTRIBUTE(lock_returned(x))
-
-// Using WTF_CAPABILITY_LOCK is a common use-case. Introduce terms containing "LOCK" for maximum readability.
-#define WTF_ACQUIRES_LOCK_IF(...) WTF_ACQUIRES_CAPABILITY_IF(__VA_ARGS__)
-#define WTF_ACQUIRES_LOCK(...) WTF_ACQUIRES_CAPABILITY(__VA_ARGS__)
-#define WTF_ACQUIRES_SHARED_LOCK_IF(...) WTF_ACQUIRES_SHARED_CAPABILITY_IF(__VA_ARGS__)
-#define WTF_ACQUIRES_SHARED_LOCK(...) WTF_ACQUIRES_SHARED_CAPABILITY(__VA_ARGS__)
-#define WTF_ASSERTS_ACQUIRED_LOCK(x) WTF_ASSERTS_ACQUIRED_CAPABILITY(x)
-#define WTF_ASSERTS_ACQUIRED_SHARED_LOCK(x) WTF_ASSERTS_ACQUIRED_SHARED_CAPABILITY(x)
-#define WTF_CAPABILITY_LOCK WTF_CAPABILITY("lock")
-#define WTF_EXCLUDES_LOCK(...) WTF_EXCLUDES_CAPABILITY(__VA_ARGS__)
-#define WTF_GUARDED_BY_LOCK(x) WTF_GUARDED_BY_CAPABILITY(x)
-#define WTF_POINTEE_GUARDED_BY_LOCK(x) WTF_POINTEE_GUARDED_BY_CAPABILITY(x)
-#define WTF_RELEASES_GENERIC_LOCK(...) WTF_RELEASES_GENERIC_CAPABILITY(__VA_ARGS__)
-#define WTF_RELEASES_LOCK(...) WTF_RELEASES_CAPABILITY(__VA_ARGS__)
-#define WTF_RELEASES_SHARED_LOCK(...) WTF_RELEASES_SHARED_CAPABILITY(__VA_ARGS__)
-#define WTF_REQUIRES_LOCK(...) WTF_REQUIRES_CAPABILITY(__VA_ARGS__)
-#define WTF_REQUIRES_SHARED_LOCK(...) WTF_REQUIRES_SHARED_CAPABILITY(__VA_ARGS__)
-#define WTF_RETURNS_LOCK(x) WTF_RETURNS_CAPABILITY(x)
+#define WTF_POINTEE_GUARDED_BY_LOCK(x) WTF_THREAD_ANNOTATION_ATTRIBUTE(pt_guarded_by(x))
+#define WTF_RELEASES_LOCK_GENERIC(...) WTF_THREAD_ANNOTATION_ATTRIBUTE(release_generic_capability(__VA_ARGS__))
+#define WTF_RELEASES_LOCK(...) WTF_THREAD_ANNOTATION_ATTRIBUTE(release_capability(__VA_ARGS__))
+#define WTF_RELEASES_SHARED_LOCK(...) WTF_THREAD_ANNOTATION_ATTRIBUTE(release_shared_capability(__VA_ARGS__))
+#define WTF_REQUIRES_LOCK(...) WTF_THREAD_ANNOTATION_ATTRIBUTE(requires_capability(__VA_ARGS__))
+#define WTF_REQUIRES_SHARED_LOCK(...) WTF_THREAD_ANNOTATION_ATTRIBUTE(requires_shared_capability(__VA_ARGS__))
+#define WTF_RETURNS_LOCK(x) WTF_THREAD_ANNOTATION_ATTRIBUTE(lock_returned(x))
Modified: branches/safari-613-branch/Source/WebKit/GPUProcess/graphics/RemoteRenderingBackend.h (295242 => 295243)
--- branches/safari-613-branch/Source/WebKit/GPUProcess/graphics/RemoteRenderingBackend.h 2022-06-03 23:21:49 UTC (rev 295242)
+++ branches/safari-613-branch/Source/WebKit/GPUProcess/graphics/RemoteRenderingBackend.h 2022-06-03 23:21:52 UTC (rev 295243)
@@ -142,7 +142,7 @@
Lock m_remoteDisplayListsLock;
bool m_canRegisterRemoteDisplayLists WTF_GUARDED_BY_LOCK(m_remoteDisplayListsLock) { false };
- HashMap<QualifiedRenderingResourceIdentifier, Ref<RemoteDisplayListRecorder>> m_remoteDisplayLists WTF_GUARDED_BY_CAPABILITY(m_remoteDisplayListsLock);
+ HashMap<QualifiedRenderingResourceIdentifier, Ref<RemoteDisplayListRecorder>> m_remoteDisplayLists WTF_GUARDED_BY_LOCK(m_remoteDisplayListsLock);
};
} // namespace WebKit
Modified: branches/safari-613-branch/Tools/Scripts/webkitpy/style/checkers/cpp.py (295242 => 295243)
--- branches/safari-613-branch/Tools/Scripts/webkitpy/style/checkers/cpp.py 2022-06-03 23:21:49 UTC (rev 295242)
+++ branches/safari-613-branch/Tools/Scripts/webkitpy/style/checkers/cpp.py 2022-06-03 23:21:52 UTC (rev 295243)
@@ -4163,7 +4163,6 @@
and not modified_identifier == "DFG_OPERATION"
and not modified_identifier == "LOG_CHANNEL"
and not modified_identifier == "WTF_GUARDED_BY_LOCK"
- and not modified_identifier == "WTF_GUARDED_BY_CAPABILITY"
and not modified_identifier.find('chrono_literals') >= 0):
error(line_number, 'readability/naming/underscores', 4, identifier + " is incorrectly named. Don't use underscores in your identifier names.")
Modified: branches/safari-613-branch/Tools/TestWebKitAPI/Tests/WTF/ThreadAssertionsTest.cpp (295242 => 295243)
--- branches/safari-613-branch/Tools/TestWebKitAPI/Tests/WTF/ThreadAssertionsTest.cpp 2022-06-03 23:21:49 UTC (rev 295242)
+++ branches/safari-613-branch/Tools/TestWebKitAPI/Tests/WTF/ThreadAssertionsTest.cpp 2022-06-03 23:21:52 UTC (rev 295243)
@@ -46,8 +46,8 @@
template<typename T> int doTaskCompileFailure(T n) { return doTaskImpl(n); }
template<typename T> void accessVariableCompileFailure(T n) { m_value = n; }
private:
- int doTaskImpl(int n) WTF_REQUIRES_CAPABILITY(m_ownerThread) { return n + 1; }
- int m_value WTF_GUARDED_BY_CAPABILITY(m_ownerThread) { 0 };
+ int doTaskImpl(int n) WTF_REQUIRES_LOCK(m_ownerThread) { return n + 1; }
+ int m_value WTF_GUARDED_BY_LOCK(m_ownerThread) { 0 };
NO_UNIQUE_ADDRESS ThreadAssertion m_ownerThread;
};
}
@@ -64,7 +64,7 @@
// instance.accessVariableCompileFailure(10);
}
-static int testMainThreadFunction() WTF_REQUIRES_CAPABILITY(mainThread) { return 11; }
+static int testMainThreadFunction() WTF_REQUIRES_LOCK(mainThread) { return 11; }
TEST(WTF_ThreadAssertions, TestMainThreadNamedAssertion)
{
@@ -75,7 +75,7 @@
EXPECT_EQ(11, testMainThreadFunction());
}
-static int testMainRunLoopFunction() WTF_REQUIRES_CAPABILITY(mainRunLoop) { return 12; }
+static int testMainRunLoopFunction() WTF_REQUIRES_LOCK(mainRunLoop) { return 12; }
TEST(WTF_ThreadAssertions, TestMainRunLoopNamedAssertion)
{
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
