From decd4e3e16424dc311e9fb5b663170414a11556a Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Mon, 25 Jul 2011 16:47:02 -0400 Subject: [PATCH] Add sugar syntax for debug messages Buffer debugging coming soon. --- src/hb-blob.cc | 35 +++++++++++++---------------------- src/hb-object-private.hh | 9 ++++----- src/hb-open-type-private.hh | 44 ++++++++++++++++++++++---------------------- src/hb-private.hh | 7 +++++-- 4 files changed, 44 insertions(+), 51 deletions(-) diff --git a/src/hb-blob.cc b/src/hb-blob.cc index db972a1..5443e57 100644 --- a/src/hb-blob.cc +++ b/src/hb-blob.cc @@ -243,32 +243,27 @@ _try_make_writable_inplace_unix (hb_blob_t *blob) #endif if ((uintptr_t) -1L == pagesize) { - (void) (HB_DEBUG_BLOB && - fprintf (stderr, "%p %s: failed to get pagesize: %s\n", (void *) blob, HB_FUNC, strerror (errno))); + DEBUG (BLOB, fprintf (stderr, "%p %s: failed to get pagesize: %s\n", (void *) blob, HB_FUNC, strerror (errno))); return FALSE; } - (void) (HB_DEBUG_BLOB && - fprintf (stderr, "%p %s: pagesize is %lu\n", (void *) blob, HB_FUNC, (unsigned long) pagesize)); + DEBUG (BLOB, fprintf (stderr, "%p %s: pagesize is %lu\n", (void *) blob, HB_FUNC, (unsigned long) pagesize)); mask = ~(pagesize-1); addr = (const char *) (((uintptr_t) blob->data) & mask); length = (const char *) (((uintptr_t) blob->data + blob->length + pagesize-1) & mask) - addr; - (void) (HB_DEBUG_BLOB && - fprintf (stderr, "%p %s: calling mprotect on [%p..%p] (%lu bytes)\n", - (void *) blob, HB_FUNC, - addr, addr+length, (unsigned long) length)); + DEBUG (BLOB, fprintf (stderr, "%p %s: calling mprotect on [%p..%p] (%lu bytes)\n", + (void *) blob, HB_FUNC, + addr, addr+length, (unsigned long) length)); if (-1 == mprotect ((void *) addr, length, PROT_READ | PROT_WRITE)) { - (void) (HB_DEBUG_BLOB && - fprintf (stderr, "%p %s: %s\n", (void *) blob, HB_FUNC, strerror (errno))); + DEBUG (BLOB, fprintf (stderr, "%p %s: %s\n", (void *) blob, HB_FUNC, strerror (errno))); return FALSE; } blob->mode = HB_MEMORY_MODE_WRITABLE; - (void) (HB_DEBUG_BLOB && - fprintf (stderr, "%p %s: successfully made [%p..%p] (%lu bytes) writable\n", - (void *) blob, HB_FUNC, - addr, addr+length, (unsigned long) length)); + DEBUG (BLOB, fprintf (stderr, "%p %s: successfully made [%p..%p] (%lu bytes) writable\n", + (void *) blob, HB_FUNC, + addr, addr+length, (unsigned long) length)); return TRUE; #else return FALSE; @@ -278,14 +273,12 @@ _try_make_writable_inplace_unix (hb_blob_t *blob) static bool _try_writable_inplace (hb_blob_t *blob) { - (void) (HB_DEBUG_BLOB && - fprintf (stderr, "%p %s: making writable inplace\n", (void *) blob, HB_FUNC)); + DEBUG (BLOB, fprintf (stderr, "%p %s: making writable inplace\n", (void *) blob, HB_FUNC)); if (_try_make_writable_inplace_unix (blob)) return TRUE; - (void) (HB_DEBUG_BLOB && - fprintf (stderr, "%p %s: making writable -> FAILED\n", (void *) blob, HB_FUNC)); + DEBUG (BLOB, fprintf (stderr, "%p %s: making writable -> FAILED\n", (void *) blob, HB_FUNC)); /* Failed to make writable inplace, mark that */ blob->mode = HB_MEMORY_MODE_READONLY; @@ -308,8 +301,7 @@ _try_writable (hb_blob_t *blob) return TRUE; - (void) (HB_DEBUG_BLOB && - fprintf (stderr, "%p %s -> %p\n", (void *) blob, HB_FUNC, blob->data)); + DEBUG (BLOB, fprintf (stderr, "%p %s -> %p\n", (void *) blob, HB_FUNC, blob->data)); char *new_data; @@ -317,8 +309,7 @@ _try_writable (hb_blob_t *blob) if (unlikely (!new_data)) return FALSE; - (void) (HB_DEBUG_BLOB && - fprintf (stderr, "%p %s: dupped successfully -> %p\n", (void *) blob, HB_FUNC, blob->data)); + DEBUG (BLOB, fprintf (stderr, "%p %s: dupped successfully -> %p\n", (void *) blob, HB_FUNC, blob->data)); memcpy (new_data, blob->data, blob->length); _hb_blob_destroy_user_data (blob); diff --git a/src/hb-object-private.hh b/src/hb-object-private.hh index acd1b9e..bdb1b36 100644 --- a/src/hb-object-private.hh +++ b/src/hb-object-private.hh @@ -191,11 +191,10 @@ struct _hb_object_header_t { } inline void trace (const char *function) const { - (void) (HB_DEBUG_OBJECT && - fprintf (stderr, "OBJECT(%p) refcount=%d %s\n", - (void *) this, - this ? ref_count.get () : 0, - function)); + DEBUG (OBJECT, fprintf (stderr, "OBJECT(%p) refcount=%d %s\n", + (void *) this, + this ? ref_count.get () : 0, + function)); } }; diff --git a/src/hb-open-type-private.hh b/src/hb-open-type-private.hh index ea763e9..a6499ee 100644 --- a/src/hb-open-type-private.hh +++ b/src/hb-open-type-private.hh @@ -220,13 +220,13 @@ struct hb_sanitize_context_t p <= this->end && (unsigned int) (this->end - p) >= len; - (void) (HB_DEBUG_SANITIZE && (int) this->debug_depth < (int) HB_DEBUG_SANITIZE && - fprintf (stderr, "SANITIZE(%p) %-*d-> range [%p..%p] (%d bytes) in [%p..%p] -> %s\n", - p, - this->debug_depth, this->debug_depth, - p, p + len, len, - this->start, this->end, - ret ? "pass" : "FAIL")); + DEBUG_DEPTH (SANITIZE, this->debug_depth, + fprintf (stderr, "SANITIZE(%p) %-*d-> range [%p..%p] (%d bytes) in [%p..%p] -> %s\n", + p, + this->debug_depth, this->debug_depth, + p, p + len, len, + this->start, this->end, + ret ? "pass" : "FAIL")); return likely (ret); } @@ -236,13 +236,13 @@ struct hb_sanitize_context_t const char *p = (const char *) base; bool overflows = _hb_unsigned_int_mul_overflows (len, record_size); - (void) (HB_DEBUG_SANITIZE && (int) this->debug_depth < (int) HB_DEBUG_SANITIZE && - fprintf (stderr, "SANITIZE(%p) %-*d-> array [%p..%p] (%d*%d=%ld bytes) in [%p..%p] -> %s\n", - p, - this->debug_depth, this->debug_depth, - p, p + (record_size * len), record_size, len, (unsigned long) record_size * len, - this->start, this->end, - !overflows ? "does not overflow" : "OVERFLOWS FAIL")); + DEBUG_DEPTH (SANITIZE, this->debug_depth, + fprintf (stderr, "SANITIZE(%p) %-*d-> array [%p..%p] (%d*%d=%ld bytes) in [%p..%p] -> %s\n", + p, + this->debug_depth, this->debug_depth, + p, p + (record_size * len), record_size, len, (unsigned long) record_size * len, + this->start, this->end, + !overflows ? "does not overflow" : "OVERFLOWS FAIL")); return likely (!overflows && this->check_range (base, record_size * len)); } @@ -258,14 +258,14 @@ struct hb_sanitize_context_t const char *p = (const char *) base; this->edit_count++; - (void) (HB_DEBUG_SANITIZE && (int) this->debug_depth < (int) HB_DEBUG_SANITIZE && - fprintf (stderr, "SANITIZE(%p) %-*d-> edit(%u) [%p..%p] (%d bytes) in [%p..%p] -> %s\n", - p, - this->debug_depth, this->debug_depth, - this->edit_count, - p, p + len, len, - this->start, this->end, - this->writable ? "granted" : "REJECTED")); + DEBUG_DEPTH (SANITIZE, this->debug_depth, + fprintf (stderr, "SANITIZE(%p) %-*d-> edit(%u) [%p..%p] (%d bytes) in [%p..%p] -> %s\n", + p, + this->debug_depth, this->debug_depth, + this->edit_count, + p, p + len, len, + this->start, this->end, + this->writable ? "granted" : "REJECTED")); return this->writable; } diff --git a/src/hb-private.hh b/src/hb-private.hh index b5745e7..b5e85c0 100644 --- a/src/hb-private.hh +++ b/src/hb-private.hh @@ -466,14 +466,17 @@ static inline unsigned char TOLOWER (unsigned char c) #define HB_DEBUG 0 #endif +#define DEBUG(WHAT, CODE) (void) (HB_DEBUG_##WHAT && (CODE)) +#define DEBUG_DEPTH(WHAT, DEPTH, CODE) (void) (HB_DEBUG_##WHAT && (int) (DEPTH) < (int) (HB_DEBUG_##WHAT) && (CODE)) + static inline bool /* always returns TRUE */ _hb_trace (const char *what, - const char *function, + const char *message, const void *obj, unsigned int depth, unsigned int max_depth) { - (void) ((depth < max_depth) && fprintf (stderr, "%s(%p) %-*d-> %s\n", what, obj, depth, depth, function)); + (void) ((depth < max_depth) && fprintf (stderr, "%s(%p) %-*d-> %s\n", what, obj, depth, depth, message)); return TRUE; } -- 2.7.4