Clean support

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

diff --git a/apt-pkg/acquire-worker.cc b/apt-pkg/acquire-worker.cc
index 756b309594efebd21d5131ab6e635dee684edb01..099a43e2ec214142ef878d047039cab7f20935a9 100644 (file)
--- a/apt-pkg/acquire-worker.cc
+++ b/apt-pkg/acquire-worker.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: acquire-worker.cc,v 1.4 1998/10/22 04:56:40 jgg Exp $
+// $Id: acquire-worker.cc,v 1.19 1999/01/30 08:08:54 jgg Exp $

 /* ######################################################################
 
    Acquire Worker 
 /* ######################################################################
 
    Acquire Worker 


@@ -20,17 +20,20 @@
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/fileutl.h>

-#include <strutl.h>
+#include <apt-pkg/strutl.h>

 
 

+#include <sys/stat.h>

 #include <unistd.h>
 #include <signal.h>
 #include <wait.h>
 #include <unistd.h>
 #include <signal.h>
 #include <wait.h>

+#include <stdio.h>

                                                                        /*}}}*/
 
 // Worker::Worker - Constructor for Queue startup                      /*{{{*/
 // ---------------------------------------------------------------------
 /* */
                                                                        /*}}}*/
 
 // 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;
 {
    OwnerQ = Q;
    Config = Cnf;


@@ -106,7 +109,9 @@ bool pkgAcquire::Worker::Start()
         close(Pipes[I]);
       return false;
    }
         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)
    // Fork off the process
    Process = fork();
    if (Process < 0)


@@ -122,8 +127,6 @@ bool pkgAcquire::Worker::Start()
       dup2(Pipes[1],STDOUT_FILENO);
       dup2(Pipes[2],STDIN_FILENO);
       dup2(((filebuf *)clog.rdbuf())->fd(),STDERR_FILENO);
       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);
       SetCloseExec(STDOUT_FILENO,false);
       SetCloseExec(STDIN_FILENO,false);      
       SetCloseExec(STDERR_FILENO,false);


@@ -133,7 +136,7 @@ bool pkgAcquire::Worker::Start()
       Args[1] = 0;
       execv(Args[0],(char **)Args);
       cerr << "Failed to exec method " << Args[0] << endl;
       Args[1] = 0;
       execv(Args[0],(char **)Args);
       cerr << "Failed to exec method " << Args[0] << endl;

-      exit(100);
+      _exit(100);

    }
 
    // Fix up our FDs
    }
 
    // Fix up our FDs


@@ -152,7 +155,8 @@ bool pkgAcquire::Worker::Start()
       return _error->Error("Method %s did not start correctly",Method.c_str());
 
    RunMessages();
       return _error->Error("Method %s did not start correctly",Method.c_str());
 
    RunMessages();

-   SendConfiguration();
+   if (OwnerQ != 0)
+      SendConfiguration();

    
    return true;
 }
    
    return true;
 }


@@ -167,7 +171,6 @@ bool pkgAcquire::Worker::ReadMessages()
    return true;
 }
                                                                        /*}}}*/
    return true;
 }
                                                                        /*}}}*/

-

 // Worker::RunMessage - Empty the message queue                                /*{{{*/
 // ---------------------------------------------------------------------
 /* This takes the messages from the message queue and runs them through
 // Worker::RunMessage - Empty the message queue                                /*{{{*/
 // ---------------------------------------------------------------------
 /* This takes the messages from the message queue and runs them through


@@ -188,6 +191,11 @@ bool pkgAcquire::Worker::RunMessages()
       if (End == Message.c_str())
         return _error->Error("Invalid message from method %s: %s",Access.c_str(),Message.c_str());
 
       if (End == Message.c_str())
         return _error->Error("Invalid message from method %s: %s",Access.c_str(),Message.c_str());
 

+      string URI = LookupTag(Message,"URI");
+      pkgAcquire::Queue::QItem *Itm = 0;
+      if (URI.empty() == false)
+        Itm = OwnerQ->FindItem(URI,this);
+      

       // Determine the message number and dispatch
       switch (Number)
       {
       // Determine the message number and dispatch
       switch (Number)
       {


@@ -210,20 +218,87 @@ bool pkgAcquire::Worker::RunMessages()
            
         // 200 URI Start
         case 200:
            
         // 200 URI Start
         case 200:

-        break;
+        {
+           if (Itm == 0)
+           {
+              _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;
+        }

         
         // 201 URI Done
         case 201:
         
         // 201 URI Done
         case 201:

-        break;
+        {
+           if (Itm == 0)
+           {
+              _error->Error("Method gave invalid 201 URI Done message");
+              break;
+           }
+
+           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)
+              {
+                 /* Hide 'hits' for local only sources - we also manage to
+                    hide gets */
+                 if (Config->LocalOnly == false)
+                    Log->IMSHit(Desc);
+              }               
+              else
+                 Log->Done(Desc);
+           }       
+           break;
+        }       

         
         // 400 URI Failure
         case 400:
         
         // 400 URI Failure
         case 400:

