Changeset 275247 in webkit

Timestamp:

Mar 30, 2021, 4:12:22 PM (4 years ago)

Author:

mark.lam@apple.com

Message:

Add disableForwardingVPrintfStdErrToOSLog() and use it in the jsc shell.
​https://bugs.webkit.org/show_bug.cgi?id=223963

Reviewed by Saam Barati.

Source/JavaScriptCore:

This prevents automatic forwarding of vprintf_stderr_common() to os_log_with_args(),
which results in duplicate output when using the jsc shell. As a result, ASSERT
fail messages and crash stack traces will be more readable.

• jsc.cpp:

(main):

Source/WTF:

• wtf/Assertions.cpp:

(WTF::disableForwardingVPrintfStdErrToOSLog):

• wtf/Assertions.h:
• wtf/WTFConfig.h:

Location:

trunk/Source

Files:

• JavaScriptCore/ChangeLog (modified) (1 diff)
• JavaScriptCore/jsc.cpp (modified) (1 diff)
• WTF/ChangeLog (modified) (1 diff)
• WTF/wtf/Assertions.cpp (modified) (4 diffs)
• WTF/wtf/Assertions.h (modified) (1 diff)
• WTF/wtf/WTFConfig.h (modified) (2 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2021-03-30  Mark Lam  <mark.lam@apple.com>
+
+        Add disableForwardingVPrintfStdErrToOSLog() and use it in the jsc shell.
+        https://bugs.webkit.org/show_bug.cgi?id=223963
+
+        Reviewed by Saam Barati.
+
+        This prevents automatic forwarding of vprintf_stderr_common() to os_log_with_args(),
+        which results in duplicate output when using the jsc shell.  As a result, ASSERT
+        fail messages and crash stack traces will be more readable.
+
+        * jsc.cpp:
+        (main):
+
 2021-03-30  Mark Lam  <mark.lam@apple.com>
 

trunk/Source/JavaScriptCore/jsc.cpp

@@ -2825 +2825 @@
     // have a chance to parse options.
     WTF::initialize();
+#if PLATFORM(COCOA)
+    WTF::disableForwardingVPrintfStdErrToOSLog();
+#endif
 
     // We can't use destructors in the following code because it uses Windows

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2021-03-30  Mark Lam  <mark.lam@apple.com>
+
+        Add disableForwardingVPrintfStdErrToOSLog() and use it in the jsc shell.
+        https://bugs.webkit.org/show_bug.cgi?id=223963
+
+        Reviewed by Saam Barati.
+
+        * wtf/Assertions.cpp:
+        (WTF::disableForwardingVPrintfStdErrToOSLog):
+        * wtf/Assertions.h:
+        * wtf/WTFConfig.h:
+
 2021-03-29  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WTF/wtf/Assertions.cpp

@@ -1 +1 @@
 /*
- * Copyright (C) 2003-2019 Apple Inc.  All rights reserved.
+ * Copyright (C) 2003-2021 Apple Inc.  All rights reserved.
  * Copyright (C) 2007-2009 Torch Mobile, Inc.
  * Copyright (C) 2011 University of Szeged. All rights reserved.
@@ -38 +38 @@
 #include <wtf/PrintStream.h>
 #include <wtf/StackTrace.h>
+#include <wtf/WTFConfig.h>
 #include <wtf/text/CString.h>
 #include <wtf/text/StringBuilder.h>
@@ -115 +116 @@
 }
 
-}
+#if PLATFORM(COCOA)
+void disableForwardingVPrintfStdErrToOSLog()
+{
+    g_wtfConfig.disableForwardingVPrintfStdErrToOSLog = true;
+}
+#endif
+
+} // namespace WTF
 
 extern "C" {
@@ -148 +156 @@
 
 #if PLATFORM(COCOA)
-    va_list copyOfArgs;
-    va_copy(copyOfArgs, args);
-    os_log_with_args(OS_LOG_DEFAULT, OS_LOG_TYPE_DEFAULT, format, copyOfArgs, __builtin_return_address(0));
-    va_end(copyOfArgs);
+    if (!g_wtfConfig.disableForwardingVPrintfStdErrToOSLog) {
+        va_list copyOfArgs;
+        va_copy(copyOfArgs, args);
+        os_log_with_args(OS_LOG_DEFAULT, OS_LOG_TYPE_DEFAULT, format, copyOfArgs, __builtin_return_address(0));
+        va_end(copyOfArgs);
+    }
 #endif
 

trunk/Source/WTF/wtf/Assertions.h

@@ -681 +681 @@
     isIntegralOrPointerType(types...);
 }
-}
+
+#if PLATFORM(COCOA)
+WTF_EXPORT_PRIVATE void disableForwardingVPrintfStdErrToOSLog();
+#endif
+
+} // namespace WTF
 
 inline void compilerFenceForCrash()

trunk/Source/WTF/wtf/WTFConfig.h

@@ -1 +1 @@
 /*
- * Copyright (C) 2020 Apple Inc. All rights reserved.
+ * Copyright (C) 2020-2021 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -70 +70 @@
 
     bool isPermanentlyFrozen;
+#if PLATFORM(COCOA)
+    bool disableForwardingVPrintfStdErrToOSLog;
+#endif
 
 #if USE(PTHREADS)