public delegate void SpawnOutput(string line);
public delegate void SpawnErr(string line);
public delegate string SpawnInput();
-public delegate void SpawnFinish(int result);
+public delegate void SpawnFinish(int result, string output);
public class SpawnConfig {
public SpawnOutput output;
public SpawnErr stderr;
public SpawnInput input;
- public SpawnFinish finish;
+
// defaults..
public SpawnConfig(string cwd,
string[] args,
this.env = env;
async = false;
- exceptions = false;
+ exceptions = true;
debug = false;
output = null;
}
- 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,
- SpawnFinish? finish
+ SpawnInput? input
+
) {
this.output = output;
this.stderr = stderr;
this.input = input;
- this.finish = finish;
+
}
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) => { });
+ }
}
/**
* @property output {String} resulting output
*/
- public string output = "";
+ public string output;
/**
* @property stderr {String} resulting output from stderr
*/
- public string stderr = "";
+ public string stderr;
/**
* @property result {Number} execution result.
*/
*/
int out_src = -1;
+
+ unowned SpawnFinish on_finished;
+
/**
*
* @method run
* result is applied to object properties (eg. '?' or 'stderr')
* @returns {Object} self.
*/
- public void run() throws SpawnError, GLib.SpawnError, GLib.IOChannelError
+ public void run( SpawnFinish finished_cb) throws SpawnError, GLib.SpawnError, GLib.IOChannelError
{
-
+ this.on_finished = finished_cb;
err_src = -1;
out_src = -1;
int standard_input;
if (this.cfg.debug) {
- stdout.printf("cd %s; %s" , this.cfg.cwd , string.joinv(" ", this.cfg.args));
+ stdout.printf("cd %s; %s\n" , this.cfg.cwd , string.joinv(" ", this.cfg.args));
}
Process.spawn_async_with_pipes (
out this.pid,
out standard_input,
out standard_output,
- out standard_error);
+ out standard_error);
// stdout:
if (this.cfg.debug) {
- stdout.printf("PID: %d" ,this.pid);
+ stdout.printf("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 != null) {
- this.ctx.quit();
- this.ctx = null;
- }
- this.tidyup();
- //print("DONE TIDYUP");
- if (this.cfg.finish != null) {
- 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);
- // 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 = (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 ,
+ 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;
}
);
//but... let's close input now..
this.in_ch.shutdown(true);
this.in_ch = null;
-
+
} catch (Error e) {
this.tidyup();
}
// 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 ();
+ //print("starting main loop");
+ //if (this.cfg.debug) {
+ //
+ // }
+ this.ctx = new MainLoop ();
this.ctx.run(); // wait fore exit?
//print("main_loop done!");
this.tidyup(); // tidyup get's called in main loop.
}
+
if (this.cfg.exceptions && this.result != 0) {
-
- throw new SpawnError.EXECUTE_ERROR(this.stderr);
+ 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()
{
+ //print("Tidyup\n");
if (this.pid > -1) {
Process.close_pid(this.pid); // hopefully kills it..
this.pid = -1;
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;
//if (this.out_src > -1 ) GLib.source_remove(this.out_src);
this.err_src = -1;
this.out_src = -1;
-
+ //this.unref();
}
return str.length;
}
+
/**
* read from pipe and call appropriate listerner and add to output or stderr string.
{
string prop = (ch == this.out_ch) ? "output" : "stderr";
// print("prop: " + prop);
-
+ //print ("spawn.read: %s\n", prop);
//print(JSON.stringify(ch, null,4));
while (true) {
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) {
//}
if (ch == this.out_ch) {
this.output += buffer;
- this.cfg.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 , buffer);
- }
+ //if (this.cfg.debug) {
+ // stdout.printf("%s : %s", prop , buffer);
+ //}
if (this.cfg.async) {
if ( Gtk.events_pending()) {
Gtk.main_iteration();
}
-
}
//this.ctx.iteration(true);
projects / gitlive / blobdiff