From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Mon, 16 Jul 2007 16:07:42 +0000 (+0100)
Subject: apt-pkg/deb/dpkgpm.{cc,h}:
X-Git-Tag: 0.7.21~256^2~2
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/76d940371391ac601369ea6b487c87fe65f1fd26

apt-pkg/deb/dpkgpm.{cc,h}:
- merge select() based terminal log
---

76d940371391ac601369ea6b487c87fe65f1fd26
diff --cc apt-pkg/deb/dpkgpm.cc
index 9ca519acd,e78f2dc1c..46a2aaa6a
--- a/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@@ -626,142 -671,136 +671,139 @@@ bool pkgDPkgPM::Go(int OutStatusFd
  	 }
  
  	 // wait for input or output here
- 	 
- 	 // FIXME: use select() instead of the rubish below
- 	 
- 	 // read a single char, make sure that the read can't block 
- 	 // (otherwise we may leave zombies)
-          int term_len = read(master, term_buf, 1);
- 	 int input_len = read(0, input_buf, 1);
-          int len = read(_dpkgin, buf, 1);
- 
- 	 // see if we have any input that needs to go to the 
- 	 // master pty
- 	 if(input_len > 0) 
- 	    write(master, input_buf, 1);
- 
- 	 // see if we have any output that needs to be echoed
- 	 // and written to the log
- 	 if(term_len > 0) 
- 	 {
- 	    do
- 	    {
- 	       fwrite(term_buf, 1, 1, term_out);
- 	       write(1, term_buf, 1);
- 	    } while(read(master, term_buf, 1) > 0);
- 	    term_buf[0] = 0;
- 	 }
- 
- 	 // nothing to read from dpkg , wait a bit for more
- 	 if(len <= 0)
- 	 {
- 	    usleep(1000);
+ 	 FD_ZERO(&rfds);
+ 	 FD_SET(0, &rfds); 
+ 	 FD_SET(_dpkgin, &rfds);
+ 	 FD_SET(master, &rfds);
+ 	 tv.tv_sec = 1;
+ 	 tv.tv_usec = 0;
+ 	 select_ret = select(max(master, _dpkgin)+1, &rfds, NULL, NULL, &tv);
+ 	 if (select_ret < 0)
+ 	    std::cerr << "Error in select()" << std::endl;
+ 	 else if (select_ret == 0)
  	    continue;
- 	 }
  
- 	 // sanity check (should never happen)
- 	 if(strlen(line) >= sizeof(line)-10)
+ 	 if(FD_ISSET(master, &rfds))
+ 	    DoTerminalPty(master, term_out);
+ 	 if(FD_ISSET(0, &rfds))
+ 	    DoStdin(master);
+ 
+ 	 // FIXME: move this into its own function too
++	 // FIXME2: do not use non-blocking read here, 
++	 //         read/process as much data as possible 
++	 //         Yin one run
+ 	 //DoDpkgStatusFd();
+ 	 if(FD_ISSET(_dpkgin, &rfds))
+ 	 while(true)
  	 {
- 	    _error->Error("got a overlong line from dpkg: '%s'",line);
- 	    line[0]=0;
- 	 }
- 	 // append to line, check if we got a complete line
- 	 strcat(line, buf);
- 	 if(buf[0] != '\n')
- 	    continue;
+ 	    if(read(_dpkgin, buf, 1) <= 0)
+ 	       break;
  
- 	 if (_config->FindB("Debug::pkgDPkgProgressReporting",false) == true)
- 	    std::clog << "got from dpkg '" << line << "'" << std::endl;
+ 	    // sanity check (should never happen)
+ 	    if(strlen(line) >= sizeof(line)-10)
+ 	    {
+ 	       _error->Error("got a overlong line from dpkg: '%s'",line);
+ 	       line[0]=0;
+ 	       continue;
+ 	    }
+ 	    // append to line, check if we got a complete line
+ 	    strcat(line, buf);
+ 	    if(buf[0] != '\n')
+ 	       continue;
  
- 	 // the status we output
- 	 ostringstream status;
+ 	    if (_config->FindB("Debug::pkgDPkgProgressReporting",false) == true)
+ 	       std::clog << "got from dpkg '" << line << "'" << std::endl;
  
