Changeset 275619 in webkit

Timestamp:

Apr 7, 2021 12:16:47 PM (3 years ago)

Author:

commit-queue@webkit.org

Message:

Use os_transaction_create instead of deprecated xpc_transaction_begin/end
​https://bugs.webkit.org/show_bug.cgi?id=224288

Patch by Alex Christensen <​achristensen@webkit.org> on 2021-04-07
Reviewed by Tim Horton.

Source/WebKit:

xpc_transaction_begin/end are deprecated with os_transaction_t being the replacement.
The transaction object makes it easier to associate a transaction's begin and end with each other,
and it adds a name, which makes system level debugging of what transactions are happening in which
processes much nicer.

• Shared/EntryPointUtilities/Cocoa/XPCService/XPCServiceEntryPoint.h:

(WebKit::XPCServiceInitializer):

• Shared/EntryPointUtilities/Cocoa/XPCService/XPCServiceEntryPoint.mm:

(WebKit::osTransaction):
(WebKit::XPCServiceExit):

Source/WTF:

• wtf/spi/darwin/XPCSPI.h:

Location:

trunk/Source

Files:

• WTF/ChangeLog (modified) (1 diff)
• WTF/wtf/spi/darwin/XPCSPI.h (modified) (2 diffs)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/Shared/EntryPointUtilities/Cocoa/XPCService/XPCServiceEntryPoint.h (modified) (2 diffs)
• WebKit/Shared/EntryPointUtilities/Cocoa/XPCService/XPCServiceEntryPoint.mm (modified) (2 diffs)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2021-04-07  Alex Christensen  <achristensen@webkit.org>
+
+        Use os_transaction_create instead of deprecated xpc_transaction_begin/end
+        https://bugs.webkit.org/show_bug.cgi?id=224288
+
+        Reviewed by Tim Horton.
+
+        * wtf/spi/darwin/XPCSPI.h:
+
 2021-04-06  Yusuke Suzuki  <ysuzuki@apple.com>
 

trunk/Source/WTF/wtf/spi/darwin/XPCSPI.h

@@ -88 +88 @@
 
 #if USE(APPLE_INTERNAL_SDK)
+#include <os/transaction_private.h>
 #include <xpc/private.h>
 #else
+
+#if OS_OBJECT_USE_OBJC
+OS_OBJECT_DECL(os_transaction);
+#else
+typedef struct os_transaction_s *os_transaction_t;
+#endif
+
 enum {
     DISPATCH_MACH_SEND_POSSIBLE = 0x8,
 };
-#endif
+#endif // USE(APPLE_INTERNAL_SDK)
 
 #if !defined(XPC_NOESCAPE)
@@ -149 +157 @@
 void xpc_main(xpc_connection_handler_t);
 const char* xpc_string_get_string_ptr(xpc_object_t);
-void xpc_transaction_begin(void);
-void xpc_transaction_end(void);
+os_transaction_t os_transaction_create(const char *description);
 void xpc_transaction_exit_clean(void);
 void xpc_track_activity(void);

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-04-07  Alex Christensen  <achristensen@webkit.org>
+
+        Use os_transaction_create instead of deprecated xpc_transaction_begin/end
+        https://bugs.webkit.org/show_bug.cgi?id=224288
+
+        Reviewed by Tim Horton.
+
+        xpc_transaction_begin/end are deprecated with os_transaction_t being the replacement.
+        The transaction object makes it easier to associate a transaction's begin and end with each other,
+        and it adds a name, which makes system level debugging of what transactions are happening in which
+        processes much nicer.
+
+        * Shared/EntryPointUtilities/Cocoa/XPCService/XPCServiceEntryPoint.h:
+        (WebKit::XPCServiceInitializer):
+        * Shared/EntryPointUtilities/Cocoa/XPCService/XPCServiceEntryPoint.mm:
+        (WebKit::osTransaction):
+        (WebKit::XPCServiceExit):
+
 2021-04-07  Jer Noble  <jer.noble@apple.com>
 

trunk/Source/WebKit/Shared/EntryPointUtilities/Cocoa/XPCService/XPCServiceEntryPoint.h

@@ -81 +81 @@
 }
 
+#if PLATFORM(MAC)
+OSObjectPtr<os_transaction_t>& osTransaction();
+#endif
+
 template<typename XPCServiceType, typename XPCServiceInitializerDelegateType>
 void XPCServiceInitializer(OSObjectPtr<xpc_connection_t> connection, xpc_object_t initializerMessage, xpc_object_t priorityBoostMessage)
@@ -97 +101 @@
     // the UIProcess takes process assertions on behalf of its child processes.
 #if PLATFORM(MAC)
-ALLOW_DEPRECATED_DECLARATIONS_BEGIN
-    xpc_transaction_begin();
-ALLOW_DEPRECATED_DECLARATIONS_END
+    osTransaction() = adoptOSObject(os_transaction_create("WebKit XPC Service"));
 #endif
 

trunk/Source/WebKit/Shared/EntryPointUtilities/Cocoa/XPCService/XPCServiceEntryPoint.mm

@@ -157 +157 @@
 }
 
+#if PLATFORM(MAC)
+OSObjectPtr<os_transaction_t>& osTransaction()
+{
+    static NeverDestroyed<OSObjectPtr<os_transaction_t>> transaction;
+    return transaction.get();
+}
+#endif
+
 void XPCServiceExit(OSObjectPtr<xpc_object_t>&& priorityBoostMessage)
 {
@@ -162 +170 @@
     priorityBoostMessage = nullptr;
 
-    // Balances the xpc_transaction_begin() in XPCServiceInitializer.
 #if PLATFORM(MAC)
-ALLOW_DEPRECATED_DECLARATIONS_BEGIN
-    xpc_transaction_end();
-ALLOW_DEPRECATED_DECLARATIONS_END
+    osTransaction() = nullptr;
 #endif