diff options
| author | Keith Bostic <keith@wiredtiger.com> | 2016-03-27 10:14:52 -0400 |
|---|---|---|
| committer | Keith Bostic <keith@wiredtiger.com> | 2016-03-27 10:14:52 -0400 |
| commit | 5ea3ffb90fbd27f65e632e8f496f1da569b06434 (patch) | |
| tree | 79d5a5983e95d5eaef59c447bd6487cb7a881214 /src/block | |
| parent | 02029a8fb2823104840ae8ab3b970d104983c535 (diff) | |
| download | mongo-5ea3ffb90fbd27f65e632e8f496f1da569b06434.tar.gz | |
WT-2330: in-memory configurations should not create on-disk collection files
Move the Windows mapping handle from the block-manager handle into the WT_FH
handle, private to Windows.
Diffstat (limited to 'src/block')
| -rw-r--r-- | src/block/block_map.c | 11 | ||||
| -rw-r--r-- | src/block/block_mgr.c | 8 |
2 files changed, 8 insertions, 11 deletions
diff --git a/src/block/block_map.c b/src/block/block_map.c index c21ca9cfa19..37895f9892b 100644 --- a/src/block/block_map.c +++ b/src/block/block_map.c @@ -14,8 +14,7 @@ */ int __wt_block_map( - WT_SESSION_IMPL *session, WT_BLOCK *block, void *mapp, size_t *maplenp, - void **mappingcookie) + WT_SESSION_IMPL *session, WT_BLOCK *block, void *mapp, size_t *maplenp) { *(void **)mapp = NULL; *maplenp = 0; @@ -27,7 +26,6 @@ __wt_block_map( */ WT_UNUSED(session); WT_UNUSED(block); - WT_UNUSED(mappingcookie); #else /* Map support is configurable. */ if (!S2C(session)->mmap) @@ -52,7 +50,7 @@ __wt_block_map( * Map the file into memory. * Ignore errors, we'll read the file through the cache if map fails. */ - (void)__wt_mmap(session, block->fh, mapp, maplenp, mappingcookie); + (void)__wt_mmap(session, block->fh, mapp, maplenp); #endif return (0); @@ -64,9 +62,8 @@ __wt_block_map( */ int __wt_block_unmap( - WT_SESSION_IMPL *session, WT_BLOCK *block, void *map, size_t maplen, - void **mappingcookie) + WT_SESSION_IMPL *session, WT_BLOCK *block, void *map, size_t maplen) { /* Unmap the file from memory. */ - return (__wt_munmap(session, block->fh, map, maplen, mappingcookie)); + return (__wt_munmap(session, block->fh, map, maplen)); } diff --git a/src/block/block_mgr.c b/src/block/block_mgr.c index e16b8709d7d..f842fd4d98e 100644 --- a/src/block/block_mgr.c +++ b/src/block/block_mgr.c @@ -102,8 +102,8 @@ __bm_checkpoint_load(WT_BM *bm, WT_SESSION_IMPL *session, * Read-only objects are optionally mapped into memory instead * of being read into cache buffers. */ - WT_RET(__wt_block_map(session, - bm->block, &bm->map, &bm->maplen, &bm->mappingcookie)); + WT_RET(__wt_block_map( + session, bm->block, &bm->map, &bm->maplen)); /* * If this handle is for a checkpoint, that is, read-only, there @@ -148,8 +148,8 @@ __bm_checkpoint_unload(WT_BM *bm, WT_SESSION_IMPL *session) /* Unmap any mapped segment. */ if (bm->map != NULL) - WT_TRET(__wt_block_unmap(session, - bm->block, bm->map, bm->maplen, &bm->mappingcookie)); + WT_TRET(__wt_block_unmap( + session, bm->block, bm->map, bm->maplen)); /* Unload the checkpoint. */ WT_TRET(__wt_block_checkpoint_unload(session, bm->block, !bm->is_live)); |