- 	 /* dpkg sends strings like this:
- 	    'status:   <pkg>:  <pkg  qstate>'
- 	    errors look like this:
- 	    'status: /var/cache/apt/archives/krecipes_0.8.1-0ubuntu1_i386.deb : error : trying to overwrite `/usr/share/doc/kde/HTML/en/krecipes/krectip.png', which is also in package krecipes-data 
- 	    and conffile-prompt like this
- 	    'status: conffile-prompt: conffile : 'current-conffile' 'new-conffile' useredited distedited
+ 	    // the status we output
+ 	    ostringstream status;
+ 
+ 	    /* dpkg sends strings like this:
+ 	       'status:   <pkg>:  <pkg  qstate>'
+ 	       errors look like this:
+ 	       'status: /var/cache/apt/archives/krecipes_0.8.1-0ubuntu1_i386.deb : error : trying to overwrite `/usr/share/doc/kde/HTML/en/krecipes/krectip.png', which is also in package krecipes-data 
+ 	       and conffile-prompt like this
+ 	       'status: conffile-prompt: conffile : 'current-conffile' 'new-conffile' useredited distedited
  	    
- 	 */
- 	 char* list[5];
- 	 //        dpkg sends multiline error messages sometimes (see
- 	 //        #374195 for a example. we should support this by
- 	 //        either patching dpkg to not send multiline over the
- 	 //        statusfd or by rewriting the code here to deal with
- 	 //        it. for now we just ignore it and not crash
- 	 TokSplitString(':', line, list, sizeof(list)/sizeof(list[0]));
- 	 char *pkg = list[1];
- 	 char *action = _strstrip(list[2]);
- 	 if( pkg == NULL || action == NULL) 
- 	 {
- 	    if (_config->FindB("Debug::pkgDPkgProgressReporting",false) == true)
- 	       std::clog << "ignoring line: not enough ':'" << std::endl;
- 	    // reset the line buffer
- 	    line[0]=0;
- 	    continue;
- 	 }
+ 	    */
+ 	    char* list[5];
+ 	    //        dpkg sends multiline error messages sometimes (see
+ 	    //        #374195 for a example. we should support this by
+ 	    //        either patching dpkg to not send multiline over the
+ 	    //        statusfd or by rewriting the code here to deal with
+ 	    //        it. for now we just ignore it and not crash
+ 	    TokSplitString(':', line, list, sizeof(list)/sizeof(list[0]));
+ 	    char *pkg = list[1];
+ 	    char *action = _strstrip(list[2]);
+ 	    if( pkg == NULL || action == NULL) 
+ 	    {
+ 	       if (_config->FindB("Debug::pkgDPkgProgressReporting",false) == true)
+ 		  std::clog << "ignoring line: not enough ':'" << std::endl;
+ 	       // reset the line buffer
+ 	       line[0]=0;
+ 	       continue;
+ 	    }
  
- 	 if(strncmp(action,"error",strlen("error")) == 0)
- 	 {
- 	    status << "pmerror:" << list[1]
- 		   << ":"  << (Done/float(Total)*100.0) 
- 		   << ":" << list[3]
- 		   << endl;
- 	    if(OutStatusFd > 0)
- 	       write(OutStatusFd, status.str().c_str(), status.str().size());
- 	    line[0]=0;
- 	    if (_config->FindB("Debug::pkgDPkgProgressReporting",false) == true)
- 	       std::clog << "send: '" << status.str() << "'" << endl;
- 	    continue;
- 	 }
- 	 if(strncmp(action,"conffile",strlen("conffile")) == 0)
- 	 {
- 	    status << "pmconffile:" << list[1]
- 		   << ":"  << (Done/float(Total)*100.0) 
- 		   << ":" << list[3]
- 		   << endl;
- 	    if(OutStatusFd > 0)
- 	       write(OutStatusFd, status.str().c_str(), status.str().size());
- 	    line[0]=0;
- 	    if (_config->FindB("Debug::pkgDPkgProgressReporting",false) == true)
- 	       std::clog << "send: '" << status.str() << "'" << endl;
- 	    continue;
- 	 }
+ 	    if(strncmp(action,"error",strlen("error")) == 0)
+ 	    {
+ 	       status << "pmerror:" << list[1]
+ 		      << ":"  << (Done/float(Total)*100.0) 
+ 		      << ":" << list[3]
+ 		      << endl;
+ 	       if(OutStatusFd > 0)
+ 		  write(OutStatusFd, status.str().c_str(), status.str().size());
+ 	       line[0]=0;
+ 	       if (_config->FindB("Debug::pkgDPkgProgressReporting",false) == true)
+ 		  std::clog << "send: '" << status.str() << "'" << endl;
+ 	       continue;
+ 	    }
+ 	    if(strncmp(action,"conffile",strlen("conffile")) == 0)
+ 	    {
+ 	       status << "pmconffile:" << list[1]
+ 		      << ":"  << (Done/float(Total)*100.0) 
+ 		      << ":" << list[3]
+ 		      << endl;
+ 	       if(OutStatusFd > 0)
+ 		  write(OutStatusFd, status.str().c_str(), status.str().size());
+ 	       line[0]=0;
+ 	       if (_config->FindB("Debug::pkgDPkgProgressReporting",false) == true)
+ 		  std::clog << "send: '" << status.str() << "'" << endl;
+ 	       continue;
+ 	    }
  
