diff options
| author | Justus Winter <4winter@informatik.uni-hamburg.de> | 2015-11-12 23:33:35 +0100 |
|---|---|---|
| committer | Justus Winter <4winter@informatik.uni-hamburg.de> | 2015-11-29 23:59:48 +0100 |
| commit | fe9ece07747eb7281e0749a3dde7c02267af8ae6 (patch) | |
| tree | 5b6725d0aeefde998b7e6d7c22ba09b5ab94b523 /ext2fs | |
| parent | 1b6d78a1a79afe79a71841d914a4e49d6eb9100c (diff) | |
ext2fs: disable block cache debugging by default
* ext2fs/ext2fs.h: Disable block cache debugging by default.
* ext2fs/pager.c: Likewise.
Diffstat (limited to 'ext2fs')
| -rw-r--r-- | ext2fs/ext2fs.h | 4 | ||||
| -rw-r--r-- | ext2fs/pager.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/ext2fs/ext2fs.h b/ext2fs/ext2fs.h index 42717c52..0b6b79ef 100644 --- a/ext2fs/ext2fs.h +++ b/ext2fs/ext2fs.h @@ -244,7 +244,7 @@ extern int disk_cache_blocks; #define DC_NO_BLOCK ((block_t) -1L) -#ifndef NDEBUG +#ifdef DEBUG_DISK_CACHE #define DISK_CACHE_LAST_READ_XOR 0xDEADBEEF #endif @@ -254,7 +254,7 @@ struct disk_cache_info block_t block; uint16_t flags; uint16_t ref_count; -#ifndef NDEBUG +#ifdef DEBUG_DISK_CACHE block_t last_read, last_read_xor; #endif }; diff --git a/ext2fs/pager.c b/ext2fs/pager.c index 2528856b..f28bcabc 100644 --- a/ext2fs/pager.c +++ b/ext2fs/pager.c @@ -433,7 +433,7 @@ disk_pager_read_page (vm_offset_t page, void **buf, int *writelock) + offset % block_size; disk_cache_info[index].flags |= DC_INCORE; disk_cache_info[index].flags &=~ DC_UNTOUCHED; -#ifndef NDEBUG +#ifdef DEBUG_DISK_CACHE disk_cache_info[index].last_read = disk_cache_info[index].block; disk_cache_info[index].last_read_xor = disk_cache_info[index].block ^ DISK_CACHE_LAST_READ_XOR; @@ -469,7 +469,7 @@ disk_pager_write_page (vm_offset_t page, void *buf) assert (disk_cache_info[index].block != DC_NO_BLOCK); offset = ((store_offset_t) disk_cache_info[index].block << log2_block_size) + offset % block_size; -#ifndef NDEBUG /* Not strictly needed. */ +#ifdef DEBUG_DISK_CACHE /* Not strictly needed. */ assert ((disk_cache_info[index].last_read ^ DISK_CACHE_LAST_READ_XOR) == disk_cache_info[index].last_read_xor); assert (disk_cache_info[index].last_read @@ -873,7 +873,7 @@ disk_cache_init (void) disk_cache_info[i].block = DC_NO_BLOCK; disk_cache_info[i].flags = 0; disk_cache_info[i].ref_count = 0; -#ifndef NDEBUG +#ifdef DEBUG_DISK_CACHE disk_cache_info[i].last_read = DC_NO_BLOCK; disk_cache_info[i].last_read_xor = DC_NO_BLOCK ^ DISK_CACHE_LAST_READ_XOR; |