diff options
| author | Michael Cahill <michael.cahill@mongodb.com> | 2016-08-30 16:08:22 +1000 |
|---|---|---|
| committer | Alex Gorrod <alexander.gorrod@mongodb.com> | 2016-08-30 16:08:22 +1000 |
| commit | f9b7857ee5cd4317ea6665da077153a5d9e3ad7c (patch) | |
| tree | 1a0c9787af4077cb5179de585e46998d6289c316 | |
| parent | 1ae0ab811fad080c197da3c0a73eb218226eb3f2 (diff) | |
| download | mongo-f9b7857ee5cd4317ea6665da077153a5d9e3ad7c.tar.gz | |
WT-2871 Make verbose formats and argument types match. (#2998)
OS X clang in particular is fussy about size_t vs uint64_t vs uintmax_t.
| -rw-r--r-- | src/block/block_compact.c | 6 | ||||
| -rw-r--r-- | src/evict/evict_lru.c | 3 | ||||
| -rw-r--r-- | src/reconcile/rec_write.c | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/src/block/block_compact.c b/src/block/block_compact.c index a5e510445cc..055cd3b6ceb 100644 --- a/src/block/block_compact.c +++ b/src/block/block_compact.c @@ -221,11 +221,11 @@ __block_dump_avail(WT_SESSION_IMPL *session, WT_BLOCK *block, bool start) if (!start) { __wt_verbose(session, WT_VERB_COMPACT, - "pages reviewed: %" PRIuMAX, block->compact_pages_reviewed); + "pages reviewed: %" PRIu64, block->compact_pages_reviewed); __wt_verbose(session, WT_VERB_COMPACT, - "pages skipped: %" PRIuMAX, block->compact_pages_skipped); + "pages skipped: %" PRIu64, block->compact_pages_skipped); __wt_verbose(session, WT_VERB_COMPACT, - "pages written: %" PRIuMAX, block->compact_pages_written); + "pages written: %" PRIu64, block->compact_pages_written); } __wt_verbose(session, WT_VERB_COMPACT, diff --git a/src/evict/evict_lru.c b/src/evict/evict_lru.c index 5a9f4dabb08..65c404db9df 100644 --- a/src/evict/evict_lru.c +++ b/src/evict/evict_lru.c @@ -1384,7 +1384,8 @@ fast: /* If the page can't be evicted, give up. */ ++internal_pages; __wt_verbose(session, WT_VERB_EVICTSERVER, - "select: %p, size %" PRIu64, page, page->memory_footprint); + "select: %p, size %" WT_SIZET_FMT, + page, page->memory_footprint); } WT_RET_NOTFOUND_OK(ret); diff --git a/src/reconcile/rec_write.c b/src/reconcile/rec_write.c index 9c742476910..5990ca73cae 100644 --- a/src/reconcile/rec_write.c +++ b/src/reconcile/rec_write.c @@ -3329,7 +3329,7 @@ supd_check_complete: if (WT_VERBOSE_ISSET(session, WT_VERB_SPLIT) && r->entries < 6) __wt_verbose(session, WT_VERB_SPLIT, "Reconciliation creating a page with %" PRIu32 - " entries, memory footprint %" PRIu64 + " entries, memory footprint %" WT_SIZET_FMT ", page count %" PRIu32 ", %s, split state: %d\n", r->entries, r->page->memory_footprint, r->bnd_next, F_ISSET(r, WT_EVICTING) ? "evict" : "checkpoint", |