* apt-pkg/deb/dpkgpm.cc:

[apt.git] / apt-pkg / contrib / mmap.h

diff --git a/apt-pkg/contrib/mmap.h b/apt-pkg/contrib/mmap.h
index e329b167a7dec03de04917ecae887d9503a8e5d2..5ca951204b393ab5c2b20045035b48bd94a43f04 100644 (file)
--- a/apt-pkg/contrib/mmap.h
+++ b/apt-pkg/contrib/mmap.h
@@ -25,9 +25,6 @@
 #ifndef PKGLIB_MMAP_H
 #define PKGLIB_MMAP_H
 
 #ifndef PKGLIB_MMAP_H
 #define PKGLIB_MMAP_H
 

-#ifdef __GNUG__
-#pragma interface "apt-pkg/mmap.h"
-#endif

 
 #include <string>
 #include <apt-pkg/fileutl.h>
 
 #include <string>
 #include <apt-pkg/fileutl.h>


@@ -47,13 +44,18 @@ class MMap
    unsigned long iSize;
    void *Base;
 
    unsigned long iSize;
    void *Base;
 

+   // In case mmap can not be used, we keep a dup of the file
+   // descriptor that should have been mmaped so that we can write to
+   // the file in Sync().
+   FileFd *SyncToFd;
+

    bool Map(FileFd &Fd);
    bool Close(bool DoSync = true);
    
    public:
 
    enum OpenFlags {NoImmMap = (1<<0),Public = (1<<1),ReadOnly = (1<<2),
    bool Map(FileFd &Fd);
    bool Close(bool DoSync = true);
    
    public:
 
    enum OpenFlags {NoImmMap = (1<<0),Public = (1<<1),ReadOnly = (1<<2),

-                   UnMapped = (1<<3)};
+                   UnMapped = (1<<3), Moveable = (1<<4), Fallback = (1 << 5)};

       
    // Simple accessors
    inline operator void *() {return Base;};
       
    // Simple accessors
    inline operator void *() {return Base;};


@@ -85,8 +87,12 @@ class DynamicMMap : public MMap
    
    FileFd *Fd;
    unsigned long WorkSpace;
    
    FileFd *Fd;
    unsigned long WorkSpace;

+   unsigned long const GrowFactor;
+   unsigned long const Limit;

    Pool *Pools;
    unsigned int PoolCount;
    Pool *Pools;
    unsigned int PoolCount;

+
+   bool Grow();

    
    public:
 
    
    public:
 


@@ -97,8 +103,10 @@ class DynamicMMap : public MMap
    inline unsigned long WriteString(const string &S) {return WriteString(S.c_str(),S.length());};
    void UsePools(Pool &P,unsigned int Count) {Pools = &P; PoolCount = Count;};
    
    inline unsigned long WriteString(const string &S) {return WriteString(S.c_str(),S.length());};
    void UsePools(Pool &P,unsigned int Count) {Pools = &P; PoolCount = Count;};
    

-   DynamicMMap(FileFd &F,unsigned long Flags,unsigned long WorkSpace = 2*1024*1024);
-   DynamicMMap(unsigned long Flags,unsigned long WorkSpace = 2*1024*1024);
+   DynamicMMap(FileFd &F,unsigned long Flags,unsigned long const &WorkSpace = 2*1024*1024,
+              unsigned long const &Grow = 1024*1024, unsigned long const &Limit = 0);
+   DynamicMMap(unsigned long Flags,unsigned long const &WorkSpace = 2*1024*1024,
+              unsigned long const &Grow = 1024*1024, unsigned long const &Limit = 0);

    virtual ~DynamicMMap();
 };
 
    virtual ~DynamicMMap();
 };