mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Try to fix some DSA-related compiler warnings.

Browse Source 
Commit 13df76a537cca3b8884911d8fdf7c89a457a8dd3 was overconfident
about how portable %016lx is.  Some compilers complain because they
need %016llx, while platforms where DSA pointers are only 32 bits
get unhappy about using a 64-bit format for a 32-bit quantity.

Thomas Munro, per an off-list suggestion from me.
This commit is contained in:
Robert Haas 2016-12-05 10:00:49 -05:00
parent 7dd8eb39bd
commit 670b3bc8f5
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/backend/utils/mmgr/dsa.c
View File

@ -1099,9 +1099,10 @@ dsa_dump(dsa_area *area)
span = dsa_get_address(area, span_pointer); span = dsa_get_address(area, span_pointer);
fprintf(stderr, fprintf(stderr,
" span descriptor at %016lx, " " span descriptor at "
"superblock at %016lx, pages = %zu, " DSA_POINTER_FORMAT ", superblock at "
"objects free = %hu/%hu\n", DSA_POINTER_FORMAT
", pages = %zu, objects free = %hu/%hu\n",
span_pointer, span->start, span->npages, span_pointer, span->start, span->npages,
span->nallocatable, span->nmax); span->nallocatable, span->nmax);
span_pointer = span->nextspan; span_pointer = span->nextspan;

2
src/include/utils/dsa.h
View File

@ -54,6 +54,7 @@ typedef pg_atomic_uint32 dsa_pointer_atomic;
#define dsa_pointer_atomic_write pg_atomic_write_u32 #define dsa_pointer_atomic_write pg_atomic_write_u32
#define dsa_pointer_atomic_fetch_add pg_atomic_fetch_add_u32 #define dsa_pointer_atomic_fetch_add pg_atomic_fetch_add_u32
#define dsa_pointer_atomic_compare_exchange pg_atomic_compare_exchange_u32 #define dsa_pointer_atomic_compare_exchange pg_atomic_compare_exchange_u32
#define DSA_POINTER_FORMAT "%08x"
#else #else
typedef uint64 dsa_pointer; typedef uint64 dsa_pointer;
typedef pg_atomic_uint64 dsa_pointer_atomic; typedef pg_atomic_uint64 dsa_pointer_atomic;
@ -62,6 +63,7 @@ typedef pg_atomic_uint64 dsa_pointer_atomic;
#define dsa_pointer_atomic_write pg_atomic_write_u64 #define dsa_pointer_atomic_write pg_atomic_write_u64
#define dsa_pointer_atomic_fetch_add pg_atomic_fetch_add_u64 #define dsa_pointer_atomic_fetch_add pg_atomic_fetch_add_u64
#define dsa_pointer_atomic_compare_exchange pg_atomic_compare_exchange_u64 #define dsa_pointer_atomic_compare_exchange pg_atomic_compare_exchange_u64
#define DSA_POINTER_FORMAT "%016" INT64_MODIFIER "x"
#endif #endif
/* A sentinel value for dsa_pointer used to indicate failure to allocate. */ /* A sentinel value for dsa_pointer used to indicate failure to allocate. */