<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[201969] trunk/Source/bmalloc</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/201969">201969</a></dd>
<dt>Author</dt> <dd>ddkilzer@apple.com</dd>
<dt>Date</dt> <dd>2016-06-11 04:46:19 -0700 (Sat, 11 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Implement logging for RELEASE_BASSERT_WITH_MESSAGE() in BAssert.h
<http://webkit.org/b/155992>
Reviewed by Geoff Garen.
* bmalloc/BAssert.h:
(BLOG_ERROR): Add method to always log error messages.
(RELEASE_BASSERT_WITH_MESSAGE): Use BLOG_ERROR() to implement
logging in Debug builds.
* bmalloc/BPlatform.h:
(BPLATFORM_MAC): Add.
(BUSE): Add BUSE() macro.
(BATTRIBUTE_PRINTF): Add.
(BUSE_OS_LOG): Add.
* bmalloc/Logging.cpp:
(bmalloc::reportAssertionFailureWithMessage): Add. Logs to
stderr.
* bmalloc/Logging.h:
(bmalloc::reportAssertionFailureWithMessage): Add declaration.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourcebmallocChangeLog">trunk/Source/bmalloc/ChangeLog</a></li>
<li><a href="#trunkSourcebmallocbmallocBAsserth">trunk/Source/bmalloc/bmalloc/BAssert.h</a></li>
<li><a href="#trunkSourcebmallocbmallocBPlatformh">trunk/Source/bmalloc/bmalloc/BPlatform.h</a></li>
<li><a href="#trunkSourcebmallocbmallocLoggingcpp">trunk/Source/bmalloc/bmalloc/Logging.cpp</a></li>
<li><a href="#trunkSourcebmallocbmallocLoggingh">trunk/Source/bmalloc/bmalloc/Logging.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourcebmallocChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/ChangeLog (201968 => 201969)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/ChangeLog 2016-06-11 11:20:23 UTC (rev 201968)
+++ trunk/Source/bmalloc/ChangeLog 2016-06-11 11:46:19 UTC (rev 201969)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2016-06-11 David Kilzer <ddkilzer@apple.com>
+
+ Implement logging for RELEASE_BASSERT_WITH_MESSAGE() in BAssert.h
+ <http://webkit.org/b/155992>
+
+ Reviewed by Geoff Garen.
+
+ * bmalloc/BAssert.h:
+ (BLOG_ERROR): Add method to always log error messages.
+ (RELEASE_BASSERT_WITH_MESSAGE): Use BLOG_ERROR() to implement
+ logging in Debug builds.
+ * bmalloc/BPlatform.h:
+ (BPLATFORM_MAC): Add.
+ (BUSE): Add BUSE() macro.
+ (BATTRIBUTE_PRINTF): Add.
+ (BUSE_OS_LOG): Add.
+ * bmalloc/Logging.cpp:
+ (bmalloc::reportAssertionFailureWithMessage): Add. Logs to
+ stderr.
+ * bmalloc/Logging.h:
+ (bmalloc::reportAssertionFailureWithMessage): Add declaration.
+
</ins><span class="cx"> 2016-06-07 Pranjal Jumde <pjumde@apple.com>
</span><span class="cx">
</span><span class="cx"> Prevents integer overflow in Vector.h
</span></span></pre></div>
<a id="trunkSourcebmallocbmallocBAsserth"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/bmalloc/BAssert.h (201968 => 201969)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/bmalloc/BAssert.h 2016-06-11 11:20:23 UTC (rev 201968)
+++ trunk/Source/bmalloc/bmalloc/BAssert.h 2016-06-11 11:46:19 UTC (rev 201969)
</span><span class="lines">@@ -20,14 +20,18 @@
</span><span class="cx"> * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
</span><span class="cx"> * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
</span><span class="cx"> * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
</span><del>- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</del><ins>+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</ins><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef BAssert_h
-#define BAssert_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #include "BPlatform.h"
</span><ins>+#include "Logging.h"
</ins><span class="cx">
</span><ins>+#if BUSE(OS_LOG)
+#include <os/log.h>
+#endif
+
</ins><span class="cx"> #if defined(NDEBUG) && BOS(DARWIN)
</span><span class="cx">
</span><span class="cx"> #if BCPU(X86_64) || BCPU(X86)
</span><span class="lines">@@ -63,11 +67,26 @@
</span><span class="cx">
</span><span class="cx"> #define RELEASE_BASSERT(x) BASSERT_IMPL(x)
</span><span class="cx">
</span><del>-// FIXME: Implement logging: <https://webkit.org/b/155992>
-#define RELEASE_BASSERT_WITH_MESSAGE(x, f, ...) BASSERT_IMPL(x)
</del><ins>+#if BUSE(OS_LOG)
+#define BMALLOC_LOGGING_PREFIX "bmalloc: "
+#define BLOG_ERROR(format, ...) os_log_error(OS_LOG_DEFAULT, BMALLOC_LOGGING_PREFIX format, __VA_ARGS__)
+#else
+#define BLOG_ERROR(format, ...) bmalloc::reportAssertionFailureWithMessage(__FILE__, __LINE__, __PRETTY_FUNCTION__, format, __VA_ARGS__)
+#endif
</ins><span class="cx">
</span><del>-#define UNUSED(x) (void)x
</del><ins>+#if defined(NDEBUG)
+#define RELEASE_BASSERT_WITH_MESSAGE(x, format, ...) BASSERT_IMPL(x)
+#else
+#define RELEASE_BASSERT_WITH_MESSAGE(x, format, ...) do { \
+ if (!(x)) { \
+ BLOG_ERROR("ASSERTION FAILED: " #x " :: " format, ##__VA_ARGS__); \
+ BCRASH(); \
+ } \
+} while (0);
+#endif
</ins><span class="cx">
</span><ins>+#define UNUSED(x) ((void)x)
+
</ins><span class="cx"> // ===== Release build =====
</span><span class="cx">
</span><span class="cx"> #if defined(NDEBUG)
</span><span class="lines">@@ -85,8 +104,6 @@
</span><span class="cx">
</span><span class="cx"> #define BASSERT(x) BASSERT_IMPL(x)
</span><span class="cx">
</span><del>-#define IF_DEBUG(x) x
</del><ins>+#define IF_DEBUG(x) (x)
</ins><span class="cx">
</span><span class="cx"> #endif // !defined(NDEBUG)
</span><del>-
-#endif // BAssert_h
</del></span></pre></div>
<a id="trunkSourcebmallocbmallocBPlatformh"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/bmalloc/BPlatform.h (201968 => 201969)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/bmalloc/BPlatform.h 2016-06-11 11:20:23 UTC (rev 201968)
+++ trunk/Source/bmalloc/bmalloc/BPlatform.h 2016-06-11 11:46:19 UTC (rev 201969)
</span><span class="lines">@@ -23,22 +23,17 @@
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef BPlatform_h
-#define BPlatform_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #ifdef __APPLE__
</span><ins>+#include <Availability.h>
+#include <AvailabilityMacros.h>
</ins><span class="cx"> #include <TargetConditionals.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #define BPLATFORM(PLATFORM) (defined BPLATFORM_##PLATFORM && BPLATFORM_##PLATFORM)
</span><span class="cx"> #define BOS(OS) (defined BOS_##OS && BOS_##OS)
</span><span class="cx">
</span><del>-#if ((defined(TARGET_OS_EMBEDDED) && TARGET_OS_EMBEDDED) \
- || (defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE) \
- || (defined(TARGET_IPHONE_SIMULATOR) && TARGET_IPHONE_SIMULATOR))
-#define BPLATFORM_IOS 1
-#endif
-
</del><span class="cx"> #ifdef __APPLE__
</span><span class="cx"> #define BOS_DARWIN 1
</span><span class="cx"> #endif
</span><span class="lines">@@ -47,6 +42,19 @@
</span><span class="cx"> #define BOS_UNIX 1
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if BOS(DARWIN) && ((defined(TARGET_OS_EMBEDDED) && TARGET_OS_EMBEDDED) \
+ || (defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE) \
+ || (defined(TARGET_IPHONE_SIMULATOR) && TARGET_IPHONE_SIMULATOR))
+#define BPLATFORM_IOS 1
+#elif BOS(DARWIN) && defined(TARGET_OS_MAC) && TARGET_OS_MAC
+#define BPLATFORM_MAC 1
+#endif
+
+/* ==== Policy decision macros: these define policy choices for a particular port. ==== */
+
+/* BUSE() - use a particular third-party library or optional OS service */
+#define BUSE(FEATURE) (defined BUSE_##FEATURE && BUSE_##FEATURE)
+
</ins><span class="cx"> /* ==== Platform adaptation macros: these describe properties of the target environment. ==== */
</span><span class="cx">
</span><span class="cx"> /* BCPU() - the target CPU architecture */
</span><span class="lines">@@ -181,4 +189,8 @@
</span><span class="cx">
</span><span class="cx"> #endif /* ARM */
</span><span class="cx">
</span><del>-#endif // BPlatform_h
</del><ins>+#define BATTRIBUTE_PRINTF(formatStringArgument, extraArguments) __attribute__((__format__(printf, formatStringArgument, extraArguments)))
+
+#if (BPLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200) || (BPLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000)
+#define BUSE_OS_LOG 1
+#endif
</ins></span></pre></div>
<a id="trunkSourcebmallocbmallocLoggingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/bmalloc/Logging.cpp (201968 => 201969)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/bmalloc/Logging.cpp 2016-06-11 11:20:23 UTC (rev 201968)
+++ trunk/Source/bmalloc/bmalloc/Logging.cpp 2016-06-11 11:46:19 UTC (rev 201969)
</span><span class="lines">@@ -26,6 +26,11 @@
</span><span class="cx"> #include "Logging.h"
</span><span class="cx"> #include "BPlatform.h"
</span><span class="cx">
</span><ins>+#if !BUSE(OS_LOG)
+#include <stdarg.h>
+#include <stdio.h>
+#endif
+
</ins><span class="cx"> #if BPLATFORM(IOS)
</span><span class="cx"> #include <mach/exception_types.h>
</span><span class="cx"> #include <objc/objc.h>
</span><span class="lines">@@ -46,4 +51,15 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if !BUSE(OS_LOG)
+void reportAssertionFailureWithMessage(const char* file, int line, const char* function, const char* format, ...)
+{
+ va_list args;
+ va_start(args, format);
+ vfprintf(stderr, format, args);
+ va_end(args);
+ fprintf(stderr, "%s(%d) : %s\n", file, line, function);
+}
+#endif
+
</ins><span class="cx"> } // namespace bmalloc
</span></span></pre></div>
<a id="trunkSourcebmallocbmallocLoggingh"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/bmalloc/Logging.h (201968 => 201969)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/bmalloc/Logging.h 2016-06-11 11:20:23 UTC (rev 201968)
+++ trunk/Source/bmalloc/bmalloc/Logging.h 2016-06-11 11:46:19 UTC (rev 201969)
</span><span class="lines">@@ -23,13 +23,16 @@
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef Logging_h
-#define Logging_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><ins>+#include "BPlatform.h"
+
</ins><span class="cx"> namespace bmalloc {
</span><span class="cx">
</span><span class="cx"> void logVMFailure();
</span><span class="cx">
</span><ins>+#if !BUSE(OS_LOG)
+void reportAssertionFailureWithMessage(const char* file, int line, const char* function, const char* format, ...) BATTRIBUTE_PRINTF(4, 5);
+#endif
+
</ins><span class="cx"> } // namespace bmalloc
</span><del>-
-#endif // Logging_h
</del></span></pre>
</div>
</div>
</body>
</html>