walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Beautify debug output

This commit is contained in:
Behdad Esfahbod 2012-05-11 00:16:40 +02:00
parent 6f45538017
commit 1e08830b4f
2 changed files with 55 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/hb-open-type-private.hh
View File

@ -171,17 +171,17 @@ struct hb_sanitize_context_t
this->edit_count = 0; this->edit_count = 0;
this->debug_depth = 0; this->debug_depth = 0;
DEBUG_MSG (SANITIZE, this->blob, DEBUG_MSG_LEVEL (SANITIZE, this->blob, 0, +1,
"init [%p..%p] (%lu bytes)", "init [%p..%p] (%lu bytes)",
this->start, this->end, this->start, this->end,
(unsigned long) (this->end - this->start)); (unsigned long) (this->end - this->start));
} }
inline void finish (void) inline void finish (void)
{ {
DEBUG_MSG (SANITIZE, this->blob, DEBUG_MSG_LEVEL (SANITIZE, this->blob, 0, -1,
"fini [%p..%p] %u edit requests", "fini [%p..%p] %u edit requests",
this->start, this->end, this->edit_count); this->start, this->end, this->edit_count);
hb_blob_destroy (this->blob); hb_blob_destroy (this->blob);
this->blob = NULL; this->blob = NULL;
@ -195,7 +195,7 @@ struct hb_sanitize_context_t
p <= this->end && p <= this->end &&
(unsigned int) (this->end - p) >= len; (unsigned int) (this->end - p) >= len;
DEBUG_MSG_LEVEL (SANITIZE, this->blob, this->debug_depth + 1, DEBUG_MSG_LEVEL (SANITIZE, this->blob, this->debug_depth + 1, 0,
"range [%p..%p] (%d bytes) in [%p..%p] -> %s", "range [%p..%p] (%d bytes) in [%p..%p] -> %s",
p, p + len, len, p, p + len, len,
this->start, this->end, this->start, this->end,
@ -209,7 +209,7 @@ struct hb_sanitize_context_t
const char *p = (const char *) base; const char *p = (const char *) base;
bool overflows = _hb_unsigned_int_mul_overflows (len, record_size); bool overflows = _hb_unsigned_int_mul_overflows (len, record_size);
DEBUG_MSG_LEVEL (SANITIZE, this->blob, this->debug_depth + 1, DEBUG_MSG_LEVEL (SANITIZE, this->blob, this->debug_depth + 1, 0,
"array [%p..%p] (%d*%d=%ld bytes) in [%p..%p] -> %s", "array [%p..%p] (%d*%d=%ld bytes) in [%p..%p] -> %s",
p, p + (record_size * len), record_size, len, (unsigned long) record_size * len, p, p + (record_size * len), record_size, len, (unsigned long) record_size * len,
this->start, this->end, this->start, this->end,
@ -229,7 +229,7 @@ struct hb_sanitize_context_t
const char *p = (const char *) base; const char *p = (const char *) base;
this->edit_count++; this->edit_count++;
DEBUG_MSG_LEVEL (SANITIZE, this->blob, this->debug_depth + 1, DEBUG_MSG_LEVEL (SANITIZE, this->blob, this->debug_depth + 1, 0,
"edit(%u) [%p..%p] (%d bytes) in [%p..%p] -> %s", "edit(%u) [%p..%p] (%d bytes) in [%p..%p] -> %s",
this->edit_count, this->edit_count,
p, p + len, len, p, p + len, len,

74
src/hb-private.hh
View File

@ -503,18 +503,24 @@ _hb_debug (unsigned int level,
template <int max_level> inline bool /* always returns TRUE */ template <int max_level> inline bool /* always returns TRUE */
_hb_debug_msg_va (const char *what, _hb_debug_msg_va (const char *what,
const void *obj, const void *obj,
const char *func, const char *func,
bool indented, bool indented,
int level, unsigned int level,
const char *message, int level_dir,
va_list ap) const char *message,
va_list ap)
{ {
static const char bars[] = "││││││││││││││││││││││││││││││││││││││││";
(void) (_hb_debug (level, max_level) && (void) (_hb_debug (level, max_level) &&
fprintf (stderr, "%s", what) && (fprintf (stderr, "%-10s", what ? what : ""), TRUE) &&
(obj && fprintf (stderr, "(%p)", obj), TRUE) && ((obj && fprintf (stderr, "(%p) ", obj), TRUE) || fprintf (stderr, " %*s ", (unsigned int) (2 * sizeof (void *)), ""), TRUE) &&
fprintf (stderr, ": ") && (indented && fprintf (stderr, "%2d %s├%s",
(indented && fprintf (stderr, "%-*d-> ", level + 1, level), TRUE) && level,
bars + sizeof (bars) - 1 - MIN ((unsigned int) sizeof (bars), 3 * level),
level_dir ? (level_dir > 0 ? "╮" : "╯") : "╴"), TRUE) &&
(!indented && fprintf (stderr, " ├╴"), TRUE) &&
(func && fprintf (stderr, "%s: ", func), TRUE) && (func && fprintf (stderr, "%s: ", func), TRUE) &&
(vfprintf (stderr, message, ap), TRUE) && (vfprintf (stderr, message, ap), TRUE) &&
fprintf (stderr, "\n")); fprintf (stderr, "\n"));
@ -523,12 +529,13 @@ _hb_debug_msg_va (const char *what,
} }
template <> inline bool /* always returns TRUE */ template <> inline bool /* always returns TRUE */
_hb_debug_msg_va<0> (const char *what, _hb_debug_msg_va<0> (const char *what,
const void *obj, const void *obj,
const char *func, const char *func,
bool indented, bool indented,
int level, unsigned int level,
const char *message, int level_dir,
va_list ap) const char *message,
va_list ap)
{ {
return TRUE; return TRUE;
} }
@ -538,22 +545,24 @@ _hb_debug_msg (const char *what,
const void *obj, const void *obj,
const char *func, const char *func,
bool indented, bool indented,
int level, unsigned int level,
int level_dir,
const char *message, const char *message,
...) HB_PRINTF_FUNC(6, 7); ...) HB_PRINTF_FUNC(7, 8);
template <int max_level> inline bool /* always returns TRUE */ template <int max_level> inline bool /* always returns TRUE */
_hb_debug_msg (const char *what, _hb_debug_msg (const char *what,
const void *obj, const void *obj,
const char *func, const char *func,
bool indented, bool indented,
int level, unsigned int level,
int level_dir,
const char *message, const char *message,
...) ...)
{ {
va_list ap; va_list ap;
va_start (ap, message); va_start (ap, message);
bool ret = _hb_debug_msg_va<max_level> (what, obj, func, indented, level, message, ap); bool ret = _hb_debug_msg_va<max_level> (what, obj, func, indented, level, level_dir, message, ap);
va_end (ap); va_end (ap);
@ -564,24 +573,26 @@ _hb_debug_msg<0> (const char *what,
const void *obj, const void *obj,
const char *func, const char *func,
bool indented, bool indented,
int level, unsigned int level,
int level_dir,
const char *message, const char *message,
...) HB_PRINTF_FUNC(6, 7); ...) HB_PRINTF_FUNC(7, 8);
template <> inline bool /* always returns TRUE */ template <> inline bool /* always returns TRUE */
_hb_debug_msg<0> (const char *what, _hb_debug_msg<0> (const char *what,
const void *obj, const void *obj,
const char *func, const char *func,
bool indented, bool indented,
int level, unsigned int level,
int level_dir,
const char *message, const char *message,
...) ...)
{ {
return TRUE; return TRUE;
} }
#define DEBUG_MSG_LEVEL(WHAT, OBJ, LEVEL, ...) _hb_debug_msg<HB_DEBUG_##WHAT> (#WHAT, (OBJ), NULL, TRUE, (LEVEL), __VA_ARGS__) #define DEBUG_MSG_LEVEL(WHAT, OBJ, LEVEL, LEVEL_DIR, ...) _hb_debug_msg<HB_DEBUG_##WHAT> (#WHAT, (OBJ), NULL, TRUE, (LEVEL), (LEVEL_DIR), __VA_ARGS__)
#define DEBUG_MSG(WHAT, OBJ, ...) DEBUG_MSG_LEVEL (WHAT, OBJ, 0, __VA_ARGS__) #define DEBUG_MSG(WHAT, OBJ, ...) _hb_debug_msg<HB_DEBUG_##WHAT> (#WHAT, (OBJ), NULL, FALSE, 0, 0, __VA_ARGS__)
#define DEBUG_MSG_FUNC(WHAT, OBJ, ...) _hb_debug_msg<HB_DEBUG_##WHAT> (#WHAT, (OBJ), HB_FUNC, FALSE, 0, __VA_ARGS__) #define DEBUG_MSG_FUNC(WHAT, OBJ, ...) _hb_debug_msg<HB_DEBUG_##WHAT> (#WHAT, (OBJ), HB_FUNC, FALSE, 0, 0, __VA_ARGS__)
/* /*
@ -597,14 +608,19 @@ struct hb_auto_trace_t {
const char *message, const char *message,
...) : plevel(plevel_) ...) : plevel(plevel_)
{ {
if (max_level) ++*plevel; if (plevel) ++*plevel;
va_list ap; va_list ap;
va_start (ap, message); va_start (ap, message);
_hb_debug_msg_va<max_level> (what, obj, func, TRUE, *plevel, message, ap); _hb_debug_msg_va<max_level> (what, obj, func, TRUE, plevel ? *plevel : 0, +1, message, ap);
va_end (ap); va_end (ap);
} }
~hb_auto_trace_t (void) { if (max_level) --*plevel; } ~hb_auto_trace_t (void)
{
_hb_debug_msg<max_level> (NULL, NULL, NULL, TRUE, plevel ? *plevel : 1, -1, " ");
if (plevel) --*plevel;
}
private: private:
unsigned int *plevel; unsigned int *plevel;