Changeset 1458
- Timestamp:
- 05/07/04 16:44:53 (20 years ago)
- Location:
- pykota/trunk
- Files:
-
- 2 modified
Legend:
- Unmodified
- Added
- Removed
-
pykota/trunk/bin/cupspykota
r1433 r1458 24 24 # 25 25 # $Log$ 26 # Revision 1.39 2004/05/07 14:44:53 jalet 27 # Fix for file handles unregistered twice from the polling object 28 # 26 29 # Revision 1.38 2004/04/09 22:24:46 jalet 27 30 # Began work on correct handling of child processes when jobs are cancelled by … … 280 283 return retcode 281 284 285 def unregisterFileNo(self, pollobj, fileno) : 286 """Removes a file handle from the polling object.""" 287 try : 288 pollobj.unregister(fileno) 289 except KeyError : 290 self.logger.log_message(_("File number %s unregistered twice from polling object, ignored.") % fileno, "warn") 291 else : 292 self.logdebug("File number %s unregistered from polling object." % fileno) 293 282 294 def handleData(self) : 283 295 """Pass the job's data to the real backend.""" … … 369 381 indata = "" 370 382 if endinput : 371 pollster.unregister(tocfno)383 self.unregisterFileNo(pollster, tocfno) 372 384 self.logdebug("Closing real backend's stdin.") 373 385 os.close(tocfno) … … 382 394 outdata = "" 383 395 if endoutput : 384 pollster.unregister(stdoutfno)396 self.unregisterFileNo(pollster, stdoutfno) 385 397 outputclosed = 1 386 398 elif fd == stderrfno : … … 393 405 errdata = "" 394 406 if enderr : 395 pollster.unregister(stderrfno)407 self.unregisterFileNo(pollster, stderrfno) 396 408 errclosed = 1 397 409 if (mask & select.POLLIN) or (mask & select.POLLPRI) : … … 401 413 indata += data 402 414 if not data : # If yes, then no more input data 403 pollster.unregister(infno)415 self.unregisterFileNo(pollster, infno) 404 416 self.logdebug("Input data ends.") 405 417 endinput = 1 # this happens with real files. … … 414 426 # 415 427 # Some standard I/O stream has no more datas 416 pollster.unregister(fd)428 self.unregisterFileNo(pollster, fd) 417 429 if fd == infno : 418 430 # Here we are in the case where the input file is stdin. -
pykota/trunk/NEWS
r1456 r1458 24 24 - 1.19alpha5 : 25 25 26 - cupspykota polling loop fix for MacOSX (at least) 27 26 28 - pkpgcounter enhancements. 27 29