- 	 vector<struct DpkgState> &states = PackageOps[pkg];
- 	 const char *next_action = NULL;
- 	 if(PackageOpsDone[pkg] < states.size())
- 	    next_action = states[PackageOpsDone[pkg]].state;
- 	 // check if the package moved to the next dpkg state
- 	 if(next_action && (strcmp(action, next_action) == 0)) 
- 	 {
- 	    // only read the translation if there is actually a next
- 	    // action
- 	    const char *translation = _(states[PackageOpsDone[pkg]].str);
- 	    char s[200];
- 	    snprintf(s, sizeof(s), translation, pkg);
- 
- 	    // we moved from one dpkg state to a new one, report that
- 	    PackageOpsDone[pkg]++;
- 	    Done++;
- 	    // build the status str
- 	    status << "pmstatus:" << pkg 
- 		   << ":"  << (Done/float(Total)*100.0) 
- 		   << ":" << s
- 		   << endl;
- 	    if(OutStatusFd > 0)
- 	       write(OutStatusFd, status.str().c_str(), status.str().size());
- 	    if (_config->FindB("Debug::pkgDPkgProgressReporting",false) == true)
- 	       std::clog << "send: '" << status.str() << "'" << endl;
+ 	    vector<struct DpkgState> &states = PackageOps[pkg];
+ 	    const char *next_action = NULL;
+ 	    if(PackageOpsDone[pkg] < states.size())
+ 	       next_action = states[PackageOpsDone[pkg]].state;
+ 	    // check if the package moved to the next dpkg state
+ 	    if(next_action && (strcmp(action, next_action) == 0)) 
+ 	    {
+ 	       // only read the translation if there is actually a next
+ 	       // action
+ 	       const char *translation = _(states[PackageOpsDone[pkg]].str);
+ 	       char s[200];
+ 	       snprintf(s, sizeof(s), translation, pkg);
+ 
+ 	       // we moved from one dpkg state to a new one, report that
+ 	       PackageOpsDone[pkg]++;
+ 	       Done++;
+ 	       // build the status str
+ 	       status << "pmstatus:" << pkg 
+ 		      << ":"  << (Done/float(Total)*100.0) 
+ 		      << ":" << s
+ 		      << endl;
+ 	       if(OutStatusFd > 0)
+ 		  write(OutStatusFd, status.str().c_str(), status.str().size());
+ 	       if (_config->FindB("Debug::pkgDPkgProgressReporting",false) == true)
+ 		  std::clog << "send: '" << status.str() << "'" << endl;
  
- 	 }
- 	 if (_config->FindB("Debug::pkgDPkgProgressReporting",false) == true) 
- 	    std::clog << "(parsed from dpkg) pkg: " << pkg 
- 		      << " action: " << action << endl;
+ 	    }
+ 	    if (_config->FindB("Debug::pkgDPkgProgressReporting",false) == true) 
+ 	       std::clog << "(parsed from dpkg) pkg: " << pkg 
+ 			 << " action: " << action << endl;
  
- 	 // reset the line buffer
- 	 line[0]=0;
+ 	    // reset the line buffer
+ 	    line[0]=0;
+ 	 }
        }
        close(_dpkgin);
        fclose(term_out);