-        break;
+        {
+           if (Itm == 0)
+           {
+              _error->Error("Method gave invalid 400 URI Failure message");
+              break;
+           }
+
+           pkgAcquire::Item *Owner = Itm->Owner;
+           pkgAcquire::ItemDesc Desc = *Itm;
+           OwnerQ->ItemDone(Itm);
+           Owner->Failed(Message,Config);
+           ItemDone();
+
+           if (Log != 0)
+              Log->Fail(Desc);
+
+           break;
+        }       

         
         // 401 General Failure
         case 401:
         _error->Error("Method %s General failure: %s",LookupTag(Message,"Message").c_str());
         break;
         
         // 401 General Failure
         case 401:
         _error->Error("Method %s General failure: %s",LookupTag(Message,"Message").c_str());
         break;

+        
+        // 403 Media Change
+        case 403:
+        MediaChange(Message); 
+        break;

       }      
    }
    return true;
       }      
    }
    return true;


@@ -240,20 +315,46 @@ bool pkgAcquire::Worker::Capabilities(string Message)
    
    Config->Version = LookupTag(Message,"Version");
    Config->SingleInstance = StringToBool(LookupTag(Message,"Single-Instance"),false);
    
    Config->Version = LookupTag(Message,"Version");
    Config->SingleInstance = StringToBool(LookupTag(Message,"Single-Instance"),false);

-   Config->PreScan = StringToBool(LookupTag(Message,"Pre-Scan"),false);

    Config->Pipeline = StringToBool(LookupTag(Message,"Pipeline"),false);
    Config->SendConfig = StringToBool(LookupTag(Message,"Send-Config"),false);
    Config->Pipeline = StringToBool(LookupTag(Message,"Pipeline"),false);
    Config->SendConfig = StringToBool(LookupTag(Message,"Send-Config"),false);

+   Config->LocalOnly = StringToBool(LookupTag(Message,"Local-Only"),false);

 
    // Some debug text
    if (Debug == true)
    {
       clog << "Configured access method " << Config->Access << endl;
       clog << "Version:" << Config->Version << " SingleInstance:" <<
 
    // Some debug text
    if (Debug == true)
    {
       clog << "Configured access method " << Config->Access << endl;
       clog << "Version:" << Config->Version << " SingleInstance:" <<

-        Config->SingleInstance << " PreScan: " << Config->PreScan <<
+        Config->SingleInstance << 

         " Pipeline:" << Config->Pipeline << " SendConfig:" << 
         Config->SendConfig << endl;
    }
    
         " Pipeline:" << Config->Pipeline << " SendConfig:" << 
         Config->SendConfig << endl;
    }
    

+   return true;
+}
+                                                                       /*}}}*/
+// Worker::MediaChange - Request a media change                                /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+bool pkgAcquire::Worker::MediaChange(string Message)
+{
+   if (Log == 0 || Log->MediaChange(LookupTag(Message,"Media"),
+                                   LookupTag(Message,"Drive")) == false)
+   {
+      char S[300];
+      sprintf(S,"603 Media Changed\nFailed: true\n\n");
+      if (Debug == true)
+        clog << " -> " << Access << ':' << QuoteString(S,"\n") << endl;
+      OutQueue += S;
+      OutReady = true;
+      return true;
+   }
+
+   char S[300];
+   sprintf(S,"603 Media Changed\n\n");
+   if (Debug == true)
+      clog << " -> " << Access << ':' << QuoteString(S,"\n") << endl;
+   OutQueue += S;
+   OutReady = true;

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


@@ -364,7 +465,8 @@ bool pkgAcquire::Worker::InFdReady()
    read returned -1. */
 bool pkgAcquire::Worker::MethodFailure()
 {
    read returned -1. */
 bool pkgAcquire::Worker::MethodFailure()
 {

-   cerr << "Method " << Access << " has died unexpectedly!" << endl;
+   _error->Error("Method %s has died unexpectedly!",Access.c_str());
+   

    if (waitpid(Process,0,0) != Process)
       _error->Warning("I waited but nothing was there!");
    Process = -1;
    if (waitpid(Process,0,0) != Process)
       _error->Warning("I waited but nothing was there!");
    Process = -1;


@@ -380,3 +482,28 @@ bool pkgAcquire::Worker::MethodFailure()
    return false;
 }
                                                                        /*}}}*/
    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();
+}
+                                                                       /*}}}*/