>From 9614445f287f49a1f30fc6c1aab3b4c003d278cc Mon Sep 17 00:00:00 2001 From: Andres Freund Date: Sat, 7 Dec 2013 19:23:39 +0100 Subject: [PATCH 2/2] Use the new %z support in several elog()/ereport() callers. Some of the callsites were actually wrong, notably in aset.c and mcxt.c, because they simply cast Size arguments to unsigned long, which will give wrong results on LLP64 platforms like 64bit windows. Many others just are shorter the new way. --- src/backend/access/hash/hashinsert.c | 5 ++--- src/backend/access/heap/hio.c | 7 +++---- src/backend/access/heap/rewriteheap.c | 5 ++--- src/backend/access/spgist/spgdoinsert.c | 6 +++--- src/backend/access/transam/xlog.c | 4 ++-- src/backend/nodes/readfuncs.c | 13 +++++-------- src/backend/port/sysv_shmem.c | 4 ++-- src/backend/port/win32_shmem.c | 4 ++-- src/backend/storage/file/fd.c | 2 +- src/backend/storage/freespace/freespace.c | 3 +-- src/backend/storage/ipc/dsm.c | 4 ++-- src/backend/storage/ipc/dsm_impl.c | 12 ++++++------ src/backend/storage/ipc/ipci.c | 3 +-- src/backend/storage/ipc/shmem.c | 14 ++++++-------- src/backend/storage/lmgr/predicate.c | 8 ++++---- src/backend/utils/mmgr/aset.c | 23 ++++++++++------------- src/backend/utils/mmgr/mcxt.c | 24 ++++++++---------------- 17 files changed, 60 insertions(+), 81 deletions(-) diff --git a/src/backend/access/hash/hashinsert.c b/src/backend/access/hash/hashinsert.c index 4508a36..bcc1713 100644 --- a/src/backend/access/hash/hashinsert.c +++ b/src/backend/access/hash/hashinsert.c @@ -65,9 +65,8 @@ _hash_doinsert(Relation rel, IndexTuple itup) if (itemsz > HashMaxItemSize((Page) metap)) ereport(ERROR, (errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED), - errmsg("index row size %lu exceeds hash maximum %lu", - (unsigned long) itemsz, - (unsigned long) HashMaxItemSize((Page) metap)), + errmsg("index row size %zu exceeds hash maximum %zu", + itemsz, HashMaxItemSize((Page) metap)), errhint("Values larger than a buffer page cannot be indexed."))); /* diff --git a/src/backend/access/heap/hio.c b/src/backend/access/heap/hio.c index 8da2690..e15c416 100644 --- a/src/backend/access/heap/hio.c +++ b/src/backend/access/heap/hio.c @@ -237,9 +237,8 @@ RelationGetBufferForTuple(Relation relation, Size len, if (len > MaxHeapTupleSize) ereport(ERROR, (errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED), - errmsg("row is too big: size %lu, maximum size %lu", - (unsigned long) len, - (unsigned long) MaxHeapTupleSize))); + errmsg("row is too big: size %zu, maximum size %zu", + len, MaxHeapTupleSize))); /* Compute desired extra freespace due to fillfactor option */ saveFreeSpace = RelationGetTargetPageFreeSpace(relation, @@ -477,7 +476,7 @@ RelationGetBufferForTuple(Relation relation, Size len, if (len > PageGetHeapFreeSpace(page)) { /* We should not get here given the test at the top */ - elog(PANIC, "tuple is too big: size %lu", (unsigned long) len); + elog(PANIC, "tuple is too big: size %zu", len); } /* diff --git a/src/backend/access/heap/rewriteheap.c b/src/backend/access/heap/rewriteheap.c index deec77d..eb418d3 100644 --- a/src/backend/access/heap/rewriteheap.c +++ b/src/backend/access/heap/rewriteheap.c @@ -601,9 +601,8 @@ raw_heap_insert(RewriteState state, HeapTuple tup) if (len > MaxHeapTupleSize) ereport(ERROR, (errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED), - errmsg("row is too big: size %lu, maximum size %lu", - (unsigned long) len, - (unsigned long) MaxHeapTupleSize))); + errmsg("row is too big: size %zu, maximum size %zu", + len, MaxHeapTupleSize))); /* Compute desired extra freespace due to fillfactor option */ saveFreeSpace = RelationGetTargetPageFreeSpace(state->rs_new_rel, diff --git a/src/backend/access/spgist/spgdoinsert.c b/src/backend/access/spgist/spgdoinsert.c index 9f425ca..a739f1b 100644 --- a/src/backend/access/spgist/spgdoinsert.c +++ b/src/backend/access/spgist/spgdoinsert.c @@ -1885,9 +1885,9 @@ spgdoinsert(Relation index, SpGistState *state, if (leafSize > SPGIST_PAGE_CAPACITY && !state->config.longValuesOK) ereport(ERROR, (errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED), - errmsg("index row size %lu exceeds maximum %lu for index \"%s\"", - (unsigned long) (leafSize - sizeof(ItemIdData)), - (unsigned long) (SPGIST_PAGE_CAPACITY - sizeof(ItemIdData)), + errmsg("index row size %zu exceeds maximum %zu for index \"%s\"", + leafSize - sizeof(ItemIdData), + SPGIST_PAGE_CAPACITY - sizeof(ItemIdData), RelationGetRelationName(index)), errhint("Values larger than a buffer page cannot be indexed."))); diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c index b68230d..4bdbe38 100755 --- a/src/backend/access/transam/xlog.c +++ b/src/backend/access/transam/xlog.c @@ -2728,9 +2728,9 @@ XLogWrite(XLogwrtRqst WriteRqst, bool flexible) ereport(PANIC, (errcode_for_file_access(), errmsg("could not write to log file %s " - "at offset %u, length %lu: %m", + "at offset %u, length %zu: %m", XLogFileNameP(ThisTimeLineID, openLogSegNo), - openLogOff, (unsigned long) nbytes))); + openLogOff, nbytes))); } nleft -= written; from += written; diff --git a/src/backend/nodes/readfuncs.c b/src/backend/nodes/readfuncs.c index 2e2cfa7..955bd6a 100644 --- a/src/backend/nodes/readfuncs.c +++ b/src/backend/nodes/readfuncs.c @@ -1435,15 +1435,13 @@ readDatum(bool typbyval) token = pg_strtok(&tokenLength); /* read the '[' */ if (token == NULL || token[0] != '[') - elog(ERROR, "expected \"[\" to start datum, but got \"%s\"; length = %lu", - token ? (const char *) token : "[NULL]", - (unsigned long) length); + elog(ERROR, "expected \"[\" to start datum, but got \"%s\"; length = %zu", + token ? (const char *) token : "[NULL]", length); if (typbyval) { if (length > (Size) sizeof(Datum)) - elog(ERROR, "byval datum but length = %lu", - (unsigned long) length); + elog(ERROR, "byval datum but length = %zu", length); res = (Datum) 0; s = (char *) (&res); for (i = 0; i < (Size) sizeof(Datum); i++) @@ -1467,9 +1465,8 @@ readDatum(bool typbyval) token = pg_strtok(&tokenLength); /* read the ']' */ if (token == NULL || token[0] != ']') - elog(ERROR, "expected \"]\" to end datum, but got \"%s\"; length = %lu", - token ? (const char *) token : "[NULL]", - (unsigned long) length); + elog(ERROR, "expected \"]\" to end datum, but got \"%s\"; length = %zu", + token ? (const char *) token : "[NULL]", length); return res; } diff --git a/src/backend/port/sysv_shmem.c b/src/backend/port/sysv_shmem.c index b604407..34f211e 100644 --- a/src/backend/port/sysv_shmem.c +++ b/src/backend/port/sysv_shmem.c @@ -138,8 +138,8 @@ InternalIpcMemoryCreate(IpcMemoryKey memKey, Size size) */ ereport(FATAL, (errmsg("could not create shared memory segment: %m"), - errdetail("Failed system call was shmget(key=%lu, size=%lu, 0%o).", - (unsigned long) memKey, (unsigned long) size, + errdetail("Failed system call was shmget(key=%lu, size=%zu, 0%o).", + (unsigned long) memKey, size, IPC_CREAT | IPC_EXCL | IPCProtection), (errno == EINVAL) ? errhint("This error usually means that PostgreSQL's request for a shared memory " diff --git a/src/backend/port/win32_shmem.c b/src/backend/port/win32_shmem.c index 0db8e8f..e456f65 100644 --- a/src/backend/port/win32_shmem.c +++ b/src/backend/port/win32_shmem.c @@ -166,8 +166,8 @@ PGSharedMemoryCreate(Size size, bool makePrivate, int port) if (!hmap) ereport(FATAL, (errmsg("could not create shared memory segment: error code %lu", GetLastError()), - errdetail("Failed system call was CreateFileMapping(size=%lu, name=%s).", - (unsigned long) size, szShareMem))); + errdetail("Failed system call was CreateFileMapping(size=%zu, name=%s).", + size, szShareMem))); /* * If the segment already existed, CreateFileMapping() will return a diff --git a/src/backend/storage/file/fd.c b/src/backend/storage/file/fd.c index de4d902..494ca9e 100644 --- a/src/backend/storage/file/fd.c +++ b/src/backend/storage/file/fd.c @@ -829,7 +829,7 @@ AllocateVfd(void) Index i; File file; - DO_DB(elog(LOG, "AllocateVfd. Size %lu", (unsigned long) SizeVfdCache)); + DO_DB(elog(LOG, "AllocateVfd. Size %zu", SizeVfdCache)); Assert(SizeVfdCache > 0); /* InitFileAccess not called? */ diff --git a/src/backend/storage/freespace/freespace.c b/src/backend/storage/freespace/freespace.c index b15cf8f..1e91563 100644 --- a/src/backend/storage/freespace/freespace.c +++ b/src/backend/storage/freespace/freespace.c @@ -379,8 +379,7 @@ fsm_space_needed_to_cat(Size needed) /* Can't ask for more space than the highest category represents */ if (needed > MaxFSMRequestSize) - elog(ERROR, "invalid FSM request size %lu", - (unsigned long) needed); + elog(ERROR, "invalid FSM request size %zu", needed); if (needed == 0) return 1; diff --git a/src/backend/storage/ipc/dsm.c b/src/backend/storage/ipc/dsm.c index 6df402f..7e6e1a5 100644 --- a/src/backend/storage/ipc/dsm.c +++ b/src/backend/storage/ipc/dsm.c @@ -193,8 +193,8 @@ dsm_postmaster_startup(void) dsm_control = dsm_control_address; on_shmem_exit(dsm_postmaster_shutdown, 0); elog(DEBUG2, - "created dynamic shared memory control segment %u (%lu bytes)", - dsm_control_handle, (unsigned long) segsize); + "created dynamic shared memory control segment %u (%zu bytes)", + dsm_control_handle, segsize); dsm_write_state_file(dsm_control_handle); /* Initialize control segment. */ diff --git a/src/backend/storage/ipc/dsm_impl.c b/src/backend/storage/ipc/dsm_impl.c index 7c346e6..5b3589a 100644 --- a/src/backend/storage/ipc/dsm_impl.c +++ b/src/backend/storage/ipc/dsm_impl.c @@ -329,8 +329,8 @@ dsm_impl_posix(dsm_op op, dsm_handle handle, Size request_size, ereport(elevel, (errcode_for_dynamic_shared_memory(), - errmsg("could not resize shared memory segment %s to %lu bytes: %m", - name, (unsigned long) request_size))); + errmsg("could not resize shared memory segment %s to %zu bytes: %m", + name, request_size))); return false; } @@ -871,8 +871,8 @@ dsm_impl_mmap(dsm_op op, dsm_handle handle, Size request_size, ereport(elevel, (errcode_for_dynamic_shared_memory(), - errmsg("could not resize shared memory segment %s to %lu bytes: %m", - name, (unsigned long) request_size))); + errmsg("could not resize shared memory segment %s to %zu bytes: %m", + name, request_size))); return false; } else if (*mapped_size < request_size) @@ -919,8 +919,8 @@ dsm_impl_mmap(dsm_op op, dsm_handle handle, Size request_size, ereport(elevel, (errcode_for_dynamic_shared_memory(), - errmsg("could not resize shared memory segment %s to %lu bytes: %m", - name, (unsigned long) request_size))); + errmsg("could not resize shared memory segment %s to %zu bytes: %m", + name, request_size))); return false; } } diff --git a/src/backend/storage/ipc/ipci.c b/src/backend/storage/ipc/ipci.c index 040c7aa..57e2b9d 100644 --- a/src/backend/storage/ipc/ipci.c +++ b/src/backend/storage/ipc/ipci.c @@ -141,8 +141,7 @@ CreateSharedMemoryAndSemaphores(bool makePrivate, int port) /* might as well round it off to a multiple of a typical page size */ size = add_size(size, 8192 - (size % 8192)); - elog(DEBUG3, "invoking IpcMemoryCreate(size=%lu)", - (unsigned long) size); + elog(DEBUG3, "invoking IpcMemoryCreate(size=%zu)", size); /* * Create the shmem segment diff --git a/src/backend/storage/ipc/shmem.c b/src/backend/storage/ipc/shmem.c index 18ba426..8183931 100644 --- a/src/backend/storage/ipc/shmem.c +++ b/src/backend/storage/ipc/shmem.c @@ -344,8 +344,8 @@ ShmemInitStruct(const char *name, Size size, bool *foundPtr) ereport(ERROR, (errcode(ERRCODE_OUT_OF_MEMORY), errmsg("not enough shared memory for data structure" - " \"%s\" (%lu bytes requested)", - name, (unsigned long) size))); + " \"%s\" (%zu bytes requested)", + name, size))); shmemseghdr->index = structPtr; *foundPtr = FALSE; } @@ -378,10 +378,8 @@ ShmemInitStruct(const char *name, Size size, bool *foundPtr) LWLockRelease(ShmemIndexLock); ereport(ERROR, (errmsg("ShmemIndex entry size is wrong for data structure" - " \"%s\": expected %lu, actual %lu", - name, - (unsigned long) size, - (unsigned long) result->size))); + " \"%s\": expected %zu, actual %zu", + name, size, result->size))); } structPtr = result->location; } @@ -397,8 +395,8 @@ ShmemInitStruct(const char *name, Size size, bool *foundPtr) ereport(ERROR, (errcode(ERRCODE_OUT_OF_MEMORY), errmsg("not enough shared memory for data structure" - " \"%s\" (%lu bytes requested)", - name, (unsigned long) size))); + " \"%s\" (%zu bytes requested)", + name, size))); } result->size = size; result->location = structPtr; diff --git a/src/backend/storage/lmgr/predicate.c b/src/backend/storage/lmgr/predicate.c index a8a0e98..12a9e85 100644 --- a/src/backend/storage/lmgr/predicate.c +++ b/src/backend/storage/lmgr/predicate.c @@ -1185,8 +1185,8 @@ InitPredicateLocks(void) ereport(ERROR, (errcode(ERRCODE_OUT_OF_MEMORY), errmsg("not enough shared memory for elements of data structure" - " \"%s\" (%lu bytes requested)", - "PredXactList", (unsigned long) requestSize))); + " \"%s\" (%zu bytes requested)", + "PredXactList", requestSize))); /* Add all elements to available list, clean. */ memset(PredXact->element, 0, requestSize); for (i = 0; i < max_table_size; i++) @@ -1257,8 +1257,8 @@ InitPredicateLocks(void) ereport(ERROR, (errcode(ERRCODE_OUT_OF_MEMORY), errmsg("not enough shared memory for elements of data structure" - " \"%s\" (%lu bytes requested)", - "RWConflictPool", (unsigned long) requestSize))); + " \"%s\" (%zu bytes requested)", + "RWConflictPool", requestSize))); /* Add all elements to available list, clean. */ memset(RWConflictPool->element, 0, requestSize); for (i = 0; i < max_table_size; i++) diff --git a/src/backend/utils/mmgr/aset.c b/src/backend/utils/mmgr/aset.c index ff04a38..b6bbc7a 100644 --- a/src/backend/utils/mmgr/aset.c +++ b/src/backend/utils/mmgr/aset.c @@ -676,8 +676,7 @@ AllocSetAlloc(MemoryContext context, Size size) ereport(ERROR, (errcode(ERRCODE_OUT_OF_MEMORY), errmsg("out of memory"), - errdetail("Failed on request of size %lu.", - (unsigned long) size))); + errdetail("Failed on request of size %zu.", size))); } block->aset = set; block->freeptr = block->endptr = ((char *) block) + blksize; @@ -871,8 +870,7 @@ AllocSetAlloc(MemoryContext context, Size size) ereport(ERROR, (errcode(ERRCODE_OUT_OF_MEMORY), errmsg("out of memory"), - errdetail("Failed on request of size %lu.", - (unsigned long) size))); + errdetail("Failed on request of size %zu.", size))); } block->aset = set; @@ -1114,8 +1112,7 @@ AllocSetRealloc(MemoryContext context, void *pointer, Size size) ereport(ERROR, (errcode(ERRCODE_OUT_OF_MEMORY), errmsg("out of memory"), - errdetail("Failed on request of size %lu.", - (unsigned long) size))); + errdetail("Failed on request of size %zu.", size))); } block->freeptr = block->endptr = ((char *) block) + blksize; @@ -1245,10 +1242,10 @@ static void AllocSetStats(MemoryContext context, int level) { AllocSet set = (AllocSet) context; - long nblocks = 0; - long nchunks = 0; - long totalspace = 0; - long freespace = 0; + Size nblocks = 0; + Size nchunks = 0; + Size totalspace = 0; + Size freespace = 0; AllocBlock block; AllocChunk chunk; int fidx; @@ -1274,7 +1271,7 @@ AllocSetStats(MemoryContext context, int level) fprintf(stderr, " "); fprintf(stderr, - "%s: %lu total in %ld blocks; %lu free (%ld chunks); %lu used\n", + "%s: %zu total in %zd blocks; %zu free (%zd chunks); %zu used\n", set->header.name, totalspace, nblocks, freespace, nchunks, totalspace - freespace); } @@ -1338,8 +1335,8 @@ AllocSetCheck(MemoryContext context) elog(WARNING, "problem in alloc set %s: req size > alloc size for chunk %p in block %p", name, chunk, block); if (chsize < (1 << ALLOC_MINBITS)) - elog(WARNING, "problem in alloc set %s: bad size %lu for chunk %p in block %p", - name, (unsigned long) chsize, chunk, block); + elog(WARNING, "problem in alloc set %s: bad size %zu for chunk %p in block %p", + name, chsize, chunk, block); /* single-chunk block? */ if (chsize > set->allocChunkLimit && diff --git a/src/backend/utils/mmgr/mcxt.c b/src/backend/utils/mmgr/mcxt.c index 9574fd3..b97c098 100644 --- a/src/backend/utils/mmgr/mcxt.c +++ b/src/backend/utils/mmgr/mcxt.c @@ -573,8 +573,7 @@ MemoryContextAlloc(MemoryContext context, Size size) AssertArg(MemoryContextIsValid(context)); if (!AllocSizeIsValid(size)) - elog(ERROR, "invalid memory alloc request size %lu", - (unsigned long) size); + elog(ERROR, "invalid memory alloc request size %zu", size); context->isReset = false; @@ -599,8 +598,7 @@ MemoryContextAllocZero(MemoryContext context, Size size) AssertArg(MemoryContextIsValid(context)); if (!AllocSizeIsValid(size)) - elog(ERROR, "invalid memory alloc request size %lu", - (unsigned long) size); + elog(ERROR, "invalid memory alloc request size %zu", size); context->isReset = false; @@ -627,8 +625,7 @@ MemoryContextAllocZeroAligned(MemoryContext context, Size size) AssertArg(MemoryContextIsValid(context)); if (!AllocSizeIsValid(size)) - elog(ERROR, "invalid memory alloc request size %lu", - (unsigned long) size); + elog(ERROR, "invalid memory alloc request size %zu", size); context->isReset = false; @@ -649,8 +646,7 @@ palloc(Size size) AssertArg(MemoryContextIsValid(CurrentMemoryContext)); if (!AllocSizeIsValid(size)) - elog(ERROR, "invalid memory alloc request size %lu", - (unsigned long) size); + elog(ERROR, "invalid memory alloc request size %zu", size); CurrentMemoryContext->isReset = false; @@ -669,8 +665,7 @@ palloc0(Size size) AssertArg(MemoryContextIsValid(CurrentMemoryContext)); if (!AllocSizeIsValid(size)) - elog(ERROR, "invalid memory alloc request size %lu", - (unsigned long) size); + elog(ERROR, "invalid memory alloc request size %zu", size); CurrentMemoryContext->isReset = false; @@ -722,8 +717,7 @@ repalloc(void *pointer, Size size) void *ret; if (!AllocSizeIsValid(size)) - elog(ERROR, "invalid memory alloc request size %lu", - (unsigned long) size); + elog(ERROR, "invalid memory alloc request size %zu", size); /* * Try to detect bogus pointers handed to us, poorly though we can. @@ -764,8 +758,7 @@ MemoryContextAllocHuge(MemoryContext context, Size size) AssertArg(MemoryContextIsValid(context)); if (!AllocHugeSizeIsValid(size)) - elog(ERROR, "invalid memory alloc request size %lu", - (unsigned long) size); + elog(ERROR, "invalid memory alloc request size %zu", size); context->isReset = false; @@ -787,8 +780,7 @@ repalloc_huge(void *pointer, Size size) void *ret; if (!AllocHugeSizeIsValid(size)) - elog(ERROR, "invalid memory alloc request size %lu", - (unsigned long) size); + elog(ERROR, "invalid memory alloc request size %zu", size); /* * Try to detect bogus pointers handed to us, poorly though we can. -- 1.8.5.rc2.dirty