improve error reporting in case of errors in combination with zlib

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

diff --git a/apt-pkg/contrib/mmap.cc b/apt-pkg/contrib/mmap.cc
index f440f94898f2a03ec77988af3f0794572d21a2dd..160718ea5ae503caf1848afd63514fbeae0d9a4d 100644 (file)
--- a/apt-pkg/contrib/mmap.cc
+++ b/apt-pkg/contrib/mmap.cc
@@ -17,25 +17,28 @@
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/
 #define _BSD_SOURCE
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/
 #define _BSD_SOURCE

+#include <config.h>
+

 #include <apt-pkg/mmap.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/mmap.h>
 #include <apt-pkg/error.h>

-
-#include <apti18n.h>
+#include <apt-pkg/fileutl.h>

 
 #include <sys/mman.h>
 #include <sys/stat.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <stdlib.h>
 
 #include <sys/mman.h>
 #include <sys/stat.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <stdlib.h>

-
+#include <errno.h>

 #include <cstring>
 #include <cstring>

-                                                                       /*}}}*/
+
+#include <apti18n.h>
+                                                                       /*}}}*/

 
 // MMap::MMap - Constructor                                            /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 MMap::MMap(FileFd &F,unsigned long Flags) : Flags(Flags), iSize(0),
 
 // MMap::MMap - Constructor                                            /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 MMap::MMap(FileFd &F,unsigned long Flags) : Flags(Flags), iSize(0),

