More or less working acquire system

[ntk/apt.git] / apt-pkg / acquire-worker.cc

diff --git a/apt-pkg/acquire-worker.cc b/apt-pkg/acquire-worker.cc
index 936d469..718944d 100644 (file)
--- a/apt-pkg/acquire-worker.cc
+++ b/apt-pkg/acquire-worker.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
-// $Id: acquire-worker.cc,v 1.6 1998/10/24 04:57:58 jgg Exp $
+// $Id: acquire-worker.cc,v 1.11 1998/11/09 01:09:23 jgg Exp $
 /* ######################################################################
 
    Acquire Worker 
@@ -22,6 +22,7 @@
 #include <apt-pkg/fileutl.h>
 #include <strutl.h>
 
+#include <sys/stat.h>
 #include <unistd.h>
 #include <signal.h>
 #include <wait.h>
@@ -30,7 +31,8 @@
 // Worker::Worker - Constructor for Queue startup                      /*{{{*/
 // ---------------------------------------------------------------------
 /* */
-pkgAcquire::Worker::Worker(Queue *Q,MethodConfig *Cnf)
+pkgAcquire::Worker::Worker(Queue *Q,MethodConfig *Cnf,
+                          pkgAcquireStatus *Log) : Log(Log)
 {
    OwnerQ = Q;
    Config = Cnf;
@@ -106,7 +108,9 @@ bool pkgAcquire::Worker::Start()
         close(Pipes[I]);
       return false;
    }
-      
+   for (int I = 0; I != 4; I++)
+      SetCloseExec(Pipes[0],true);
+   
    // Fork off the process
    Process = fork();
    if (Process < 0)
@@ -122,8 +126,6 @@ bool pkgAcquire::Worker::Start()
       dup2(Pipes[1],STDOUT_FILENO);
       dup2(Pipes[2],STDIN_FILENO);
       dup2(((filebuf *)clog.rdbuf())->fd(),STDERR_FILENO);
-      for (int I = 0; I != 4; I++)
-        close(Pipes[I]);
       SetCloseExec(STDOUT_FILENO,false);
       SetCloseExec(STDIN_FILENO,false);      
       SetCloseExec(STDERR_FILENO,false);
@@ -152,7 +154,8 @@ bool pkgAcquire::Worker::Start()
       return _error->Error("Method %s did not start correctly",Method.c_str());
 
    RunMessages();
-   SendConfiguration();
+   if (OwnerQ != 0)
+      SendConfiguration();
    
    return true;
 }
@@ -191,7 +194,7 @@ bool pkgAcquire::Worker::RunMessages()
       pkgAcquire::Queue::QItem *Itm = 0;
       if (URI.empty() == false)
         Itm = OwnerQ->FindItem(URI,this);
-        
+      
       // Determine the message number and dispatch
       switch (Number)
       {
@@ -217,13 +220,18 @@ bool pkgAcquire::Worker::RunMessages()
         {
            if (Itm == 0)
            {
-              _error->Warning("Method gave invalid 200 URI Start message");
+              _error->Error("Method gave invalid 200 URI Start message");
               break;
            }
+           
            CurrentItem = Itm;
            CurrentSize = 0;
            TotalSize = atoi(LookupTag(Message,"Size","0").c_str());
+           Itm->Owner->Start(Message,atoi(LookupTag(Message,"Size","0").c_str()));
            
+           if (Log != 0)
+              Log->Fetch(*Itm);
+
            break;
         }
         
@@ -232,13 +240,26 @@ bool pkgAcquire::Worker::RunMessages()
         {
            if (Itm == 0)
            {
-              _error->Warning("Method gave invalid 400 URI Failure message");
+              _error->Error("Method gave invalid 201 URI Done message");
               break;
            }
 
-           Itm->Owner->Done(Message,atoi(LookupTag(Message,"Size","0").c_str()),
-                                         LookupTag(Message,"MD5-Hash"));
+           pkgAcquire::Item *Owner = Itm->Owner;
+           pkgAcquire::ItemDesc Desc = *Itm;
            OwnerQ->ItemDone(Itm);
+           Owner->Done(Message,atoi(LookupTag(Message,"Size","0").c_str()),
+                                         LookupTag(Message,"MD5-Hash"));
+           ItemDone();
+           
+           // Log that we are done
+           if (Log != 0)
+           {
+              if (StringToBool(LookupTag(Message,"IMS-Hit"),false) == true ||
+                  StringToBool(LookupTag(Message,"Alt-IMS-Hit"),false) == true)
+                 Log->IMSHit(Desc);
+              else
+                 Log->Done(Desc);
+           }       
            break;
         }       
         
@@ -247,12 +268,19 @@ bool pkgAcquire::Worker::RunMessages()
         {
            if (Itm == 0)
            {
-              _error->Warning("Method gave invalid 400 URI Failure message");
+              _error->Error("Method gave invalid 400 URI Failure message");
               break;
            }
 
-           Itm->Owner->Failed(Message);
+           pkgAcquire::Item *Owner = Itm->Owner;
+           pkgAcquire::ItemDesc Desc = *Itm;
            OwnerQ->ItemDone(Itm);
+           Owner->Failed(Message);
+           ItemDone();
+           
+           if (Log != 0)
+              Log->Fail(Desc);
+           
            break;
         }       
         
@@ -416,3 +444,29 @@ bool pkgAcquire::Worker::MethodFailure()
    return false;
 }
                                                                        /*}}}*/
+// Worker::Pulse - Called periodically                                         /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+void pkgAcquire::Worker::Pulse()
+{
+   if (CurrentItem == 0)
+      return;
+
+   
+   struct stat Buf;
+   if (stat(CurrentItem->Owner->DestFile.c_str(),&Buf) != 0)
+      return;
+   CurrentSize = Buf.st_size;
+}
+                                                                       /*}}}*/
+// Worker::ItemDone - Called when the current item is finished         /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+void pkgAcquire::Worker::ItemDone()
+{
+   CurrentItem = 0;
+   CurrentSize = 0;
+   TotalSize = 0;
+   Status = string();
+}
+                                                                       /*}}}*/