* debian/apt.cron.daily:

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

diff --git a/apt-pkg/contrib/mmap.cc b/apt-pkg/contrib/mmap.cc
index f8582a1ef40771f927f1056fb31e248de4d633ac..04a45811b63351a5fe00d4d7cd1466fcc88e65de 100644 (file)
--- a/apt-pkg/contrib/mmap.cc
+++ b/apt-pkg/contrib/mmap.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: mmap.cc,v 1.7 1998/07/19 04:42:14 jgg Exp $
+// $Id: mmap.cc,v 1.22 2001/05/27 05:19:30 jgg Exp $

 /* ######################################################################
    
    MMap Class - Provides 'real' mmap or a faked mmap using read().
 /* ######################################################################
    
    MMap Class - Provides 'real' mmap or a faked mmap using read().


@@ -21,29 +21,36 @@
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/

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

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

+#include <apti18n.h>
+

 #include <sys/mman.h>
 #include <sys/stat.h>
 #include <sys/mman.h>
 #include <sys/stat.h>

-#include <sys/user.h>

 #include <unistd.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <fcntl.h>

+
+#include <cstring>

                                                                        /*}}}*/
 
 // MMap::MMap - Constructor                                            /*{{{*/
 // ---------------------------------------------------------------------
 /* */
                                                                        /*}}}*/
 
 // MMap::MMap - Constructor                                            /*{{{*/
 // ---------------------------------------------------------------------
 /* */

-MMap::MMap(FileFd &F,unsigned long Flags) : Fd(F), Flags(Flags), iSize(0),
+MMap::MMap(FileFd &F,unsigned long Flags) : Flags(Flags), iSize(0),

                      Base(0)
 {
    if ((Flags & NoImmMap) != NoImmMap)
                      Base(0)
 {
    if ((Flags & NoImmMap) != NoImmMap)

-      Map();
+      Map(F);
+}
+                                                                       /*}}}*/
+// MMap::MMap - Constructor                                            /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+MMap::MMap(unsigned long Flags) : Flags(Flags), iSize(0),
+                     Base(0)
+{

 }
                                                                        /*}}}*/
 // MMap::~MMap - Destructor                                            /*{{{*/
 }
                                                                        /*}}}*/
 // MMap::~MMap - Destructor                                            /*{{{*/


