Skip to content

Commit

Permalink
obj: fix format specifiers
Browse files Browse the repository at this point in the history 
To avoid clang's -Wformat warnings.
This doesn't manifest itself with GNU libc, as uintmax_t,
uint64_t, size_t all are typedef-ed to 'long long'.
But Darwin libc uses both 'long' and 'long long', I don't
know why.
  • Loading branch information
@GBuella @krzycz
GBuella authored and krzycz committed Feb 4, 2017
1 parent a011116 commit 4f9c9c7
Show file tree
Hide file tree
Showing 5 changed files with 38 additions and 28 deletions.
5 changes: 3 additions & 2 deletions src/libpmemobj/lane.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
#define _GNU_SOURCE
#endif

#include <inttypes.h>
#include <errno.h>
#include <limits.h>
#include <pthread.h>
Expand Down Expand Up @@ -293,7 +294,7 @@ lane_recover_and_section_boot(PMEMobjpool *pop)
sizeof(layout->sections[i]));

if (err != 0) {
LOG(2, "section_ops->recover %d %ju %d",
LOG(2, "section_ops->recover %d %" PRIu64 " %d",
i, j, err);
return err;
}
Expand Down Expand Up @@ -326,7 +327,7 @@ lane_check(PMEMobjpool *pop)
sizeof(layout->sections[i]));