-                     Base(0)
+                     Base(0), SyncToFd(NULL)

 {
    if ((Flags & NoImmMap) != NoImmMap)
       Map(F);
 {
    if ((Flags & NoImmMap) != NoImmMap)
       Map(F);


@@ -45,7 +48,7 @@ MMap::MMap(FileFd &F,unsigned long Flags) : Flags(Flags), iSize(0),
 // ---------------------------------------------------------------------
 /* */
 MMap::MMap(unsigned long Flags) : Flags(Flags), iSize(0),
 // ---------------------------------------------------------------------
 /* */
 MMap::MMap(unsigned long Flags) : Flags(Flags), iSize(0),

-                     Base(0)
+                     Base(0), SyncToFd(NULL)

 {
 }
                                                                        /*}}}*/
 {
 }
                                                                        /*}}}*/


@@ -63,7 +66,7 @@ MMap::~MMap()
 bool MMap::Map(FileFd &Fd)
 {
    iSize = Fd.Size();
 bool MMap::Map(FileFd &Fd)
 {
    iSize = Fd.Size();

-   
+

    // Set the permissions.
    int Prot = PROT_READ;
    int Map = MAP_SHARED;
    // Set the permissions.
    int Prot = PROT_READ;
    int Map = MAP_SHARED;


@@ -74,11 +77,46 @@ bool MMap::Map(FileFd &Fd)
    
    if (iSize == 0)
       return _error->Error(_("Can't mmap an empty file"));
    
    if (iSize == 0)
       return _error->Error(_("Can't mmap an empty file"));

-   
+
+   // We can't mmap compressed fd's directly, so we need to read it completely
+   if (Fd.IsCompressed() == true)
+   {
+      if ((Flags & ReadOnly) != ReadOnly)
+        return _error->Error("Compressed file %s can only be mapped readonly", Fd.Name().c_str());
+      Base = new unsigned char[iSize];
+      if (Fd.Seek(0L) == false || Fd.Read(Base, iSize) == false)
+        return _error->Error("Compressed file %s can't be read into mmap", Fd.Name().c_str());
+      return true;
+   }
+

    // Map it.
    Base = mmap(0,iSize,Prot,Map,Fd.Fd(),0);
    if (Base == (void *)-1)
    // Map it.
    Base = mmap(0,iSize,Prot,Map,Fd.Fd(),0);
    if (Base == (void *)-1)

-      return _error->Errno("mmap",_("Couldn't make mmap of %lu bytes"),iSize);
+   {
+      if (errno == ENODEV || errno == EINVAL)
+      {
+        // The filesystem doesn't support this particular kind of mmap.
+        // So we allocate a buffer and read the whole file into it.
+        if ((Flags & ReadOnly) == ReadOnly)
+        {
+           // for readonly, we don't need sync, so make it simple
+           Base = new unsigned char[iSize];
+           return Fd.Read(Base, iSize);
+        }
+        // FIXME: Writing to compressed fd's ?
+        int const dupped_fd = dup(Fd.Fd());
+        if (dupped_fd == -1)
+           return _error->Errno("mmap", _("Couldn't duplicate file descriptor %i"), Fd.Fd());
+
+        Base = new unsigned char[iSize];
+        SyncToFd = new FileFd (dupped_fd);
+        if (!SyncToFd->Seek(0L) || !SyncToFd->Read(Base, iSize))
+           return false;
+      }
+      else
+        return _error->Errno("mmap",_("Couldn't make mmap of %llu bytes"),
+                             iSize);
+     }

 
    return true;
 }
 
    return true;
 }


@@ -88,15 +126,24 @@ bool MMap::Map(FileFd &Fd)
 /* */
 bool MMap::Close(bool DoSync)
 {
 /* */
 bool MMap::Close(bool DoSync)
 {

-   if ((Flags & UnMapped) == UnMapped || Base == 0 || iSize == 0)
+   if ((Flags & UnMapped) == UnMapped || validData() == false || iSize == 0)

       return true;
    
    if (DoSync == true)
       Sync();
       return true;
    
    if (DoSync == true)
       Sync();

-   
-   if (munmap((char *)Base,iSize) != 0)
-      _error->Warning("Unable to munmap");
-   
+
+   if (SyncToFd != NULL)
+   {
+      delete[] (char *)Base;
+      delete SyncToFd;
+      SyncToFd = NULL;
+   }
+   else
+   {
+      if (munmap((char *)Base, iSize) != 0)
+        _error->WarningE("mmap", _("Unable to close mmap"));
+   }
+

    iSize = 0;
    Base = 0;
    return true;
    iSize = 0;
    Base = 0;
    return true;


@@ -113,8 +160,18 @@ bool MMap::Sync()
    
 #ifdef _POSIX_SYNCHRONIZED_IO   
    if ((Flags & ReadOnly) != ReadOnly)
    
 #ifdef _POSIX_SYNCHRONIZED_IO   
    if ((Flags & ReadOnly) != ReadOnly)

-      if (msync((char *)Base,iSize,MS_SYNC) < 0)
-        return _error->Errno("msync","Unable to write mmap");
+   {
+      if (SyncToFd != NULL)
+      {
+        if (!SyncToFd->Seek(0) || !SyncToFd->Write(Base, iSize))
+           return false;
+      }
+      else
+      {
+        if (msync((char *)Base, iSize, MS_SYNC) < 0)
+           return _error->Errno("msync", _("Unable to synchronize mmap"));
+      }
+   }

 #endif   
    return true;
 }
 #endif   
    return true;
 }


@@ -128,10 +185,21 @@ bool MMap::Sync(unsigned long Start,unsigned long Stop)
       return true;
    
 #ifdef _POSIX_SYNCHRONIZED_IO
       return true;
    
 #ifdef _POSIX_SYNCHRONIZED_IO

-   unsigned long PSize = sysconf(_SC_PAGESIZE);
+   unsigned long long PSize = sysconf(_SC_PAGESIZE);

    if ((Flags & ReadOnly) != ReadOnly)
    if ((Flags & ReadOnly) != ReadOnly)

-      if (msync((char *)Base+(int)(Start/PSize)*PSize,Stop - Start,MS_SYNC) < 0)
-        return _error->Errno("msync","Unable to write mmap");
+   {
+      if (SyncToFd != 0)
+      {
+        if (!SyncToFd->Seek(0) ||
+            !SyncToFd->Write (((char *)Base)+Start, Stop-Start))
+           return false;
+      }
+      else
+      {
+        if (msync((char *)Base+(unsigned long long)(Start/PSize)*PSize,Stop - Start,MS_SYNC) < 0)
+           return _error->Errno("msync", _("Unable to synchronize mmap"));
+      }
+   }

 #endif   
    return true;
 }
 #endif   
    return true;
 }


