Changeset 1183

Timestamp:

11/14/03 19:31:27 (21 years ago)

Author:

jalet

Message:

Not perfect, but seems to work with the poll() loop.

Files:

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

pykota/trunk/bin/cupspykota

@@ -24 +24 @@
 #
 # $Log$
+# Revision 1.5  2003/11/14 18:31:27  jalet
+# Not perfect, but seems to work with the poll() loop.
+#
 # Revision 1.4  2003/11/14 17:04:15  jalet
 # More (untested) work on the CUPS backend.
@@ -65 +68 @@
         
     def _run_child(self, cmd):
-        for i in range(3, MAXFD):
+        for i in range(3, 256): # TODO : MAXFD in original popen2 module
             try:
                 os.close(i)
@@ -229 +232 @@
         else :    
             infile = sys.stdin
+        realbackend = os.path.join(os.path.split(sys.argv[0])[0], thebackend.originalbackend)
         subprocess = PyKotaPopen3([realbackend] + sys.argv[1:], capturestderr=1, arg0=os.environ["DEVICE_URI"])
         pollster = select.poll()
-        pollster.register(subprocess.fromchild, select.POLLIN)
-        pollster.register(subprocess.childerr, select.POLLIN)
-        pollster.register(subprocess.tochild, select.POLLOUT)
+        pollster.register(infile.fileno(), select.POLLIN)
+        pollster.register(subprocess.fromchild.fileno(), select.POLLIN)
+        pollster.register(subprocess.childerr.fileno(), select.POLLIN)
+        pollster.register(subprocess.tochild.fileno(), select.POLLOUT)
+        inputdata = ""
         end = 0
         while not end :
             availablestreams = pollster.poll()
             for (stream, mask) in availablestreams :
+                if mask & select.POLLHUP :
+                    if stream == infile.fileno() :
+                        end = 1
                 if mask & select.POLLOUT :
-                    data = infile.read(256 * 1024)
-                    if data :
-                        os.write(stream, data)    
-                    else :    
-                        end = 1
+                    if stream == subprocess.tochild.fileno() :
+                        if inputdata :
+                            os.write(stream, inputdata)    
+                            inputdata = ""
                 if mask & select.POLLIN :     
                     data = os.read(stream, 256 * 1024)
-                    if stream == pollster.fromchild.fileno() :
+                    if stream == infile.fileno() :
+                        inputdata += data
+                    elif stream == subprocess.fromchild.fileno() :
                         sys.stdout.write(data)
-                    elif stream == pollster.childerr.fileno() :    
+                    elif stream == subprocess.childerr.fileno() :    
                         sys.stderr.write(data)
+        if inputdata :                
+            try :
+                os.write(subprocess.tochild.fileno(), inputdata)
+            except :    
+                pass
+        sys.stdout.flush()                
+        sys.stderr.flush()
         subprocess.fromchild.close()
         subprocess.childerr.close()
@@ -261 +278 @@
             thebackend.logger.log_message(_("CUPS backend %s died abnormally.") % realbackend, "error")
             retcode = -1
-        
-        #realbackend = os.path.join(os.path.split(sys.argv[0])[0], thebackend.originalbackend)
-        #retcode = os.spawnve(os.P_WAIT, realbackend, [os.environ["DEVICE_URI"]] + sys.argv[1:], os.environ)
     
     # stops accounting.