+
+using GLib;
// compile valac
/// # valac --pkg gio-2.0 --pkg posix Spawn.vala -o /tmp/Spawn
static int main (string[] args) {
// A reference to our file
- var cfg = new SpawnConfig(null, { "ls" } , "");
+ var cfg = new SpawnConfig("", { "ls" } , { "" });
var spawn = new Spawn(cfg);
*
*
*/
-delegate void SpawnOutput(string line);
-delegate void SpawnErr(string line);
-delegate string SpawnInput();
+public delegate void SpawnOutput(string line);
+public delegate void SpawnErr(string line);
+public delegate string SpawnInput();
public string cwd;
public string[] args;
public string[] env;
- public boolean async;
- public boolean exceptions; // fire exceptions.
- public boolean debug; // fire exceptions.
+ public bool async;
+ public bool exceptions; // fire exceptions.
+ public bool debug; // fire exceptions.
public SpawnOutput output;
public SpawnErr stderr;
}
public void setOptions(
- boolean async,
- boolean exceptions,
- boolean debug
+ bool async,
+ bool exceptions,
+ bool debug
) {
this.async = async;
this.exceptions = exceptions;
}
+errordomain SpawnError {
+ NO_ARGS
+}
+
/**
* @class Spawn
* @param cfg {SpawnConfig} settings - see properties.
public class Spawn : Object
{
-
+ SpawnConfig cfg;
public Spawn(SpawnConfig cfg) throws Error
{
this.cfg = cfg;
- this.cwd = this.cfg.cwd.length || GLib.get_home_dir();
- if (!this.cfg.args.length) {
- throw new Error("No arguments");
+ 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();
}
- boolean ctx = false; // the mainloop ctx.
+ bool ctx = false; // the mainloop ctx.
/**
* @property output {String} resulting output
int standard_error;
- var ret = {};
if (this.cfg.debug) {
- print("cd " + this.cfg.cwd +";" + string.joinv(" ", this.cfg.args));
+ stdout.printf("cd %s; %s" , this.cfg.cwd , string.joinv(" ", this.cfg.args));
}
Process.spawn_async_with_pipes (
//print(JSON.stringify(gret));
if (this.cfg.debug) {
- print("PID: " + this.pid);
+
+ stdout.printf("PID: %d" ,this.pid);
}
ChildWatch.add (this.pid, (w_pid, result) => {
- this.result = result;
- if (_this.debug) {
- print("child_watch_add : result: " + 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");
+ //print("DONE TIDYUP");
if (this.cfg.finish) {
this.cfg.finish(this.result);
}
- this.in_ch = new GLib.IOChannel.unix_new(ret.standard_input);
- this.out_ch = new GLib.IOChannel.unix_new(ret.standard_output);
- this.err_ch = new GLib.IOChannel.unix_new(ret.standard_error);
+ 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);
// make everything non-blocking!
+
+ // 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);
+
- // 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);
-
-
-
- // add handlers for output and stderr.
-
- this.out_src = this.out_ch.add_watch (
- IOCondition.OUT | IOCondition.IN | IOCondition.PRI | IOCondition.HUP | IOCondition.ERR ,
- (channel, condition) => {
- return this.read(_this.out_ch);
- }
- );
+
+ // add handlers for output and stderr.
+
+ this.out_src = this.out_ch.add_watch (
+ IOCondition.OUT | IOCondition.IN | IOCondition.PRI | IOCondition.HUP | IOCondition.ERR ,
+ (channel, condition) => {
+ return this.read(_this.out_ch);
+ }
+ );
this.err_src = this.err_ch.add_watch (
IOCondition.OUT | IOCondition.IN | IOCondition.PRI | IOCondition.HUP | IOCondition.ERR ,
- (channel, condition) => {
- return this.read(_this.err_ch);
- }
- );
-
+ (channel, condition) => {
+ return this.read(_this.err_ch);
+ }
+ );
+
// call input..
if (this.pid > -1) {
private void tidyup()
{
- 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();
- // blank out channels
- this.in_ch = false;
- this.err_ch = false;
- this.out_ch = false;
- // 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);
- this.err_src = false;
- this.out_src = false;
-
+ 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();
+ // blank out channels
+ this.in_ch = false;
+ this.err_ch = false;
+ this.out_ch = false;
+ // 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);
+ this.err_src = -1;
+ this.out_src = -1;
+
}
* @arg str {String} string to write to stdin of process
* @returns GLib.IOStatus (0 == error, 1= NORMAL)
*/
- integer write(str) // write a line to
+ private int write(string str) // write a line to
{
- if (this.in_ch is null) {
+ if (this.in_ch == null) {
return 0; // input is closed
}
- //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);
-
- //print("write_char retunred:" + JSON.stringify(res) + ' ' +JSON.stringify(ret) );
-
+ //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);
+
+ //print("write_char retunred:" + JSON.stringify(res) + ' ' +JSON.stringify(ret) );
+
if (res != GLib.IOStatus.NORMAL) {
throw "Write failed";
}
* @arg giochannel to read from.
* @returns none
*/
- read: function(ch)
+ private bool read(IOChannel ch)
{
- var prop = ch == this.out_ch ? 'output' : 'stderr';
+ string prop = (ch == this.out_ch) ? "output" : "stderr";
// print("prop: " + prop);
var _this = this;
+ string str_return;
-
//print(JSON.stringify(ch, null,4));
while (true) {
-
- var x = {};
- var status = ch.read_line( x);
+ string buffer;
+ size_t term_pos;
+ size_t len;
+ IOStatus status;
+ try {
+ status = ch.read_line( out buffer, out len, out term_pos );
+ } catch (Error e) {
+ //FIXme
+ break; // ??
+
+ }
// 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 (this.listeners[prop]) {
+ // this.listeners[prop].call(this, x.str_return);
+ //}
+ if (ch == this.out_ch) {
+ this.output += buffer;
+ } else {
+ this.stderr += buffer;
}
- _this[prop] += x.str_return;
+ //_this[prop] += x.str_return;
if (_this.debug) {
print(prop + ':' + x.str_return.replace(/\n/, ''));
}
if (imports.gi.Gtk.events_pending()) {
imports.gi.Gtk.main_iteration();
}
- } catch(e) {
+ } catch(Error e) {
}
}
return false; // allow it to be called again..
}
-};
+}
/*
// test
try {
projects / gitlive / blobdiff