@@ -148,7 +216,7 @@ DynamicMMap::DynamicMMap(FileFd &F,unsigned long Flags,unsigned long const &Work
    if (_error->PendingError() == true)
       return;
    
    if (_error->PendingError() == true)
       return;
    

-   unsigned long EndOfFile = Fd->Size();
+   unsigned long long EndOfFile = Fd->Size();

    if (EndOfFile > WorkSpace)
       WorkSpace = EndOfFile;
    else if(WorkSpace > 0)
    if (EndOfFile > WorkSpace)
       WorkSpace = EndOfFile;
    else if(WorkSpace > 0)


@@ -177,23 +245,31 @@ DynamicMMap::DynamicMMap(unsigned long Flags,unsigned long const &WorkSpace,
 
        // disable Moveable if we don't grow
        if (Grow == 0)
 
        // disable Moveable if we don't grow
        if (Grow == 0)

-               Flags &= ~Moveable;
+               this->Flags &= ~Moveable;

 
 #ifndef __linux__
        // kfreebsd doesn't have mremap, so we use the fallback
 
 #ifndef __linux__
        // kfreebsd doesn't have mremap, so we use the fallback

-       if ((Flags & Moveable) == Moveable)
-               Flags |= Fallback;
+       if ((this->Flags & Moveable) == Moveable)
+               this->Flags |= Fallback;

 #endif
 
 #ifdef _POSIX_MAPPED_FILES
 #endif
 
 #ifdef _POSIX_MAPPED_FILES

-       if ((Flags & Fallback) != Fallback) {
+       if ((this->Flags & Fallback) != Fallback) {

                // Set the permissions.
                int Prot = PROT_READ;
                // Set the permissions.
                int Prot = PROT_READ;

+#ifdef MAP_ANONYMOUS

                int Map = MAP_PRIVATE | MAP_ANONYMOUS;
                int Map = MAP_PRIVATE | MAP_ANONYMOUS;

-               if ((Flags & ReadOnly) != ReadOnly)
+#else
+               int Map = MAP_PRIVATE | MAP_ANON;
+#endif
+               if ((this->Flags & ReadOnly) != ReadOnly)

                        Prot |= PROT_WRITE;
                        Prot |= PROT_WRITE;

-               if ((Flags & Public) == Public)
+               if ((this->Flags & Public) == Public)
+#ifdef MAP_ANONYMOUS

                        Map = MAP_SHARED | MAP_ANONYMOUS;
                        Map = MAP_SHARED | MAP_ANONYMOUS;

+#else
+                       Map = MAP_SHARED | MAP_ANON;
+#endif

 
                // use anonymous mmap() to get the memory
                Base = (unsigned char*) mmap(0, WorkSpace, Prot, Map, -1, 0);
 
                // use anonymous mmap() to get the memory
                Base = (unsigned char*) mmap(0, WorkSpace, Prot, Map, -1, 0);


@@ -218,6 +294,8 @@ DynamicMMap::~DynamicMMap()
 {
    if (Fd == 0)
    {
 {
    if (Fd == 0)
    {

+      if (validData() == false)
+        return;

 #ifdef _POSIX_MAPPED_FILES
       munmap(Base, WorkSpace);
 #else
 #ifdef _POSIX_MAPPED_FILES
       munmap(Base, WorkSpace);
 #else


@@ -226,7 +304,7 @@ DynamicMMap::~DynamicMMap()
       return;
    }
    
       return;
    }
    

-   unsigned long EndOfFile = iSize;
+   unsigned long long EndOfFile = iSize;

    iSize = WorkSpace;
    Close(false);
    if(ftruncate(Fd->Fd(),EndOfFile) < 0)
    iSize = WorkSpace;
    Close(false);
    if(ftruncate(Fd->Fd(),EndOfFile) < 0)


@@ -236,9 +314,9 @@ DynamicMMap::~DynamicMMap()
 // DynamicMMap::RawAllocate - Allocate a raw chunk of unaligned space  /*{{{*/
 // ---------------------------------------------------------------------
 /* This allocates a block of memory aligned to the given size */
 // DynamicMMap::RawAllocate - Allocate a raw chunk of unaligned space  /*{{{*/
 // ---------------------------------------------------------------------
 /* This allocates a block of memory aligned to the given size */

-unsigned long DynamicMMap::RawAllocate(unsigned long Size,unsigned long Aln)
+unsigned long DynamicMMap::RawAllocate(unsigned long long Size,unsigned long Aln)

 {
 {

-   unsigned long Result = iSize;
+   unsigned long long Result = iSize;

    if (Aln != 0)
       Result += Aln - (iSize%Aln);
 
    if (Aln != 0)
       Result += Aln - (iSize%Aln);
 


@@ -249,7 +327,7 @@ unsigned long DynamicMMap::RawAllocate(unsigned long Size,unsigned long Aln)
    {
       if(!Grow())
       {
    {
       if(!Grow())
       {

-        _error->Error(_("Dynamic MMap ran out of room. Please increase the size "
+        _error->Fatal(_("Dynamic MMap ran out of room. Please increase the size "

                         "of APT::Cache-Limit. Current value: %lu. (man 5 apt.conf)"), WorkSpace);
         return 0;
       }
                         "of APT::Cache-Limit. Current value: %lu. (man 5 apt.conf)"), WorkSpace);
         return 0;
       }


@@ -266,7 +344,7 @@ unsigned long DynamicMMap::Allocate(unsigned long ItemSize)
    // Look for a matching pool entry
    Pool *I;
    Pool *Empty = 0;
    // Look for a matching pool entry
    Pool *I;
    Pool *Empty = 0;

-   for (I = Pools; I != Pools + PoolCount; I++)
+   for (I = Pools; I != Pools + PoolCount; ++I)

    {
       if (I->ItemSize == 0)
         Empty = I;
    {
       if (I->ItemSize == 0)
         Empty = I;


@@ -294,7 +372,11 @@ unsigned long DynamicMMap::Allocate(unsigned long ItemSize)
    {
       const unsigned long size = 20*1024;
       I->Count = size/ItemSize;
    {
       const unsigned long size = 20*1024;
       I->Count = size/ItemSize;

+      Pool* oldPools = Pools;

       Result = RawAllocate(size,ItemSize);
       Result = RawAllocate(size,ItemSize);

+      if (Pools != oldPools)
+        I += Pools - oldPools;
+

       // Does the allocation failed ?
       if (Result == 0 && _error->PendingError())
         return 0;
       // Does the allocation failed ?
       if (Result == 0 && _error->PendingError())
         return 0;


@@ -317,7 +399,7 @@ unsigned long DynamicMMap::WriteString(const char *String,
    if (Len == (unsigned long)-1)
       Len = strlen(String);
 
    if (Len == (unsigned long)-1)
       Len = strlen(String);
 

-   unsigned long Result = RawAllocate(Len+1,0);
+   unsigned long const Result = RawAllocate(Len+1,0);

 
    if (Result == 0 && _error->PendingError())
       return 0;
 
    if (Result == 0 && _error->PendingError())
       return 0;


@@ -344,19 +426,25 @@ unsigned long DynamicMMap::WriteString(const char *String,
    the nearly impossible 4 to grow it before it finally give up: Never say never. */
 bool DynamicMMap::Grow() {
        if (Limit != 0 && WorkSpace >= Limit)
    the nearly impossible 4 to grow it before it finally give up: Never say never. */
 bool DynamicMMap::Grow() {
        if (Limit != 0 && WorkSpace >= Limit)

-               return _error->Error(_("The size of a MMap has already reached the defined limit of %lu bytes,"
-                                      "abort the try to grow the MMap."), Limit);
+               return _error->Error(_("Unable to increase the size of the MMap as the "
+                                      "limit of %lu bytes is already reached."), Limit);
+       if (GrowFactor <= 0)
+               return _error->Error(_("Unable to increase size of the MMap as automatic growing is disabled by user."));

 
 

-       unsigned long const newSize = WorkSpace + 1024*1024;
+       unsigned long long const newSize = WorkSpace + GrowFactor;

 
        if(Fd != 0) {
                Fd->Seek(newSize - 1);
                char C = 0;
                Fd->Write(&C,sizeof(C));
        }
 
        if(Fd != 0) {
                Fd->Seek(newSize - 1);
                char C = 0;
                Fd->Write(&C,sizeof(C));
        }

+
+       unsigned long const poolOffset = Pools - ((Pool*) Base);
+

        if ((Flags & Fallback) != Fallback) {
 #if defined(_POSIX_MAPPED_FILES) && defined(__linux__)
    #ifdef MREMAP_MAYMOVE
        if ((Flags & Fallback) != Fallback) {
 #if defined(_POSIX_MAPPED_FILES) && defined(__linux__)
    #ifdef MREMAP_MAYMOVE

+

                if ((Flags & Moveable) == Moveable)
                        Base = mremap(Base, WorkSpace, newSize, MREMAP_MAYMOVE);
                else
                if ((Flags & Moveable) == Moveable)
                        Base = mremap(Base, WorkSpace, newSize, MREMAP_MAYMOVE);
                else


@@ -377,6 +465,7 @@ bool DynamicMMap::Grow() {
                        return false;
        }
 
                        return false;
        }
 

+       Pools =(Pool*) Base + poolOffset;

        WorkSpace = newSize;
        return true;
 }
        WorkSpace = newSize;
        return true;
 }