SERVER-13635: pull out MAdvise interface, prove capped collection can compile in unit test

3 files changed, 29 insertions, 0 deletions

diff --git a/src/mongo/db/storage/extent_manager.h b/src/mongo/db/storage/extent_manager.h
index f4bb4c1a8c5..6b8c997dfce 100644
--- a/src/mongo/db/storage/extent_manager.h
+++ b/src/mongo/db/storage/extent_manager.h
@@ -146,6 +146,13 @@ namespace mongo {
          * quantizes extent size to >= min + page boundary
          */
         virtual int quantizeExtentSize( int size ) const;
+
+        enum HintType { Sequential, Random };
+        class CacheHint {
+        public:
+            virtual ~CacheHint(){}
+        };
+        virtual CacheHint* cacheHint( const DiskLoc& extentLoc, const HintType& hint ) = 0;
     };
 
 }
diff --git a/src/mongo/db/storage/mmap_v1/mmap_v1_extent_manager.cpp b/src/mongo/db/storage/mmap_v1/mmap_v1_extent_manager.cpp
index 1073ba4e746..84bfae056e7 100644
--- a/src/mongo/db/storage/mmap_v1/mmap_v1_extent_manager.cpp
+++ b/src/mongo/db/storage/mmap_v1/mmap_v1_extent_manager.cpp
@@ -532,5 +532,24 @@ namespace mongo {
         log() << "end freelist" << endl;
     }
 
+    namespace {
+        class CacheHintMadvise : public ExtentManager::CacheHint {
+        public:
+            CacheHintMadvise(void *p, unsigned len, MAdvise::Advice a)
+                : _advice( p, len, a ) {
+            }
+        private:
+            MAdvise _advice;
+        };
+    }
+
+    ExtentManager::CacheHint* MmapV1ExtentManager::cacheHint( const DiskLoc& extentLoc,
+                                                              const ExtentManager::HintType& hint ) {
+        invariant ( hint == Sequential );
+        Extent* e = getExtent( extentLoc );
+        return new CacheHintMadvise( reinterpret_cast<void*>( e ),
+                                     e->length,
+                                     MAdvise::Sequential );
+    }
 
 }
diff --git a/src/mongo/db/storage/mmap_v1/mmap_v1_extent_manager.h b/src/mongo/db/storage/mmap_v1/mmap_v1_extent_manager.h
index 8c5f4bb656d..c045a075df4 100644
--- a/src/mongo/db/storage/mmap_v1/mmap_v1_extent_manager.h
+++ b/src/mongo/db/storage/mmap_v1/mmap_v1_extent_manager.h
@@ -145,6 +145,9 @@ namespace mongo {
 
         virtual int maxSize() const;
 
+
+        virtual CacheHint* cacheHint( const DiskLoc& extentLoc, const HintType& hint );
+
     private:
 
         /**