sk_malloc_throw/sk_calloc_throw in debug prints size in failure message

src/ports/SkMemory_malloc.cpp

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #include "SkTypes.h"
 #include <stdio.h>
 #include <stdlib.h>
 
+#ifdef SK_DEBUG
+    #define SK_DEBUGFAILF(message, ...)                \

[mtklein, 2014/07/10 15:03:40]

Can we put this in SkTypes as

#define SK_DEBUGFAILF(fmt, ...) SK_ASSERTF(false, fmt, __VA_ARGS__)

?

[hal.canary, 2014/07/10 15:15:11]

Done.

Mike Reed:  please note that this touches include/ now.

+        do {                                           \
+            SkNO_RETURN_HINT();                        \
+            SkDebugf("%s:%d: fail:" message "]\n",     \
+                     __FILE__, __LINE__, __VA_ARGS__); \
+            SK_CRASH();                                \
+        } while(0)
+#else
+    #define SK_DEBUGFAILF(message, ...)
+#endif
+
+static inline void sk_out_of_memory(size_t size) {
+    SK_DEBUGFAILF("sk_out_of_memory [0x%lx]", static_cast<unsigned long>(size));

[mtklein, 2014/07/10 15:03:40]

Let's be explicit this is a byte size, and perhaps not print it as hex?   This
seems easy to misinterpret as a pointer.

SK_DEBUGFAILF("sk_out_of_memory (asked for " SK_SIZE_T_SPECIFIER " bytes)",
size);

?

[hal.canary, 2014/07/10 15:15:11]

Done.

+    abort();
+}
+
 static inline void* throw_on_failure(size_t size, void* p) {
     if (size > 0 && p == NULL) {
         // If we've got a NULL here, the only reason we should have failed is running out of RAM.
-        sk_out_of_memory();
+        sk_out_of_memory(size);
     }
     return p;
 }
 
 void sk_throw() {
     SkDEBUGFAIL("sk_throw");
     abort();
 }
 
 void sk_out_of_memory(void) {
@@ skipping 24 matching lines @@
     }
 }
 
 void* sk_calloc(size_t size) {
     return calloc(size, 1);
 }
 
 void* sk_calloc_throw(size_t size) {
     return throw_on_failure(size, sk_calloc(size));
 }