commit 7acb389569cf99c6bae9db31a8ed7c7007fbb566
author Behdad Esfahbod <behdad@behdad.org> Wed Aug 05 15:20:34 2009 -0400
committer Behdad Esfahbod <behdad@behdad.org> Mon Nov 02 14:40:31 2009 -0500
tree f36a1bb02d2727de152edc650e1e1efd6cd0a824
parent ec9f8db0d3cad146801b7dc5c59e517de3b6fa34

[HB] Improve debug output and fix mprotect bug

src/hb-open-type-private.hh

diff --git a/src/hb-open-type-private.hh b/src/hb-open-type-private.hh
index cadba2c..9bd16e2 100644
--- a/src/hb-open-type-private.hh
+++ b/src/hb-open-type-private.hh
@@ -203,16 +203,16 @@
  * Sanitize
  */
 
-#if HB_DEBUG
+#if HB_DEBUG >= 5
 #define SANITIZE_DEBUG_ARG_DEF	, unsigned int sanitize_depth
 #define SANITIZE_DEBUG_ARG	, sanitize_depth + 1
 #define SANITIZE_DEBUG_ARG_INIT	, 0
 #define SANITIZE_DEBUG() \
 	HB_STMT_START { \
-		printf ("SANITIZE(%p) %-*d-> %s\n", \
-			(CONST_CHARP (this) == NullPool) ? 0 : this, \
-			sanitize_depth+1, sanitize_depth, \
-			__PRETTY_FUNCTION__); \
+		fprintf (stderr, "SANITIZE(%p) %-*d-> %s\n", \
+			 (CONST_CHARP (this) == NullPool) ? 0 : this, \
+			 sanitize_depth+1, sanitize_depth, \
+			 __PRETTY_FUNCTION__); \
 	} HB_STMT_END
 #else
 #define SANITIZE_DEBUG_ARG_DEF
@@ -239,9 +239,8 @@
   context->edit_count = 0;
 
 #if HB_DEBUG
-  printf ("sanitize %p init [%p..%p] (%u bytes)\n",
-	  context->blob, context->start, context->end, context->start - context->end);
-
+  fprintf (stderr, "sanitize %p init [%p..%p] (%u bytes)\n",
+	   context->blob, context->start, context->end, context->start - context->end);
 #endif
 }
 
@@ -250,9 +249,8 @@
 		   bool unlock)
 {
 #if HB_DEBUG
-  printf ("sanitize %p fini [%p..%p] %u edit requests\n",
-	  context->blob, context->start, context->end, context->edit_count);
-
+  fprintf (stderr, "sanitize %p fini [%p..%p] %u edit requests\n",
+	   context->blob, context->start, context->end, context->edit_count);
 #endif
 
   if (unlock)
@@ -268,8 +266,8 @@
   context->edit_count++;
 
 #if HB_DEBUG
-  printf ("sanitize %p edit %u requested for [%p..%p] (%d bytes) in [%p..%p] -> %s\n",
-	  context->blob,
+  fprintf (stderr, "sanitize %p edit %u requested for [%p..%p] (%d bytes) in [%p..%p] -> %s\n",
+	   context->blob,
 	  context->edit_count,
 	  base, base+len, len,
 	  context->start, context->end,
@@ -316,7 +314,7 @@
 
   retry:
 #if HB_DEBUG
-    printf ("Sanitizer %p start %s\n", blob, __PRETTY_FUNCTION__);
+    fprintf (stderr, "Sanitizer %p start %s\n", blob, __PRETTY_FUNCTION__);
 #endif
 
     _hb_sanitize_init (&context, blob);
@@ -340,14 +338,14 @@
       if (edit_count && !hb_blob_is_writeable (blob) && hb_blob_try_writeable (blob)) {
         /* ok, we made it writeable by relocating.  try again */
 #if HB_DEBUG
-	printf ("Sanitizer %p retry %s\n", blob, __PRETTY_FUNCTION__);
+	fprintf (stderr, "Sanitizer %p retry %s\n", blob, __PRETTY_FUNCTION__);
 #endif
         goto retry;
       }
     }
 
 #if HB_DEBUG
-    printf ("Sanitizer %p %s %s\n", blob, sane ? "passed" : "failed", __PRETTY_FUNCTION__);
+    fprintf (stderr, "Sanitizer %p %s %s\n", blob, sane ? "passed" : "failed", __PRETTY_FUNCTION__);
 #endif
     if (sane)
       return blob;