Changeset 223936 in webkit

Timestamp:

Oct 24, 2017 3:30:15 PM (6 years ago)

Author:

ddkilzer@apple.com

Message:

Need to pass non-nil argument to SimulateCrash() in bmalloc::logVMFailure()
<​https://webkit.org/b/178740>
<rdar://problem/35154943>

Reviewed by Saam Barati.

• bmalloc/BPlatform.h:

(BUNUSED_PARAM): Define macro.

• bmalloc/Logging.cpp:

(SimulateCrash): Change third argument of SimulateCrash() to
CFStringRef since it's an NSString * in Objective-C.
(bmalloc::logVMFailure): Create a CFStringRef to use as a
description string. Use new vmSize parameter to log size.

• bmalloc/Logging.h:

(bmalloc::logVMFailure): Update function signature to take a
size_t parameter representing vmSize.

• bmalloc/VMAllocate.h:

(bmalloc::tryVMAllocate): Pass vmSize into logVMFailure().

Location:

trunk/Source/bmalloc

Files:

• ChangeLog (modified) (1 diff)
• bmalloc/BPlatform.h (modified) (1 diff)
• bmalloc/Logging.cpp (modified) (2 diffs)
• bmalloc/Logging.h (modified) (1 diff)
• bmalloc/VMAllocate.h (modified) (1 diff)

trunk/Source/bmalloc/ChangeLog

@@ +1 @@
+2017-10-24  David Kilzer  <ddkilzer@apple.com>
+
+        Need to pass non-nil argument to SimulateCrash() in bmalloc::logVMFailure()
+        <https://webkit.org/b/178740>
+        <rdar://problem/35154943>
+
+        Reviewed by Saam Barati.
+
+        * bmalloc/BPlatform.h:
+        (BUNUSED_PARAM): Define macro.
+        * bmalloc/Logging.cpp:
+        (SimulateCrash): Change third argument of SimulateCrash() to
+        CFStringRef since it's an NSString * in Objective-C.
+        (bmalloc::logVMFailure): Create a CFStringRef to use as a
+        description string.  Use new vmSize parameter to log size.
+        * bmalloc/Logging.h:
+        (bmalloc::logVMFailure): Update function signature to take a
+        size_t parameter representing vmSize.
+        * bmalloc/VMAllocate.h:
+        (bmalloc::tryVMAllocate): Pass vmSize into logVMFailure().
+
 2017-10-23  Michael Catanzaro  <mcatanzaro@igalia.com>
 

trunk/Source/bmalloc/bmalloc/BPlatform.h

@@ -217 +217 @@
 #define BUSE_OS_LOG 1
 #endif
+
+/* BUNUSED_PARAM */
+#if !defined(BUNUSED_PARAM)
+#define BUNUSED_PARAM(variable) (void)variable
+#endif

trunk/Source/bmalloc/bmalloc/Logging.cpp

@@ -33 +33 @@
 
 #if BPLATFORM(IOS)
+#include <CoreFoundation/CoreFoundation.h>
 #include <mach/exception_types.h>
 #include <objc/objc.h>
@@ -39 +40 @@
 #include "BSoftLinking.h"
 BSOFT_LINK_PRIVATE_FRAMEWORK(CrashReporterSupport);
-BSOFT_LINK_FUNCTION(CrashReporterSupport, SimulateCrash, BOOL, (pid_t pid, mach_exception_data_type_t exceptionCode, id description), (pid, exceptionCode, description));
+BSOFT_LINK_FUNCTION(CrashReporterSupport, SimulateCrash, BOOL, (pid_t pid, mach_exception_data_type_t exceptionCode, CFStringRef description), (pid, exceptionCode, description));
 #endif
 
 namespace bmalloc {
 
-void logVMFailure()
+void logVMFailure(size_t vmSize)
 {
 #if BPLATFORM(IOS)
     const mach_exception_data_type_t kExceptionCode = 0xc105ca11;
-    SimulateCrash(getpid(), kExceptionCode, nullptr);
+    CFStringRef description = CFStringCreateWithFormat(kCFAllocatorDefault, nullptr, CFSTR("bmalloc failed to mmap %lu bytes"), vmSize);
+    SimulateCrash(getpid(), kExceptionCode, description);
+    CFRelease(description);
+#else
+    BUNUSED_PARAM(vmSize);
 #endif
 }

trunk/Source/bmalloc/bmalloc/Logging.h

@@ -27 +27 @@
 
 #include "BPlatform.h"
+#include <stddef.h>
 
 namespace bmalloc {
 
-void logVMFailure();
+void logVMFailure(size_t vmSize);
 
 #if !BUSE(OS_LOG)

trunk/Source/bmalloc/bmalloc/VMAllocate.h

@@ -124 +124 @@
     void* result = mmap(0, vmSize, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANON | BMALLOC_NORESERVE, BMALLOC_VM_TAG, 0);
     if (result == MAP_FAILED) {
-        logVMFailure();
+        logVMFailure(vmSize);
         return nullptr;
     }