Item done counters

Author: jgg
Date: 1998-11-23 07:32:19 GMT
Item done counters

diff --git a/apt-pkg/acquire.cc b/apt-pkg/acquire.cc
index 3bd7662fd022fffbe3cb23d7fed4b57d49c9c4d6..f9691df9c4c27e1691a6ae49e92fd891093c32f3 100644 (file)
--- a/apt-pkg/acquire.cc
+++ b/apt-pkg/acquire.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: acquire.cc,v 1.17 1998/11/22 23:37:03 jgg Exp $
+// $Id: acquire.cc,v 1.18 1998/11/23 07:32:19 jgg Exp $

 /* ######################################################################
 
    Acquire - File Acquiration
 /* ######################################################################
 
    Acquire - File Acquiration


@@ -612,6 +612,8 @@ void pkgAcquireStatus::Pulse(pkgAcquire *Owner)
 {
    TotalBytes = 0;
    CurrentBytes = 0;
 {
    TotalBytes = 0;
    CurrentBytes = 0;

+   TotalItems = 0;
+   CurrentItems = 0;

    
    // Compute the total number of bytes to fetch
    unsigned int Unknown = 0;
    
    // Compute the total number of bytes to fetch
    unsigned int Unknown = 0;


@@ -619,6 +621,10 @@ void pkgAcquireStatus::Pulse(pkgAcquire *Owner)
    for (pkgAcquire::Item **I = Owner->ItemsBegin(); I != Owner->ItemsEnd(); 
        I++, Count++)
    {
    for (pkgAcquire::Item **I = Owner->ItemsBegin(); I != Owner->ItemsEnd(); 
        I++, Count++)
    {

+      TotalItems++;
+      if ((*I)->Status == pkgAcquire::Item::StatDone)
+        CurrentItems++;
+      

       // Totally ignore local items
       if ((*I)->Local == true)
         continue;
       // Totally ignore local items
       if ((*I)->Local == true)
         continue;


@@ -685,6 +691,8 @@ void pkgAcquireStatus::Start()
    TotalBytes = 0;
    FetchedBytes = 0;
    ElapsedTime = 0;
    TotalBytes = 0;
    FetchedBytes = 0;
    ElapsedTime = 0;

+   TotalItems = 0;
+   CurrentItems = 0;

 }
                                                                        /*}}}*/
 // AcquireStatus::Stop - Finished downloading                          /*{{{*/
 }
                                                                        /*}}}*/
 // AcquireStatus::Stop - Finished downloading                          /*{{{*/

diff --git a/apt-pkg/acquire.h b/apt-pkg/acquire.h
index acfbb3ead8b0b2093719fbcaafa9189e23ec147d..8bdcb8bb2f518297123f65374a4320f952bb393a 100644 (file)
--- a/apt-pkg/acquire.h
+++ b/apt-pkg/acquire.h
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: acquire.h,v 1.13 1998/11/14 01:39:46 jgg Exp $
+// $Id: acquire.h,v 1.14 1998/11/23 07:32:20 jgg Exp $

 /* ######################################################################
 
    Acquire - File Acquiration
 /* ######################################################################
 
    Acquire - File Acquiration


@@ -199,6 +199,8 @@ class pkgAcquireStatus
    unsigned long TotalBytes;
    unsigned long FetchedBytes;
    unsigned long ElapsedTime;
    unsigned long TotalBytes;
    unsigned long FetchedBytes;
    unsigned long ElapsedTime;

+   unsigned long TotalItems;
+   unsigned long CurrentItems;

    
    public:
 
    
    public:
 

diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
index e437ad7a31c282e2c66f96540dc6bc5d9b4829c0..228e45c48530647a26ff742a0976a4c294607419 100644 (file)
--- a/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: dpkgpm.cc,v 1.3 1998/11/23 07:03:11 jgg Exp $
+// $Id: dpkgpm.cc,v 1.4 1998/11/23 07:32:21 jgg Exp $

 /* ######################################################################
 
    DPKG Package Manager - Provide an interface to dpkg
 /* ######################################################################
 
    DPKG Package Manager - Provide an interface to dpkg


@@ -193,7 +193,7 @@ bool pkgDPkgPM::Go()
         /* No Job Control Stop Env is a magic dpkg var that prevents it
            from using sigstop */
         setenv("DPKG_NO_TSTP","yes",1);
         /* No Job Control Stop Env is a magic dpkg var that prevents it
            from using sigstop */
         setenv("DPKG_NO_TSTP","yes",1);

-        execvp("dpkg",(char **)Args);
+        execvp(Args[0],(char **)Args);

         cerr << "Could not exec dpkg!" << endl;
         exit(100);
       }      
         cerr << "Could not exec dpkg!" << endl;
         exit(100);
       }      

diff --git a/cmdline/acqprogress.cc b/cmdline/acqprogress.cc
index ccc322084e5674fc261fd6dc991ee78216b0da7c..194d3bb565a6a32bcbe1dba6d02cd5ab14d9629d 100644 (file)
--- a/cmdline/acqprogress.cc
+++ b/cmdline/acqprogress.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: acqprogress.cc,v 1.2 1998/11/12 05:30:07 jgg Exp $
+// $Id: acqprogress.cc,v 1.3 1998/11/23 07:32:24 jgg Exp $

 /* ######################################################################
 
    Acquire Progress - Command line progress meter 
 /* ######################################################################
 
    Acquire Progress - Command line progress meter 


@@ -136,8 +136,9 @@ void AcqTextStatus::Pulse(pkgAcquire *Owner)
    char *S = Buffer;
    
    // Put in the percent done
    char *S = Buffer;
    
    // Put in the percent done

-   sprintf(S,"%ld%%",long(double(CurrentBytes*100.0)/double(TotalBytes)));   
-   
+   sprintf(S,"%ld%%",long(double((CurrentBytes + CurrentItems)*100.0)/double(TotalBytes+TotalItems)));
+
+   bool Shown = false;

    for (pkgAcquire::Worker *I = Owner->WorkersBegin(); I != 0;
        I = Owner->WorkerStep(I))
    {
    for (pkgAcquire::Worker *I = Owner->WorkersBegin(); I != 0;
        I = Owner->WorkerStep(I))
    {


@@ -151,6 +152,8 @@ void AcqTextStatus::Pulse(pkgAcquire *Owner)
         continue;
       }
 
         continue;
       }
 

+      Shown = true;
+      

       // Add in the short description
       if (I->CurrentItem->Owner->ID != 0)
         snprintf(S,End-S," [%x %s",I->CurrentItem->Owner->ID,
       // Add in the short description
       if (I->CurrentItem->Owner->ID != 0)
         snprintf(S,End-S," [%x %s",I->CurrentItem->Owner->ID,


@@ -190,6 +193,10 @@ void AcqTextStatus::Pulse(pkgAcquire *Owner)
       snprintf(S,End-S,"]");
    }
 
       snprintf(S,End-S,"]");
    }
 

+   // Show something..
+   if (Shown == false)
+      snprintf(S,End-S," [Working]");
+      

    // Put in the ETA and cps meter
    if (CurrentCPS != 0)
    {      
    // Put in the ETA and cps meter
    if (CurrentCPS != 0)
    {