From b6ec7c92ac7ab6223b3c45dc554efffd1953758f Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Tue, 18 Mar 2014 14:26:44 -0400 Subject: [PATCH] Fix some remaining int64 vestiges in contrib/test_shm_mq. Andres Freund and Tom Lane --- contrib/test_shm_mq/setup.c | 15 ++++++++++----- contrib/test_shm_mq/test.c | 4 ++-- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/contrib/test_shm_mq/setup.c b/contrib/test_shm_mq/setup.c index 7ad11157cf..612480fd4e 100644 --- a/contrib/test_shm_mq/setup.c +++ b/contrib/test_shm_mq/setup.c @@ -92,7 +92,7 @@ setup_dynamic_shared_memory(int64 queue_size, int nworkers, { shm_toc_estimator e; int i; - uint64 segsize; + Size segsize; dsm_segment *seg; shm_toc *toc; test_shm_mq_header *hdr; @@ -101,8 +101,12 @@ setup_dynamic_shared_memory(int64 queue_size, int nworkers, if (queue_size < 0 || ((uint64) queue_size) < shm_mq_minimum_size) ereport(ERROR, (errcode(ERRCODE_INVALID_PARAMETER_VALUE), - errmsg("queue size must be at least %lu bytes", - (unsigned long) shm_mq_minimum_size))); + errmsg("queue size must be at least %zu bytes", + shm_mq_minimum_size))); + if (queue_size != ((Size) queue_size)) + ereport(ERROR, + (errcode(ERRCODE_INVALID_PARAMETER_VALUE), + errmsg("queue size overflows size_t"))); /* * Estimate how much shared memory we need. @@ -116,7 +120,7 @@ setup_dynamic_shared_memory(int64 queue_size, int nworkers, shm_toc_initialize_estimator(&e); shm_toc_estimate_chunk(&e, sizeof(test_shm_mq_header)); for (i = 0; i <= nworkers; ++i) - shm_toc_estimate_chunk(&e, queue_size); + shm_toc_estimate_chunk(&e, (Size) queue_size); shm_toc_estimate_keys(&e, 2 + nworkers); segsize = shm_toc_estimate(&e); @@ -138,7 +142,8 @@ setup_dynamic_shared_memory(int64 queue_size, int nworkers, { shm_mq *mq; - mq = shm_mq_create(shm_toc_allocate(toc, queue_size), queue_size); + mq = shm_mq_create(shm_toc_allocate(toc, (Size) queue_size), + (Size) queue_size); shm_toc_insert(toc, i + 1, mq); if (i == 0) diff --git a/contrib/test_shm_mq/test.c b/contrib/test_shm_mq/test.c index dba5e692e4..5ff1e9a63f 100644 --- a/contrib/test_shm_mq/test.c +++ b/contrib/test_shm_mq/test.c @@ -254,12 +254,12 @@ verify_message(Size origlen, char *origdata, Size newlen, char *newdata) if (origlen != newlen) ereport(ERROR, (errmsg("message corrupted"), - errdetail("The original message was " UINT64_FORMAT " bytes but the final message is " UINT64_FORMAT " bytes.", + errdetail("The original message was %zu bytes but the final message is %zu bytes.", origlen, newlen))); for (i = 0; i < origlen; ++i) if (origdata[i] != newdata[i]) ereport(ERROR, (errmsg("message corrupted"), - errdetail("The new and original messages differ at byte " UINT64_FORMAT " of " UINT64_FORMAT ".", i, origlen))); + errdetail("The new and original messages differ at byte %zu of %zu.", i, origlen))); }