@@ -51,13 +58,13 @@ MMap::MMap(FileFd &F,unsigned long Flags) : Fd(F), Flags(Flags), iSize(0),
 /* */
 MMap::~MMap()
 {
 /* */
 MMap::~MMap()
 {

-   Close(true);
+   Close();

 }
                                                                        /*}}}*/
 // MMap::Map - Perform the mapping                                     /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 }
                                                                        /*}}}*/
 // MMap::Map - Perform the mapping                                     /*{{{*/
 // ---------------------------------------------------------------------
 /* */

-bool MMap::Map()
+bool MMap::Map(FileFd &Fd)

 {
    iSize = Fd.Size();
    
 {
    iSize = Fd.Size();
    


@@ -69,10 +76,13 @@ bool MMap::Map()
    if ((Flags & Public) != Public)
       Map = MAP_PRIVATE;
    
    if ((Flags & Public) != Public)
       Map = MAP_PRIVATE;
    

+   if (iSize == 0)
+      return _error->Error(_("Can't mmap an empty file"));
+   

    // 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 %u bytes",iSize);
+      return _error->Errno("mmap",_("Couldn't make mmap of %lu bytes"),iSize);

 
    return true;
 }
 
    return true;
 }


@@ -80,11 +90,11 @@ bool MMap::Map()
 // MMap::Close - Close the map                                         /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // MMap::Close - Close the map                                         /*{{{*/
 // ---------------------------------------------------------------------
 /* */

-bool MMap::Close(bool DoClose, bool DoSync)
+bool MMap::Close(bool DoSync)

 {
 {

-   if (Fd.IsOpen() == false)
+   if ((Flags & UnMapped) == UnMapped || Base == 0 || iSize == 0)

       return true;
       return true;

-
+   

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


@@ -92,8 +102,7 @@ bool MMap::Close(bool DoClose, bool DoSync)
       _error->Warning("Unable to munmap");
    
    iSize = 0;
       _error->Warning("Unable to munmap");
    
    iSize = 0;

-   if (DoClose == true)
-      Fd.Close();
+   Base = 0;

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


@@ -103,9 +112,14 @@ bool MMap::Close(bool DoClose, bool DoSync)
    not return till all IO is complete */
 bool MMap::Sync()
 {   
    not return till all IO is complete */
 bool MMap::Sync()
 {   

+   if ((Flags & UnMapped) == UnMapped)
+      return true;
+   
+#ifdef _POSIX_SYNCHRONIZED_IO   

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

-      if (msync((char *)Base,iSize,MS_SYNC) != 0)
-        return _error->Error("msync","Unable to write mmap");
+      if (msync((char *)Base,iSize,MS_SYNC) < 0)
+        return _error->Errno("msync","Unable to write mmap");
+#endif   

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


@@ -114,9 +128,15 @@ bool MMap::Sync()
 /* */
 bool MMap::Sync(unsigned long Start,unsigned long Stop)
 {
 /* */
 bool MMap::Sync(unsigned long Start,unsigned long Stop)
 {

+   if ((Flags & UnMapped) == UnMapped)
+      return true;
+   
+#ifdef _POSIX_SYNCHRONIZED_IO
+   unsigned long PSize = sysconf(_SC_PAGESIZE);

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

-      if (msync((char *)Base+(int)(Start/PAGE_SIZE)*PAGE_SIZE,Stop - Start,MS_SYNC) != 0)
-        return _error->Error("msync","Unable to write mmap");
+      if (msync((char *)Base+(int)(Start/PSize)*PSize,Stop - Start,MS_SYNC) < 0)
+        return _error->Errno("msync","Unable to write mmap");
+#endif   

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


@@ -125,27 +145,55 @@ bool MMap::Sync(unsigned long Start,unsigned long Stop)
 // ---------------------------------------------------------------------
 /* */
 DynamicMMap::DynamicMMap(FileFd &F,unsigned long Flags,unsigned long WorkSpace) : 
 // ---------------------------------------------------------------------
 /* */
 DynamicMMap::DynamicMMap(FileFd &F,unsigned long Flags,unsigned long WorkSpace) : 

-             MMap(F,Flags | NoImmMap), WorkSpace(WorkSpace)
+             MMap(F,Flags | NoImmMap), Fd(&F), WorkSpace(WorkSpace)

 {
 {

-   unsigned long EndOfFile = Fd.Size();
-   Fd.Seek(WorkSpace);
-   char C = 0;
-   Fd.Write(&C,sizeof(C));
-   Map();
+   if (_error->PendingError() == true)
+      return;
+   
+   unsigned long EndOfFile = Fd->Size();
+   if (EndOfFile > WorkSpace)
+      WorkSpace = EndOfFile;
+   else if(WorkSpace > 0)
+   {
+      Fd->Seek(WorkSpace - 1);
+      char C = 0;
+      Fd->Write(&C,sizeof(C));
+   }
+   
+   Map(F);

    iSize = EndOfFile;
 }
                                                                        /*}}}*/
    iSize = EndOfFile;
 }
                                                                        /*}}}*/

+// DynamicMMap::DynamicMMap - Constructor for a non-file backed map    /*{{{*/
+// ---------------------------------------------------------------------
+/* This is just a fancy malloc really.. */
+DynamicMMap::DynamicMMap(unsigned long Flags,unsigned long WorkSpace) :
+             MMap(Flags | NoImmMap | UnMapped), Fd(0), WorkSpace(WorkSpace)
+{
+   if (_error->PendingError() == true)
+      return;
+   
+   Base = new unsigned char[WorkSpace];
+   memset(Base,0,WorkSpace);
+   iSize = 0;
+}
+                                                                       /*}}}*/

 // DynamicMMap::~DynamicMMap - Destructor                              /*{{{*/
 // ---------------------------------------------------------------------
 /* We truncate the file to the size of the memory data set */
 DynamicMMap::~DynamicMMap()
 {
 // DynamicMMap::~DynamicMMap - Destructor                              /*{{{*/
 // ---------------------------------------------------------------------
 /* We truncate the file to the size of the memory data set */
 DynamicMMap::~DynamicMMap()
 {

+   if (Fd == 0)
+   {
+      delete [] (unsigned char *)Base;
+      return;
+   }
+   

    unsigned long EndOfFile = iSize;
    unsigned long EndOfFile = iSize;

-   Sync();

    iSize = WorkSpace;
    iSize = WorkSpace;

-   Close(false,false);
-   ftruncate(Fd.Fd(),EndOfFile);
-   Fd.Close();
+   Close(false);
+   if(ftruncate(Fd->Fd(),EndOfFile) < 0)
+      _error->Errno("ftruncate", _("Failed to truncate file"));

 }  
                                                                        /*}}}*/
 // DynamicMMap::RawAllocate - Allocate a raw chunk of unaligned space  /*{{{*/
 }  
                                                                        /*}}}*/
 // DynamicMMap::RawAllocate - Allocate a raw chunk of unaligned space  /*{{{*/


@@ -160,11 +208,13 @@ unsigned long DynamicMMap::RawAllocate(unsigned long Size,unsigned long Aln)
    iSize = Result + Size;
    
    // Just in case error check
    iSize = Result + Size;
    
    // Just in case error check

-   if (Result > WorkSpace)
+   if (Result + Size > WorkSpace)

    {
    {

-      _error->Error("Dynamic MMap ran out of room");
+         _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;
    }
       return 0;
    }

+

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


@@ -209,7 +259,7 @@ unsigned long DynamicMMap::Allocate(unsigned long ItemSize)
 
    I->Count--;
    unsigned long Result = I->Start;
 
    I->Count--;
    unsigned long Result = I->Start;

-   I->Start += ItemSize;
+   I->Start += ItemSize;  

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


@@ -221,13 +271,14 @@ unsigned long DynamicMMap::WriteString(const char *String,
 {
    unsigned long Result = iSize;
    // Just in case error check
 {
    unsigned long Result = iSize;
    // Just in case error check

-   if (Result > WorkSpace)
+   if (Result + Len > WorkSpace)

    {
    {

-      _error->Error("Dynamic MMap ran out of room");
+         _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;
    }   
    
       return 0;
    }   
    

-   if (Len == 0)
+   if (Len == (unsigned long)-1)

       Len = strlen(String);
    iSize += Len + 1;
    memcpy((char *)Base + Result,String,Len);
       Len = strlen(String);
    iSize += Len + 1;
    memcpy((char *)Base + Result,String,Len);