merge patch from Daniel Hartwig to Show a error message if {,dist-}upgrade is used...

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

diff --git a/apt-pkg/contrib/mmap.cc b/apt-pkg/contrib/mmap.cc
index 131cefd6e35b00cf92ead450dd81d18a4c43ef6a..a176da6368fcb97562968775305c173b30c13c85 100644 (file)
--- a/apt-pkg/contrib/mmap.cc
+++ b/apt-pkg/contrib/mmap.cc
@@ -102,6 +102,7 @@ bool MMap::Map(FileFd &Fd)
         {
            // for readonly, we don't need sync, so make it simple
            Base = malloc(iSize);
         {
            // for readonly, we don't need sync, so make it simple
            Base = malloc(iSize);

+           SyncToFd = new FileFd();

            return Fd.Read(Base, iSize);
         }
         // FIXME: Writing to compressed fd's ?
            return Fd.Read(Base, iSize);
         }
         // FIXME: Writing to compressed fd's ?


@@ -155,11 +156,10 @@ bool MMap::Close(bool DoSync)
 /* This is done in syncronous mode - the docs indicate that this will 
    not return till all IO is complete */
 bool MMap::Sync()
 /* This is done in syncronous mode - the docs indicate that this will 
    not return till all IO is complete */
 bool MMap::Sync()

-{   
+{

    if ((Flags & UnMapped) == UnMapped)
       return true;
    if ((Flags & UnMapped) == UnMapped)
       return true;

-   
-#ifdef _POSIX_SYNCHRONIZED_IO   
+

    if ((Flags & ReadOnly) != ReadOnly)
    {
       if (SyncToFd != NULL)
    if ((Flags & ReadOnly) != ReadOnly)
    {
       if (SyncToFd != NULL)


@@ -169,11 +169,12 @@ bool MMap::Sync()
       }
       else
       {
       }
       else
       {

+#ifdef _POSIX_SYNCHRONIZED_IO

         if (msync((char *)Base, iSize, MS_SYNC) < 0)
            return _error->Errno("msync", _("Unable to synchronize mmap"));
         if (msync((char *)Base, iSize, MS_SYNC) < 0)
            return _error->Errno("msync", _("Unable to synchronize mmap"));

+#endif

       }
    }
       }
    }

-#endif   

    return true;
 }
                                                                        /*}}}*/
    return true;
 }
                                                                        /*}}}*/


@@ -184,9 +185,7 @@ bool MMap::Sync(unsigned long Start,unsigned long Stop)
 {
    if ((Flags & UnMapped) == UnMapped)
       return true;
 {
    if ((Flags & UnMapped) == UnMapped)
       return true;

-   
-#ifdef _POSIX_SYNCHRONIZED_IO
-   unsigned long long PSize = sysconf(_SC_PAGESIZE);
+

    if ((Flags & ReadOnly) != ReadOnly)
    {
       if (SyncToFd != 0)
    if ((Flags & ReadOnly) != ReadOnly)
    {
       if (SyncToFd != 0)


@@ -197,11 +196,13 @@ bool MMap::Sync(unsigned long Start,unsigned long Stop)
       }
       else
       {
       }
       else
       {

+#ifdef _POSIX_SYNCHRONIZED_IO
+        unsigned long long const PSize = sysconf(_SC_PAGESIZE);

         if (msync((char *)Base+(unsigned long long)(Start/PSize)*PSize,Stop - Start,MS_SYNC) < 0)
            return _error->Errno("msync", _("Unable to synchronize mmap"));
         if (msync((char *)Base+(unsigned long long)(Start/PSize)*PSize,Stop - Start,MS_SYNC) < 0)
            return _error->Errno("msync", _("Unable to synchronize mmap"));

+#endif

       }
    }
       }
    }

-#endif   

    return true;
 }
                                                                        /*}}}*/
    return true;
 }
                                                                        /*}}}*/


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

-   
+
+   // disable Moveable if we don't grow
+   if (Grow == 0)
+      this->Flags &= ~Moveable;
+
+#ifndef __linux__
+   // kfreebsd doesn't have mremap, so we use the fallback
+   if ((this->Flags & Moveable) == Moveable)
+      this->Flags |= Fallback;
+#endif
+

    unsigned long long EndOfFile = Fd->Size();
    if (EndOfFile > WorkSpace)
       WorkSpace = EndOfFile;
    unsigned long long EndOfFile = Fd->Size();
    if (EndOfFile > WorkSpace)
       WorkSpace = EndOfFile;


@@ -328,7 +339,7 @@ unsigned long DynamicMMap::RawAllocate(unsigned long long Size,unsigned long Aln
       if(!Grow())
       {
         _error->Fatal(_("Dynamic MMap ran out of room. Please increase the size "
       if(!Grow())
       {
         _error->Fatal(_("Dynamic MMap ran out of room. Please increase the size "

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

         return 0;
       }
    }
         return 0;
       }
    }


@@ -463,6 +474,9 @@ bool DynamicMMap::Grow() {
                Base = realloc(Base, newSize);
                if (Base == NULL)
                        return false;
                Base = realloc(Base, newSize);
                if (Base == NULL)
                        return false;

+               else
+                       /* Set new memory to 0 */
+                       memset((char*)Base + WorkSpace, 0, newSize - WorkSpace);

        }
 
        Pools =(Pool*) Base + poolOffset;
        }
 
        Pools =(Pool*) Base + poolOffset;