Changeset 1458 for pykota/trunk/bin/cupspykota

Timestamp:

05/07/04 16:44:53 (20 years ago)

Author:

jalet

Message:

Fix for file handles unregistered twice from the polling object

Files:

• pykota/trunk/bin/cupspykota (modified) (7 diffs)

pykota/trunk/bin/cupspykota

@@ -24 +24 @@
 #
 # $Log$
+# Revision 1.39  2004/05/07 14:44:53  jalet
+# Fix for file handles unregistered twice from the polling object
+#
 # Revision 1.38  2004/04/09 22:24:46  jalet
 # Began work on correct handling of child processes when jobs are cancelled by
@@ -280 +283 @@
         return retcode    
                     
+    def unregisterFileNo(self, pollobj, fileno) :                
+        """Removes a file handle from the polling object."""
+        try :
+            pollobj.unregister(fileno)
+        except KeyError :    
+            self.logger.log_message(_("File number %s unregistered twice from polling object, ignored.") % fileno, "warn")
+        else :    
+            self.logdebug("File number %s unregistered from polling object." % fileno)
+            
     def handleData(self) :                    
         """Pass the job's data to the real backend."""
@@ -369 +381 @@
                             indata = ""
                         if endinput :    
-                            pollster.unregister(tocfno)        
+                            self.unregisterFileNo(pollster, tocfno)        
                             self.logdebug("Closing real backend's stdin.")
                             os.close(tocfno)
@@ -382 +394 @@
                             outdata = ""
                         if endoutput :    
-                            pollster.unregister(stdoutfno)        
+                            self.unregisterFileNo(pollster, stdoutfno)        
                             outputclosed = 1
                     elif fd == stderrfno :
@@ -393 +405 @@
                             errdata = ""
                         if enderr :    
-                            pollster.unregister(stderrfno)        
+                            self.unregisterFileNo(pollster, stderrfno)        
                             errclosed = 1
                 if (mask & select.POLLIN) or (mask & select.POLLPRI) :     
@@ -401 +413 @@
                         indata += data
                         if not data :    # If yes, then no more input data
-                            pollster.unregister(infno)
+                            self.unregisterFileNo(pollster, infno)
                             self.logdebug("Input data ends.")
                             endinput = 1 # this happens with real files.
@@ -414 +426 @@
                     # 
                     # Some standard I/O stream has no more datas
-                    pollster.unregister(fd)
+                    self.unregisterFileNo(pollster, fd)
                     if fd == infno :
                         # Here we are in the case where the input file is stdin.