diff --git a/blockstore_flush.cpp b/blockstore_flush.cpp index 74aea623..63da35d0 100644 --- a/blockstore_flush.cpp +++ b/blockstore_flush.cpp @@ -231,7 +231,7 @@ resume_0: dirty_end->second.journal_sector < bs->journal.used_start)) { #ifdef BLOCKSTORE_DEBUG - printf("Write %lu:%lu v%lu is too new: offset=%08lx\n", cur.oid.inode, cur.oid.stripe, cur.version, dirty_end->second.journal_sector); + printf("Write %lx:%lx v%lu is too new: offset=%08lx\n", cur.oid.inode, cur.oid.stripe, cur.version, dirty_end->second.journal_sector); #endif flusher->enqueue_flush(cur); } @@ -257,7 +257,7 @@ resume_0: if (repeat_it != flusher->sync_to_repeat.end()) { #ifdef BLOCKSTORE_DEBUG - printf("Postpone %lu:%lu v%lu\n", cur.oid.inode, cur.oid.stripe, cur.version); + printf("Postpone %lx:%lx v%lu\n", cur.oid.inode, cur.oid.stripe, cur.version); #endif // We don't flush different parts of history of the same object in parallel // So we check if someone is already flushing this object @@ -271,7 +271,7 @@ resume_0: else flusher->sync_to_repeat[cur.oid] = 0; #ifdef BLOCKSTORE_DEBUG - printf("Flushing %lu:%lu v%lu\n", cur.oid.inode, cur.oid.stripe, cur.version); + printf("Flushing %lx:%lx v%lu\n", cur.oid.inode, cur.oid.stripe, cur.version); #endif flusher->active_flushers++; resume_1: @@ -299,7 +299,7 @@ resume_1: // Object not allocated. This is a bug. char err[1024]; snprintf( - err, 1024, "BUG: Object %lu:%lu v%lu that we are trying to flush is not allocated on the data device", + err, 1024, "BUG: Object %lx:%lx v%lu that we are trying to flush is not allocated on the data device", cur.oid.inode, cur.oid.stripe, cur.version ); throw std::runtime_error(err); @@ -497,7 +497,7 @@ resume_1: } // All done #ifdef BLOCKSTORE_DEBUG - printf("Flushed %lu:%lu v%lu (%ld left)\n", cur.oid.inode, cur.oid.stripe, cur.version, flusher->flush_queue.size()); + printf("Flushed %lx:%lx v%lu (%ld left)\n", cur.oid.inode, cur.oid.stripe, cur.version, flusher->flush_queue.size()); #endif flusher->active_flushers--; repeat_it = flusher->sync_to_repeat.find(cur.oid); @@ -593,7 +593,7 @@ bool journal_flusher_co::scan_dirty(int wait_base) { char err[1024]; snprintf( - err, 1024, "BUG: Unexpected dirty_entry %lu:%lu v%lu state during flush: %d", + err, 1024, "BUG: Unexpected dirty_entry %lx:%lx v%lu state during flush: %d", dirty_it->first.oid.inode, dirty_it->first.oid.stripe, dirty_it->first.version, dirty_it->second.state ); throw std::runtime_error(err); diff --git a/blockstore_init.cpp b/blockstore_init.cpp index 22f62986..cabd21bd 100644 --- a/blockstore_init.cpp +++ b/blockstore_init.cpp @@ -114,7 +114,7 @@ void blockstore_init_meta::handle_entries(void* entries, unsigned count, int blo } entries_loaded++; #ifdef BLOCKSTORE_DEBUG - printf("Allocate block (clean entry) %lu: %lu:%lu v%lu\n", done_cnt+i, entry->oid.inode, entry->oid.stripe, entry->version); + printf("Allocate block (clean entry) %lu: %lx:%lx v%lu\n", done_cnt+i, entry->oid.inode, entry->oid.stripe, entry->version); #endif bs->data_alloc->set(done_cnt+i, true); bs->clean_db[entry->oid] = (struct clean_entry){ @@ -125,7 +125,7 @@ void blockstore_init_meta::handle_entries(void* entries, unsigned count, int blo else { #ifdef BLOCKSTORE_DEBUG - printf("Old clean entry %lu: %lu:%lu v%lu\n", done_cnt+i, entry->oid.inode, entry->oid.stripe, entry->version); + printf("Old clean entry %lu: %lx:%lx v%lu\n", done_cnt+i, entry->oid.inode, entry->oid.stripe, entry->version); #endif } } @@ -454,7 +454,7 @@ int blockstore_init_journal::handle_journal_part(void *buf, uint64_t done_pos, u { #ifdef BLOCKSTORE_DEBUG printf( - "je_small_write%s oid=%lu:%lu ver=%lu offset=%u len=%u\n", + "je_small_write%s oid=%lx:%lx ver=%lu offset=%u len=%u\n", je->type == JE_SMALL_WRITE_INSTANT ? "_instant" : "", je->small_write.oid.inode, je->small_write.oid.stripe, je->small_write.version, je->small_write.offset, je->small_write.len @@ -539,7 +539,7 @@ int blockstore_init_journal::handle_journal_part(void *buf, uint64_t done_pos, u bs->journal.used_sectors[proc_pos]++; #ifdef BLOCKSTORE_DEBUG printf( - "journal offset %08lx is used by %lu:%lu v%lu (%lu refs)\n", + "journal offset %08lx is used by %lx:%lx v%lu (%lu refs)\n", proc_pos, ov.oid.inode, ov.oid.stripe, ov.version, bs->journal.used_sectors[proc_pos] ); #endif @@ -555,7 +555,7 @@ int blockstore_init_journal::handle_journal_part(void *buf, uint64_t done_pos, u { #ifdef BLOCKSTORE_DEBUG printf( - "je_big_write%s oid=%lu:%lu ver=%lu loc=%lu\n", + "je_big_write%s oid=%lx:%lx ver=%lu loc=%lu\n", je->type == JE_BIG_WRITE_INSTANT ? "_instant" : "", je->big_write.oid.inode, je->big_write.oid.stripe, je->big_write.version, je->big_write.location ); @@ -593,7 +593,7 @@ int blockstore_init_journal::handle_journal_part(void *buf, uint64_t done_pos, u else if (je->type == JE_STABLE) { #ifdef BLOCKSTORE_DEBUG - printf("je_stable oid=%lu:%lu ver=%lu\n", je->stable.oid.inode, je->stable.oid.stripe, je->stable.version); + printf("je_stable oid=%lx:%lx ver=%lu\n", je->stable.oid.inode, je->stable.oid.stripe, je->stable.version); #endif // oid, version obj_ver_id ov = { @@ -605,7 +605,7 @@ int blockstore_init_journal::handle_journal_part(void *buf, uint64_t done_pos, u else if (je->type == JE_ROLLBACK) { #ifdef BLOCKSTORE_DEBUG - printf("je_rollback oid=%lu:%lu ver=%lu\n", je->rollback.oid.inode, je->rollback.oid.stripe, je->rollback.version); + printf("je_rollback oid=%lx:%lx ver=%lu\n", je->rollback.oid.inode, je->rollback.oid.stripe, je->rollback.version); #endif // rollback dirty writes of up to obj_ver_id ov = { @@ -617,7 +617,7 @@ int blockstore_init_journal::handle_journal_part(void *buf, uint64_t done_pos, u else if (je->type == JE_DELETE) { #ifdef BLOCKSTORE_DEBUG - printf("je_delete oid=%lu:%lu ver=%lu\n", je->del.oid.inode, je->del.oid.stripe, je->del.version); + printf("je_delete oid=%lx:%lx ver=%lu\n", je->del.oid.inode, je->del.oid.stripe, je->del.version); #endif auto clean_it = bs->clean_db.find(je->del.oid); if (clean_it == bs->clean_db.end() || diff --git a/blockstore_rollback.cpp b/blockstore_rollback.cpp index c3040d60..b980be86 100644 --- a/blockstore_rollback.cpp +++ b/blockstore_rollback.cpp @@ -230,7 +230,7 @@ void blockstore_impl_t::erase_dirty(blockstore_dirty_db_t::iterator dirty_start, int used = --journal.used_sectors[dirty_it->second.journal_sector]; #ifdef BLOCKSTORE_DEBUG printf( - "remove usage of journal offset %08lx by %lu:%lu v%lu (%d refs)\n", dirty_it->second.journal_sector, + "remove usage of journal offset %08lx by %lx:%lx v%lu (%d refs)\n", dirty_it->second.journal_sector, dirty_it->first.oid.inode, dirty_it->first.oid.stripe, dirty_it->first.version, used ); #endif diff --git a/blockstore_stable.cpp b/blockstore_stable.cpp index 0e1ca8e8..da1e0b2e 100644 --- a/blockstore_stable.cpp +++ b/blockstore_stable.cpp @@ -203,7 +203,7 @@ void blockstore_impl_t::mark_stable(const obj_ver_id & v) } } #ifdef BLOCKSTORE_DEBUG - printf("enqueue_flush %lu:%lu v%lu\n", v.oid.inode, v.oid.stripe, v.version); + printf("enqueue_flush %lx:%lx v%lu\n", v.oid.inode, v.oid.stripe, v.version); #endif flusher->enqueue_flush(v); } diff --git a/blockstore_sync.cpp b/blockstore_sync.cpp index acfb5792..e95911c0 100644 --- a/blockstore_sync.cpp +++ b/blockstore_sync.cpp @@ -136,7 +136,7 @@ int blockstore_impl_t::continue_sync(blockstore_op_t *op) journal.used_sectors[journal.sector_info[journal.cur_sector].offset]++; #ifdef BLOCKSTORE_DEBUG printf( - "journal offset %08lx is used by %lu:%lu v%lu (%lu refs)\n", + "journal offset %08lx is used by %lx:%lx v%lu (%lu refs)\n", dirty_db[*it].journal_sector, it->oid.inode, it->oid.stripe, it->version, journal.used_sectors[journal.sector_info[journal.cur_sector].offset] ); @@ -254,7 +254,7 @@ void blockstore_impl_t::ack_one_sync(blockstore_op_t *op) for (auto it = PRIV(op)->sync_big_writes.begin(); it != PRIV(op)->sync_big_writes.end(); it++) { #ifdef BLOCKSTORE_DEBUG - printf("Ack sync big %lu:%lu v%lu\n", it->oid.inode, it->oid.stripe, it->version); + printf("Ack sync big %lx:%lx v%lu\n", it->oid.inode, it->oid.stripe, it->version); #endif auto & unstab = unstable_writes[it->oid]; unstab = unstab < it->version ? it->version : unstab; @@ -277,7 +277,7 @@ void blockstore_impl_t::ack_one_sync(blockstore_op_t *op) for (auto it = PRIV(op)->sync_small_writes.begin(); it != PRIV(op)->sync_small_writes.end(); it++) { #ifdef BLOCKSTORE_DEBUG - printf("Ack sync small %lu:%lu v%lu\n", it->oid.inode, it->oid.stripe, it->version); + printf("Ack sync small %lx:%lx v%lu\n", it->oid.inode, it->oid.stripe, it->version); #endif auto & unstab = unstable_writes[it->oid]; unstab = unstab < it->version ? it->version : unstab; diff --git a/blockstore_write.cpp b/blockstore_write.cpp index 59997d97..a7ffcd41 100644 --- a/blockstore_write.cpp +++ b/blockstore_write.cpp @@ -65,9 +65,9 @@ bool blockstore_impl_t::enqueue_write(blockstore_op_t *op) } #ifdef BLOCKSTORE_DEBUG if (is_del) - printf("Delete %lu:%lu v%lu\n", op->oid.inode, op->oid.stripe, op->version); + printf("Delete %lx:%lx v%lu\n", op->oid.inode, op->oid.stripe, op->version); else - printf("Write %lu:%lu v%lu offset=%u len=%u\n", op->oid.inode, op->oid.stripe, op->version, op->offset, op->len); + printf("Write %lx:%lx v%lu offset=%u len=%u\n", op->oid.inode, op->oid.stripe, op->version, op->offset, op->len); #endif // No strict need to add it into dirty_db here, it's just left // from the previous implementation where reads waited for writes @@ -220,7 +220,7 @@ int blockstore_impl_t::dequeue_write(blockstore_op_t *op) journal.used_sectors[journal.sector_info[journal.cur_sector].offset]++; #ifdef BLOCKSTORE_DEBUG printf( - "journal offset %08lx is used by %lu:%lu v%lu (%lu refs)\n", + "journal offset %08lx is used by %lx:%lx v%lu (%lu refs)\n", dirty_it->second.journal_sector, dirty_it->first.oid.inode, dirty_it->first.oid.stripe, dirty_it->first.version, journal.used_sectors[journal.sector_info[journal.cur_sector].offset] ); @@ -321,7 +321,7 @@ resume_2: journal.used_sectors[journal.sector_info[journal.cur_sector].offset]++; #ifdef BLOCKSTORE_DEBUG printf( - "journal offset %08lx is used by %lu:%lu v%lu (%lu refs)\n", + "journal offset %08lx is used by %lx:%lx v%lu (%lu refs)\n", journal.sector_info[journal.cur_sector].offset, op->oid.inode, op->oid.stripe, op->version, journal.used_sectors[journal.sector_info[journal.cur_sector].offset] ); @@ -342,7 +342,7 @@ resume_2: resume_4: // Switch object state #ifdef BLOCKSTORE_DEBUG - printf("Ack write %lu:%lu v%lu = %d\n", op->oid.inode, op->oid.stripe, op->version, dirty_it->second.state); + printf("Ack write %lx:%lx v%lu = %d\n", op->oid.inode, op->oid.stripe, op->version, dirty_it->second.state); #endif bool imm = (dirty_it->second.state & BS_ST_TYPE_MASK) == BS_ST_BIG_WRITE ? (immediate_commit == IMMEDIATE_ALL) @@ -477,7 +477,7 @@ int blockstore_impl_t::dequeue_del(blockstore_op_t *op) journal.used_sectors[journal.sector_info[journal.cur_sector].offset]++; #ifdef BLOCKSTORE_DEBUG printf( - "journal offset %08lx is used by %lu:%lu v%lu (%lu refs)\n", + "journal offset %08lx is used by %lx:%lx v%lu (%lu refs)\n", dirty_it->second.journal_sector, dirty_it->first.oid.inode, dirty_it->first.oid.stripe, dirty_it->first.version, journal.used_sectors[journal.sector_info[journal.cur_sector].offset] ); diff --git a/dump_journal.cpp b/dump_journal.cpp index 37f86509..78b2a728 100644 --- a/dump_journal.cpp +++ b/dump_journal.cpp @@ -107,7 +107,7 @@ void journal_dump_t::dump_block(void *buf) else if (je->type == JE_SMALL_WRITE || je->type == JE_SMALL_WRITE_INSTANT) { printf( - "je_small_write%s oid=%lu:%lu ver=%lu offset=%u len=%u loc=%08lx", + "je_small_write%s oid=%lx:%lx ver=%lu offset=%u len=%u loc=%08lx", je->type == JE_SMALL_WRITE_INSTANT ? "_instant" : "", je->small_write.oid.inode, je->small_write.oid.stripe, je->small_write.version, je->small_write.offset, je->small_write.len, @@ -143,22 +143,22 @@ void journal_dump_t::dump_block(void *buf) else if (je->type == JE_BIG_WRITE || je->type == JE_BIG_WRITE_INSTANT) { printf( - "je_big_write%s oid=%lu:%lu ver=%lu loc=%08lx\n", + "je_big_write%s oid=%lx:%lx ver=%lu loc=%08lx\n", je->type == JE_BIG_WRITE_INSTANT ? "_instant" : "", je->big_write.oid.inode, je->big_write.oid.stripe, je->big_write.version, je->big_write.location ); } else if (je->type == JE_STABLE) { - printf("je_stable oid=%lu:%lu ver=%lu\n", je->stable.oid.inode, je->stable.oid.stripe, je->stable.version); + printf("je_stable oid=%lx:%lx ver=%lu\n", je->stable.oid.inode, je->stable.oid.stripe, je->stable.version); } else if (je->type == JE_ROLLBACK) { - printf("je_rollback oid=%lu:%lu ver=%lu\n", je->rollback.oid.inode, je->rollback.oid.stripe, je->rollback.version); + printf("je_rollback oid=%lx:%lx ver=%lu\n", je->rollback.oid.inode, je->rollback.oid.stripe, je->rollback.version); } else if (je->type == JE_DELETE) { - printf("je_delete oid=%lu:%lu ver=%lu\n", je->del.oid.inode, je->del.oid.stripe, je->del.version); + printf("je_delete oid=%lx:%lx ver=%lu\n", je->del.oid.inode, je->del.oid.stripe, je->del.version); } pos += je->size; entry++; diff --git a/osd_primary_subops.cpp b/osd_primary_subops.cpp index 9e85057e..12c7471f 100644 --- a/osd_primary_subops.cpp +++ b/osd_primary_subops.cpp @@ -141,7 +141,7 @@ void osd_t::submit_primary_subops(int submit_type, uint64_t op_version, int pg_s }); #ifdef OSD_DEBUG printf( - "Submit %s to local: %lu:%lu v%lu %u-%u\n", wr ? "write" : "read", + "Submit %s to local: %lx:%lx v%lu %u-%u\n", wr ? "write" : "read", op_data->oid.inode, op_data->oid.stripe | stripe_num, op_version, subops[i].bs_op->offset, subops[i].bs_op->len ); @@ -168,7 +168,7 @@ void osd_t::submit_primary_subops(int submit_type, uint64_t op_version, int pg_s }; #ifdef OSD_DEBUG printf( - "Submit %s to osd %lu: %lu:%lu v%lu %u-%u\n", wr ? "write" : "read", role_osd_num, + "Submit %s to osd %lu: %lx:%lx v%lu %u-%u\n", wr ? "write" : "read", role_osd_num, op_data->oid.inode, op_data->oid.stripe | stripe_num, op_version, subops[i].req.sec_rw.offset, subops[i].req.sec_rw.len ); diff --git a/osd_test.cpp b/osd_test.cpp index bba26011..437d04b3 100644 --- a/osd_test.cpp +++ b/osd_test.cpp @@ -208,7 +208,7 @@ uint64_t test_read(int connect_fd, uint64_t inode, uint64_t stripe, uint64_t ver return 0; } free(data); - printf("Read %lu:%lu v%lu = v%lu\n", inode, stripe, version, reply.sec_rw.version); + printf("Read %lx:%lx v%lu = v%lu\n", inode, stripe, version, reply.sec_rw.version); op.hdr.opcode = OSD_OP_SEC_LIST; op.sec_list.list_pg = 1; op.sec_list.pg_count = 1; @@ -232,7 +232,7 @@ uint64_t test_read(int connect_fd, uint64_t inode, uint64_t stripe, uint64_t ver { if (ov[i].oid.inode == inode && (ov[i].oid.stripe & ~(4096-1)) == (stripe & ~(4096-1))) { - printf("list: %lu:%lu v%lu stable=%d\n", ov[i].oid.inode, ov[i].oid.stripe, ov[i].version, i < reply.sec_list.stable_count ? 1 : 0); + printf("list: %lx:%lx v%lu stable=%d\n", ov[i].oid.inode, ov[i].oid.stripe, ov[i].version, i < reply.sec_list.stable_count ? 1 : 0); } } return 0;