* merge lp:~mvo/apt/netrc branch, this adds support for a

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

diff --git a/apt-pkg/contrib/mmap.cc b/apt-pkg/contrib/mmap.cc
index 073bc9eb3e877f036f9910cf6c1860b138714cb6..4d5fcf71e67c5bdda2ddf504cf9c39c90d0d1ed9 100644 (file)
--- a/apt-pkg/contrib/mmap.cc
+++ b/apt-pkg/contrib/mmap.cc
@@ -26,6 +26,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <unistd.h>
 #include <fcntl.h>

+#include <stdlib.h>

 
 #include <cstring>
                                                                        /*}}}*/
 
 #include <cstring>
                                                                        /*}}}*/


@@ -139,7 +140,7 @@ bool MMap::Sync(unsigned long Start,unsigned long Stop)
 // DynamicMMap::DynamicMMap - Constructor                              /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // DynamicMMap::DynamicMMap - Constructor                              /*{{{*/
 // ---------------------------------------------------------------------
 /* */

-DynamicMMap::DynamicMMap(FileFd &F,unsigned long Flags,unsigned long WorkSpace) : 
+DynamicMMap::DynamicMMap(FileFd &F,unsigned long Flags,unsigned long WorkSpace) :

              MMap(F,Flags | NoImmMap), Fd(&F), WorkSpace(WorkSpace)
 {
    if (_error->PendingError() == true)
              MMap(F,Flags | NoImmMap), Fd(&F), WorkSpace(WorkSpace)
 {
    if (_error->PendingError() == true)


@@ -171,15 +172,24 @@ DynamicMMap::DynamicMMap(unsigned long Flags,unsigned long WorkSpace) :
       return;
 
 #ifdef _POSIX_MAPPED_FILES
       return;
 
 #ifdef _POSIX_MAPPED_FILES

+   // Set the permissions.
+   int Prot = PROT_READ;
+   int Map = MAP_PRIVATE | MAP_ANONYMOUS;
+   if ((Flags & ReadOnly) != ReadOnly)
+      Prot |= PROT_WRITE;
+   if ((Flags & Public) == Public)
+      Map = MAP_SHARED | MAP_ANONYMOUS;
+

    // use anonymous mmap() to get the memory
    // use anonymous mmap() to get the memory

-   Base = (unsigned char*) mmap(0, WorkSpace, PROT_READ|PROT_WRITE,
-                       MAP_ANONYMOUS|MAP_PRIVATE, -1, 0);
-   if(Base != MAP_FAILED)
-      return;
-#endif
+   Base = (unsigned char*) mmap(0, WorkSpace, Prot, Map, -1, 0);
+
+   if(Base == MAP_FAILED)
+      _error->Errno("DynamicMMap",_("Couldn't make mmap of %lu bytes"),WorkSpace);
+#else

    // fallback to a static allocated space
    Base = new unsigned char[WorkSpace];
    memset(Base,0,WorkSpace);
    // fallback to a static allocated space
    Base = new unsigned char[WorkSpace];
    memset(Base,0,WorkSpace);

+#endif

    iSize = 0;
 }
                                                                        /*}}}*/
    iSize = 0;
 }
                                                                        /*}}}*/


@@ -213,9 +223,9 @@ unsigned long DynamicMMap::RawAllocate(unsigned long Size,unsigned long Aln)
    unsigned long Result = iSize;
    if (Aln != 0)
       Result += Aln - (iSize%Aln);
    unsigned long Result = iSize;
    if (Aln != 0)
       Result += Aln - (iSize%Aln);

-   
+

    iSize = Result + Size;
    iSize = Result + Size;

-   
+

    // try to grow the buffer
    while(Result + Size > WorkSpace)
    {
    // try to grow the buffer
    while(Result + Size > WorkSpace)
    {


@@ -234,7 +244,7 @@ unsigned long DynamicMMap::RawAllocate(unsigned long Size,unsigned long Aln)
 /* This allocates an Item of size ItemSize so that it is aligned to its
    size in the file. */
 unsigned long DynamicMMap::Allocate(unsigned long ItemSize)
 /* This allocates an Item of size ItemSize so that it is aligned to its
    size in the file. */
 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;


@@ -259,17 +269,24 @@ unsigned long DynamicMMap::Allocate(unsigned long ItemSize)
       I->ItemSize = ItemSize;
       I->Count = 0;
    }
       I->ItemSize = ItemSize;
       I->Count = 0;
    }

-   
+
+   unsigned long Result = 0;

    // Out of space, allocate some more
    if (I->Count == 0)
    {
    // Out of space, allocate some more
    if (I->Count == 0)
    {

-      I->Count = 20*1024/ItemSize;
-      I->Start = RawAllocate(I->Count*ItemSize,ItemSize);
-   }   
+      const unsigned long size = 20*1024;
+      I->Count = size/ItemSize;
+      Result = RawAllocate(size,ItemSize);
+      // Does the allocation failed ?
+      if (Result == 0 && _error->PendingError())
+        return 0;
+      I->Start = Result;
+   }
+   else
+      Result = I->Start;

 
    I->Count--;
 
    I->Count--;

-   unsigned long Result = I->Start;
-   I->Start += ItemSize;  
+   I->Start += ItemSize;

    return Result/ItemSize;
 }
                                                                        /*}}}*/
    return Result/ItemSize;
 }
                                                                        /*}}}*/


@@ -279,21 +296,14 @@ unsigned long DynamicMMap::Allocate(unsigned long ItemSize)
 unsigned long DynamicMMap::WriteString(const char *String,
                                       unsigned long Len)
 {
 unsigned long DynamicMMap::WriteString(const char *String,
                                       unsigned long Len)
 {

-   unsigned long Result = iSize;
-   // try to grow the buffer
-   while(Result + Len > WorkSpace)
-   {
-      if(!Grow())
-      {
-        _error->Error(_("Dynamic MMap ran out of room. Please increase the size "
-                        "of APT::Cache-Limit. Current value: %lu. (man 5 apt.conf)"), WorkSpace);
-        return 0;
-      }
-   }
-

    if (Len == (unsigned long)-1)
       Len = strlen(String);
    if (Len == (unsigned long)-1)
       Len = strlen(String);

-   iSize += Len + 1;
+
+   unsigned long Result = RawAllocate(Len+1,0);
+
+   if (Result == 0 && _error->PendingError())
+      return 0;
+

    memcpy((char *)Base + Result,String,Len);
    ((char *)Base)[Result + Len] = 0;
    return Result;
    memcpy((char *)Base + Result,String,Len);
    ((char *)Base)[Result + Len] = 0;
    return Result;


@@ -307,7 +317,7 @@ unsigned long DynamicMMap::WriteString(const char *String,
    but why we should not at least try to grow it before we give up? */
 bool DynamicMMap::Grow()
 {
    but why we should not at least try to grow it before we give up? */
 bool DynamicMMap::Grow()
 {

-#ifdef _POSIX_MAPPED_FILES
+#if defined(_POSIX_MAPPED_FILES) && defined(__linux__)

    unsigned long newSize = WorkSpace + 1024*1024;
 
    if(Fd != 0)
    unsigned long newSize = WorkSpace + 1024*1024;
 
    if(Fd != 0)