Spawn.vala

[gitlive] / Spawn.vala

diff --git a/Spawn.vala b/Spawn.vala
index b05e6b7..554655e 100644 (file)
--- a/Spawn.vala
+++ b/Spawn.vala
@@ -241,6 +241,8 @@ public class Spawn : Object
             stdout.printf("PID: %d" ,this.pid);
         }
         
+        this.ref(); // additional ref - cleared on tidyup...
+        
         this.in_ch = new GLib.IOChannel.unix_new(standard_input);
         this.out_ch = new GLib.IOChannel.unix_new(standard_output);
         this.err_ch = new GLib.IOChannel.unix_new(standard_error);
@@ -249,7 +251,7 @@ public class Spawn : Object
         
         
             
-                  // using NONBLOCKING only works if io_add_watch
+        // using NONBLOCKING only works if io_add_watch
           //returns true/false in right conditions
           this.in_ch.set_flags (GLib.IOFlags.NONBLOCK);
           this.out_ch.set_flags (GLib.IOFlags.NONBLOCK);
@@ -292,13 +294,15 @@ public class Spawn : Object
         this.out_src = (int) this.out_ch.add_watch (
             IOCondition.OUT | IOCondition.IN  | IOCondition.PRI |  IOCondition.HUP |  IOCondition.ERR  ,
             (channel, condition) => {
-               return this.read(this.out_ch);
+                return this.read(channel);
+                //return this.out_ch != null ? this.read(this.out_ch) : true;
             }
         );
         this.err_src = (int) this.err_ch.add_watch (
                 IOCondition.OUT | IOCondition.IN  | IOCondition.PRI |  IOCondition.HUP |  IOCondition.ERR  ,
             (channel, condition) => {
-               return this.read(this.err_ch);
+               return this.read(channel);
+               //return this.err_ch != null ? this.read(this.err_ch)  : true;
             }
         );
               
@@ -341,7 +345,7 @@ public class Spawn : Object
                this.ctx = new MainLoop ();
             this.ctx.run(); // wait fore exit?
             
-            print("main_loop done!");
+            //print("main_loop done!");
         } else {
             this.tidyup(); // tidyup get's called in main loop. 
         }
@@ -363,6 +367,7 @@ public class Spawn : Object
 
     private void tidyup()
     {
+        //print("Tidyup\n"); 
         if (this.pid > -1) {
             Process.close_pid(this.pid); // hopefully kills it..
             this.pid = -1;
@@ -372,7 +377,7 @@ public class Spawn : Object
             if (this.out_ch != null)  this.out_ch.shutdown(true);
             if (this.err_ch != null)  this.err_ch.shutdown(true);
         } catch (Error e) {
-            // error shutting donw.
+            // error shutting down
         }
         // blank out channels
         this.in_ch = null;
@@ -383,7 +388,7 @@ public class Spawn : Object
         //if (this.out_src > -1 ) GLib.source_remove(this.out_src);
         this.err_src = -1;
         this.out_src = -1;
-        
+        this.unref();
     }
     
     
@@ -423,7 +428,7 @@ public class Spawn : Object
     {
         string prop = (ch == this.out_ch) ? "output" : "stderr";
        // print("prop: " + prop);
-
+        
         
         //print(JSON.stringify(ch, null,4));
         while (true) {
@@ -431,6 +436,11 @@ public class Spawn : Object
             size_t term_pos;
             size_t len;
             IOStatus status;
+            
+            if (this.pid < 0) {
+                return false; // spawn complete + closed... can't read any more.
+            }
+            
             try {
                                var cond = ch.get_buffer_condition();
                                if ((cond & GLib.IOCondition.ERR) > 0) {