X-Git-Url: http://git.roojs.org/?p=gitlive;a=blobdiff_plain;f=Spawn.vala;h=1ff51e88d106b62f67162a315197e04a49c9f9e9;hp=32c514a1a3d4cad05ea6a89416a2d961b6f2f89b;hb=01e7beaf18d9aca3c2c2ad6f60c4b183aa177888;hpb=acc26f4a387c201e73c67e3e3ea4618b8004a9bc diff --git a/Spawn.vala b/Spawn.vala index 32c514a1..1ff51e88 100644 --- a/Spawn.vala +++ b/Spawn.vala @@ -1,24 +1,39 @@ +/// # valac --pkg gio-2.0 --pkg gtk+-3.0 --pkg posix Spawn.vala -o /tmp/Spawn using GLib; +using Gtk; // compile valac -/// # valac --pkg gio-2.0 --pkg posix Spawn.vala -o /tmp/Spawn ///using Gee; // for array list? - +/* static int main (string[] args) { // A reference to our file var cfg = new SpawnConfig("", { "ls" } , { "" }); - var spawn = new Spawn(cfg); - + cfg.setHandlers( + (line) => { + stdout.printf("%s\n", line); + }, + null,null,null ); + cfg.setOptions( + false, // async + false, // exceptions?? needed?? + false // debug??? + ); + try { + new Spawn(cfg); + + } catch (Error e) { + stdout.printf("Error %s", e.message); + } return 0; } - +*/ //var Gio = imports.gi.Gio; //var GLib = imports.gi.GLib; @@ -45,7 +60,7 @@ static int main (string[] args) { public delegate void SpawnOutput(string line); public delegate void SpawnErr(string line); public delegate string SpawnInput(); - +public delegate void SpawnFinish(int result, string output); public class SpawnConfig { @@ -59,6 +74,7 @@ public class SpawnConfig { public SpawnOutput output; public SpawnErr stderr; public SpawnInput input; + // defaults.. public SpawnConfig(string cwd, string[] args, @@ -69,7 +85,7 @@ public class SpawnConfig { this.env = env; async = false; - exceptions = false; + exceptions = true; debug = false; output = null; @@ -78,30 +94,28 @@ public class SpawnConfig { } - public void setOptions( - bool async, - bool exceptions, - bool debug - ) { - this.async = async; - this.exceptions = exceptions; - this.debug = debug; - } + + public void setHandlers( - SpawnOutput output, - SpawnErr stderr, - SpawnInput input + SpawnOutput? output, + SpawnErr? stderr, + SpawnInput? input + ) { this.output = output; this.stderr = stderr; this.input = input; + } } -errordomain SpawnError { - NO_ARGS +public errordomain SpawnError { + NO_ARGS, + WRITE_ERROR, + EXECUTE_ERROR + } /** @@ -132,27 +146,30 @@ public class Spawn : Object this.cfg = cfg; - + this.output = ""; + this.stderr = ""; this.cfg.cwd = this.cfg.cwd.length < 1 ? GLib.Environment.get_home_dir() : this.cfg.cwd; if (this.cfg.args.length < 0) { throw new SpawnError.NO_ARGS("No arguments"); } - this.run(); + if (!this.cfg.async) { + this.run((res, output) => { }); + } } - bool ctx = false; // the mainloop ctx. + MainLoop ctx = null; // the mainloop ctx. /** * @property output {String} resulting output */ - string output = ""; + public string output; /** * @property stderr {String} resulting output from stderr */ - string stderr = ""; + public string stderr; /** * @property result {Number} execution result. */ @@ -183,19 +200,22 @@ public class Spawn : Object */ int out_src = -1; + + unowned SpawnFinish on_finished; + /** * * @method run * Run the configured command. - * result is applied to object properties (eg. 'output' or 'stderr') + * result is applied to object properties (eg. '?' or 'stderr') * @returns {Object} self. */ - public void run() + public void run( SpawnFinish finished_cb) throws SpawnError, GLib.SpawnError, GLib.IOChannelError { - - var err_src = false; - var out_src = false; + this.on_finished = finished_cb; + err_src = -1; + out_src = -1; int standard_input; int standard_output; int standard_error; @@ -203,9 +223,45 @@ public class Spawn : Object if (this.cfg.debug) { - stdout.printf("cd %s; %s" , this.cfg.cwd , string.joinv(" ", this.cfg.args)); + GLib.debug("cd %s; %s\n" , this.cfg.cwd , string.joinv(" ", this.cfg.args)); } + // stdout: + if (!this.cfg.async) { + string ls_stdout; + string ls_stderr; + int ls_status; + + Process.spawn_sync ( + this.cfg.cwd, + this.cfg.args, + this.cfg.env, + SpawnFlags.SEARCH_PATH, + null, + out ls_stdout, + out ls_stderr, + out ls_status + ); + this.output = ls_stdout; + this.stderr = ls_stderr; + this.result = ls_status; + if (this.cfg.exceptions && this.result != 0) { + var errstr = string.joinv(" ", this.cfg.args) + "\n"; + errstr += this.output; + errstr += this.output.length > 0 ? "\n" : ""; + errstr += this.stderr; + //print("Throwing execute error:%s\n", errstr); + throw new SpawnError.EXECUTE_ERROR(errstr); + //this.toString = function() { return this.stderr; }; + ///throw new Exception this; // we throw self... + } + return; + + } + + + + Process.spawn_async_with_pipes ( this.cfg.cwd, this.cfg.args, @@ -215,43 +271,19 @@ public class Spawn : Object out this.pid, out standard_input, out standard_output, - out standard_error); + out standard_error); - // stdout: + //print(JSON.stringify(gret)); if (this.cfg.debug) { - stdout.printf("PID: %d" ,this.pid); + GLib.debug("PID: %d\n" ,this.pid); } - - ChildWatch.add (this.pid, (w_pid, result) => { - - this.result = result; - if (this.cfg.debug) { - stdout.printf("child_watch_add : result:%d ", result); - } - - this.read(this.out_ch); - this.read(this.err_ch); - - - Process.close_pid(this.pid); - this.pid = -1; - if (this.ctx) { - this.ctx.quit(); - } - this.tidyup(); - //print("DONE TIDYUP"); - if (this.cfg.finish) { - this.cfg.finish(this.result); - } - }); - - + 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); @@ -261,102 +293,160 @@ 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); this.err_ch.set_flags (GLib.IOFlags.NONBLOCK); + + + ChildWatch.add (this.pid, this.on_child_watch); + + + + + // add handlers for output and stderr. - this.out_src = this.out_ch.add_watch ( + 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 = this.err_ch.add_watch ( - IOCondition.OUT | IOCondition.IN | IOCondition.PRI | IOCondition.HUP | IOCondition.ERR , + 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; } ); // call input.. if (this.pid > -1) { - // child can exit before 1we get this far.. + // child can exit before we get this far.. if (this.cfg.input != null) { - if (this.cfg.debug) print("Trying to call listeners"); + if (this.cfg.debug) GLib.debug("Trying to call listeners"); try { this.write(this.cfg.input()); - // this probably needs to be a bit smarter... - //but... let's close input now.. - this.in_ch.close(); - this.in_ch = -1; - - + // this probably needs to be a bit smarter... + //but... let's close input now.. + this.in_ch.shutdown(true); + this.in_ch = null; + + } catch (Error e) { this.tidyup(); - throw e; + return; + // throw e; } } + } - // async - if running - return.. + // async - if running - return.. if (this.cfg.async && this.pid > -1) { + //this.ref(); return; } // start mainloop if not async.. if (this.pid > -1) { - if (this.cfg.debug) { - print("starting main loop"); - } - this.ctx = new MainLoop (); - loop.run(); // wait fore exit? - + //print("starting main loop"); + if (this.cfg.debug) { + GLib.debug("starting main loop"); + } + this.ctx = new MainLoop (); + this.ctx.run(); // wait fore exit? + if (this.cfg.debug) { + GLib.debug(" main loop done"); + } //print("main_loop done!"); } else { this.tidyup(); // tidyup get's called in main loop. } + if (this.cfg.exceptions && this.result != 0) { + var errstr = string.joinv(" ", this.cfg.args) + "\n"; + errstr += this.output; + errstr += this.output.length > 0 ? "\n" : ""; + errstr += this.stderr; + //print("Throwing execute error:%s\n", errstr); + throw new SpawnError.EXECUTE_ERROR(errstr); //this.toString = function() { return this.stderr; }; ///throw new Exception this; // we throw self... } - // finally throw, or return self.. - return; } + void on_child_watch(GLib.Pid w_pid, int result) { + + this.result = result; + if (this.cfg.debug) { + stdout.printf("child_watch_add : result:%d\n", result); + } + + this.read(this.out_ch); + this.read(this.err_ch); + + + Process.close_pid(this.pid); + this.pid = -1; + if (this.ctx != null) { + this.ctx.quit(); + this.ctx = null; + + } + //print("child process done - running callback, then tidyup"); + this.on_finished(this.result, this.output + (this.output.length > 0 ? "\n" : "") + this.stderr); + // this.unref(); + this.tidyup(); + + //print("DONE TIDYUP"); + + + } + private void tidyup() { + if (this.cfg.debug) { + GLib.debug("tidyup"); + } + + //print("Tidyup\n"); if (this.pid > -1) { Process.close_pid(this.pid); // hopefully kills it.. this.pid = -1; } - if (this.in_ch) this.in_ch.close(); - if (this.out_ch) this.out_ch.close(); - if (this.err_ch) this.err_ch.close(); + try { + if (this.in_ch != null) this.in_ch.shutdown(true); + 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 down + } // blank out channels - this.in_ch = false; - this.err_ch = false; - this.out_ch = false; + this.in_ch = null; + this.err_ch = null; + this.out_ch = null; // rmeove listeners !! important otherwise we kill the CPU - if (this.err_src > -1 ) GLib.source_remove(this.err_src); - if (this.out_src > -1 ) GLib.source_remove(this.out_src); + //if (this.err_src > -1 ) GLib.source_remove(this.err_src); + //if (this.out_src > -1 ) GLib.source_remove(this.out_src); this.err_src = -1; this.out_src = -1; - + //this.unref(); } @@ -365,7 +455,7 @@ public class Spawn : Object * @arg str {String} string to write to stdin of process * @returns GLib.IOStatus (0 == error, 1= NORMAL) */ - private int write(string str) // write a line to + private int write(string str) throws Error // write a line to { if (this.in_ch == null) { return 0; // input is closed @@ -373,18 +463,19 @@ public class Spawn : Object //print("write: " + str); // NEEDS GIR FIX! for return value.. let's ignore for the time being.. //var ret = {}; - //var res = this.in_ch.write_chars(str, str.length, ret); - var res = this.in_ch.write_chars(str, str.length); + size_t written; + var res = this.in_ch.write_chars(str.to_utf8(), out written); //print("write_char retunred:" + JSON.stringify(res) + ' ' +JSON.stringify(ret) ); if (res != GLib.IOStatus.NORMAL) { - throw "Write failed"; + throw new SpawnError.WRITE_ERROR("Write failed"); } //return ret.value; return str.length; } + /** * read from pipe and call appropriate listerner and add to output or stderr string. @@ -395,8 +486,7 @@ public class Spawn : Object { string prop = (ch == this.out_ch) ? "output" : "stderr"; // print("prop: " + prop); - var _this = this; - string str_return; + //print ("spawn.read: %s\n", prop); //print(JSON.stringify(ch, null,4)); while (true) { @@ -404,38 +494,55 @@ 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) { + // return false; + //} + //if ((cond & GLib.IOCondition.IN) < 1) { + // return false; + //} status = ch.read_line( out buffer, out len, out term_pos ); } catch (Error e) { //FIXme - break; // ?? + return false; } + if (buffer == null) { + return false; + } + //print("got buffer of %s\n", buffer); // print('status: ' +JSON.stringify(status)); // print(JSON.stringify(x)); switch(status) { case GLib.IOStatus.NORMAL: //write(fn, x.str); + //if (this.listeners[prop]) { // this.listeners[prop].call(this, x.str_return); //} if (ch == this.out_ch) { this.output += buffer; + if (this.cfg.output != null) { + this.cfg.output( buffer); + } } else { this.stderr += buffer; } //_this[prop] += x.str_return; - if (this.cfg.debug) { - stdout.printf("%s : %s", prop , str_return); - } + //if (this.cfg.debug) { + // stdout.printf("%s : %s", prop , buffer); + //} if (this.cfg.async) { - try { - if ( Gtk.events_pending()) { - Gtk.main_iteration(); - } - } catch(Error e) { - + + if ( Gtk.events_pending()) { + Gtk.main_iteration(); } } @@ -443,12 +550,12 @@ public class Spawn : Object continue; case GLib.IOStatus.AGAIN: //print("Should be called again.. waiting for more data.."); - return true; - break; + return true; + //break; case GLib.IOStatus.ERROR: case GLib.IOStatus.EOF: - return false; - break; + return false; + //break; } break;