if (err) {
LOG(2, "section_ops->check %d %ju %d",
LOG(2, "section_ops->check %d %" PRIu64 " %d",
i, j, err);

return err;
Expand Down
4 changes: 3 additions & 1 deletion src/libpmemobj/list.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@
/*
* list.c -- implementation of persistent atomic lists module
*/
#include <inttypes.h>

#include "list.h"
#include "obj.h"
#include "out.h"
Expand Down Expand Up @@ -1071,7 +1073,7 @@ lane_list_check(PMEMobjpool *pop, void *data, unsigned length)

if (section->obj_offset &&
!OBJ_OFF_FROM_HEAP(pop, section->obj_offset)) {
ERR("list lane: invalid offset 0x%jx",
ERR("list lane: invalid offset 0x%" PRIx64,
section->obj_offset);

return -1;
Expand Down
40 changes: 21 additions & 19 deletions src/libpmemobj/obj.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
/*
* obj.c -- transactional object store implementation
*/
#include <inttypes.h>
#include <limits.h>

#include "valgrind_internal.h"
Expand Down Expand Up @@ -758,15 +759,15 @@ pmemobj_descr_check(PMEMobjpool *pop, const char *layout, size_t poolsize)
}

if (pop->heap_offset + pop->heap_size != poolsize) {
ERR("heap size does not match pool size: %zu != %zu",
ERR("heap size does not match pool size: %" PRIu64 " != %zu",
pop->heap_offset + pop->heap_size, poolsize);
errno = EINVAL;
return -1;
}

if (pop->heap_offset % Pagesize ||
pop->heap_size % Pagesize) {
ERR("unaligned heap: off %ju, size %zu",
ERR("unaligned heap: off %" PRIu64 ", size %" PRIu64,
pop->heap_offset, pop->heap_size);
errno = EINVAL;
return -1;
Expand Down Expand Up @@ -1161,7 +1162,7 @@ pmemobj_check_basic_local(PMEMobjpool *pop)
int consistent = 1;

if (pop->run_id % 2) {
ERR("invalid run_id %ju", pop->run_id);
ERR("invalid run_id %" PRIu64, pop->run_id);
consistent = 0;
}

Expand Down Expand Up @@ -1226,7 +1227,7 @@ pmemobj_check_basic_remote(PMEMobjpool *pop)
}

if (pop->run_id % 2) {
ERR("invalid run_id %ju", pop->run_id);
ERR("invalid run_id %" PRIu64, pop->run_id);
consistent = 0;
}

Expand Down Expand Up @@ -1619,7 +1620,7 @@ pmemobj_check(const char *path, const char *layout)
PMEMobjpool *
pmemobj_pool_by_oid(PMEMoid oid)
{
LOG(3, "oid.off 0x%016jx", oid.off);
LOG(3, "oid.off 0x%016" PRIx64, oid.off);

/* XXX this is a temporary fix, to be fixed properly later */
if (pools_ht == NULL)
Expand Down Expand Up @@ -1928,7 +1929,7 @@ pmemobj_realloc(PMEMobjpool *pop, PMEMoid *oidp, size_t size,
{
ASSERTne(oidp, NULL);

LOG(3, "pop %p oid.off 0x%016jx size %zu type_num %lu",
LOG(3, "pop %p oid.off 0x%016" PRIx64 " size %zu type_num %" PRIu64,
pop, oidp->off, size, type_num);

/* log notice message if used inside a transaction */
Expand All @@ -1947,7 +1948,7 @@ pmemobj_zrealloc(PMEMobjpool *pop, PMEMoid *oidp, size_t size,
{
ASSERTne(oidp, NULL);

LOG(3, "pop %p oid.off 0x%016jx size %zu type_num %lu",
LOG(3, "pop %p oid.off 0x%016" PRIx64 " size %zu type_num %" PRIu64,
pop, oidp->off, size, type_num);

/* log notice message if used inside a transaction */
Expand Down Expand Up @@ -1989,7 +1990,8 @@ int
pmemobj_strdup(PMEMobjpool *pop, PMEMoid *oidp, const char *s,
uint64_t type_num)
{
LOG(3, "pop %p oidp %p string %s type_num %lu", pop, oidp, s, type_num);
LOG(3, "pop %p oidp %p string %s type_num %" PRIu64,
pop, oidp, s, type_num);

/* log notice message if used inside a transaction */
_POBJ_DEBUG_NOTICE_IN_TX();
Expand All @@ -2015,7 +2017,7 @@ pmemobj_free(PMEMoid *oidp)
{
ASSERTne(oidp, NULL);

LOG(3, "oid.off 0x%016jx", oidp->off);
LOG(3, "oid.off 0x%016" PRIx64, oidp->off);

/* log notice message if used inside a transaction */
_POBJ_DEBUG_NOTICE_IN_TX();
Expand All @@ -2037,7 +2039,7 @@ pmemobj_free(PMEMoid *oidp)
size_t
pmemobj_alloc_usable_size(PMEMoid oid)
{
LOG(3, "oid.off 0x%016jx", oid.off);
LOG(3, "oid.off 0x%016" PRIx64, oid.off);

if (oid.off == 0)
return 0;
Expand Down Expand Up @@ -2112,7 +2114,7 @@ pmemobj_drain(PMEMobjpool *pop)
uint64_t
pmemobj_type_num(PMEMoid oid)
{
LOG(3, "oid.off 0x%016jx", oid.off);
LOG(3, "oid.off 0x%016" PRIx64, oid.off);

ASSERT(!OID_IS_NULL(oid));

Expand Down Expand Up @@ -2255,7 +2257,7 @@ pmemobj_first(PMEMobjpool *pop)
PMEMoid
pmemobj_next(PMEMoid oid)
{
LOG(3, "oid.off 0x%016jx", oid.off);
LOG(3, "oid.off 0x%016" PRIx64, oid.off);

if (oid.off == 0)
return OID_NULL;
Expand Down Expand Up @@ -2286,8 +2288,8 @@ int
pmemobj_list_insert(PMEMobjpool *pop, size_t pe_offset, void *head,
PMEMoid dest, int before, PMEMoid oid)
{
LOG(3, "pop %p pe_offset %zu head %p dest.off 0x%016jx before %d"
" oid.off 0x%016jx",
LOG(3, "pop %p pe_offset %zu head %p dest.off 0x%016" PRIx64
" before %d oid.off 0x%016" PRIx64,
pop, pe_offset, head, dest.off, before, oid.off);

/* log notice message if used inside a transaction */
Expand All @@ -2313,8 +2315,8 @@ pmemobj_list_insert_new(PMEMobjpool *pop, size_t pe_offset, void *head,
uint64_t type_num,
pmemobj_constr constructor, void *arg)
{
LOG(3, "pop %p pe_offset %zu head %p dest.off 0x%016jx before %d"
" size %zu type_num %lu",
LOG(3, "pop %p pe_offset %zu head %p dest.off 0x%016" PRIx64
" before %d size %zu type_num %" PRIu64,
pop, pe_offset, head, dest.off, before, size, type_num);

/* log notice message if used inside a transaction */
Expand Down Expand Up @@ -2354,7 +2356,7 @@ int
pmemobj_list_remove(PMEMobjpool *pop, size_t pe_offset, void *head,
PMEMoid oid, int free)
{
LOG(3, "pop %p pe_offset %zu head %p oid.off 0x%016jx free %d",
LOG(3, "pop %p pe_offset %zu head %p oid.off 0x%016" PRIx64 " free %d",
pop, pe_offset, head, oid.off, free);

/* log notice message if used inside a transaction */
Expand Down Expand Up @@ -2383,8 +2385,8 @@ pmemobj_list_move(PMEMobjpool *pop, size_t pe_old_offset, void *head_old,
PMEMoid dest, int before, PMEMoid oid)
{
LOG(3, "pop %p pe_old_offset %zu pe_new_offset %zu"
" head_old %p head_new %p dest.off 0x%016jx"
" before %d oid.off 0x%016jx",
" head_old %p head_new %p dest.off 0x%016" PRIx64
" before %d oid.off 0x%016" PRIx64 "",
pop, pe_old_offset, pe_new_offset,
head_old, head_new, dest.off, before, oid.off);

Expand Down
11 changes: 7 additions & 4 deletions src/libpmemobj/redo.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@
* redo.c -- redo log implementation
*/

#include <inttypes.h>

#include "redo.h"
#include "out.h"
#include "util.h"
Expand Down Expand Up @@ -116,7 +118,7 @@ void
redo_log_store(const struct redo_ctx *ctx, struct redo_log *redo, size_t index,
uint64_t offset, uint64_t value)
{
LOG(15, "redo %p index %zu offset %ju value %ju",
LOG(15, "redo %p index %zu offset %" PRIu64 " value %" PRIu64,
redo, index, offset, value);

ASSERTeq(offset & REDO_FINISH_FLAG, 0);
Expand All @@ -133,7 +135,7 @@ void
redo_log_store_last(const struct redo_ctx *ctx, struct redo_log *redo,
size_t index, uint64_t offset, uint64_t value)
{
LOG(15, "redo %p index %zu offset %ju value %ju",
LOG(15, "redo %p index %zu offset %" PRIu64 " value %" PRIu64,
redo, index, offset, value);

ASSERTeq(offset & REDO_FINISH_FLAG, 0);
Expand Down Expand Up @@ -251,7 +253,7 @@ redo_log_check(const struct redo_ctx *ctx, struct redo_log *redo,

while ((redo->offset & REDO_FINISH_FLAG) == 0) {
if (!ctx->check_offset(cctx, redo->offset)) {
LOG(15, "redo %p invalid offset %ju",
LOG(15, "redo %p invalid offset %" PRIu64,
redo, redo->offset);
return -1;
}
Expand All @@ -260,7 +262,8 @@ redo_log_check(const struct redo_ctx *ctx, struct redo_log *redo,

uint64_t offset = redo->offset & REDO_FLAG_MASK;
if (!ctx->check_offset(cctx, offset)) {
LOG(15, "redo %p invalid offset %ju", redo, offset);
LOG(15, "redo %p invalid offset %" PRIu64,
redo, offset);
return -1;
}
}
Expand Down
6 changes: 4 additions & 2 deletions src/libpmemobj/sync.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@
* sync.c -- persistent memory resident synchronization primitives
*/

#include <inttypes.h>

#include "obj.h"
#include "out.h"
#include "util.h"
Expand Down Expand Up @@ -70,8 +72,8 @@ static void *
_get_lock(uint64_t pop_runid, volatile uint64_t *runid, void *lock,
int (*init_lock)(void *lock, void *arg), size_t size)
{
LOG(15, "pop_runid %ju runid %ju lock %p init_lock %p", pop_runid,
*runid, lock, init_lock);
LOG(15, "pop_runid %" PRIu64 " runid %" PRIu64 " lock %p init_lock %p",
pop_runid, *runid, lock, init_lock);

ASSERTeq((uintptr_t)runid % util_alignof(uint64_t), 0);

Expand Down

0 comments on commit 4f9c9c7

Please sign in to comment.