-using Gee; // for array list?
+using GLib;
+using GString;
+// 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 file = File.new_for_path ("data.txt");
- var m = new Monitor();
+
+ var cfg = new SpawnConfig("", { "ls" } , { "" });
+ var spawn = new Spawn(cfg);
+
+
return 0;
}
-var Gio = imports.gi.Gio;
-var GLib = imports.gi.GLib;
+//var Gio = imports.gi.Gio;
+//var GLib = imports.gi.GLib;
/**
* Library to wrap GLib.spawn_async_with_pipes
*
* usage:
-*
-* Spawn = import.Spawn;
-*
-* simple version..
-* var output = Spawn.run({
-* cwd : '/home',
-* args : [ 'ls', '-l' ],
-* env : [], // optional
-* listeners : {
- output : function (line) { Seed.print(line); },
-* stderr : function (line) {Seed.print("ERROR" + line); },
-* input : function() { return 'xxx' },
-* }
-* });
+* v
*
-*
-*
-*
-*
-*var output = Spawn.run( SpawnConfig() {
+*var output = new Spawn( SpawnConfig() {
cwd = "/home", // empty string to default to homedirectory.
args = {"ls", "-l" },
evn = {},
*
*
*/
-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();
+
-struct SpawnConfig
-struct SpawnConfig {
+public class SpawnConfig {
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 SpawnOutput output;
public SpawnErr stderr;
public SpawnInput input;
// defaults..
- public SpawnConfig() {
- cwd = "";
- args = [];
- env = [];
- async = false;
- exceptions = false;
- debug = false;
- output = null;
- stderr = null;
- input = null;
-
+ public SpawnConfig(string cwd,
+ string[] args,
+ string[] env
+ ) {
+ this.cwd = cwd;
+ this.args = args;
+ this.env = env;
+
+ async = false;
+ exceptions = false;
+ debug = false;
+
+ output = null;
+ stderr = null;
+ input = 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
+ ) {
+ this.output = output;
+ this.stderr = stderr;
+ this.input = input;
+ }
+
+
+}
+
+errordomain SpawnError {
+ NO_ARGS
}
/**
public class Spawn : Object
{
+ SpawnConfig cfg;
-
- public Spawn(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 "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
* result is applied to object properties (eg. 'output' or 'stderr')
* @returns {Object} self.
*/
- public run : function()
+ public void run()
{
var err_src = false;
var out_src = false;
- int standard_input;
- int standard_output;
- int standard_error;
+ int standard_input;
+ int standard_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 (
- this.cfg.cwd,
- this.cfg.args,
- this.cfg.env,
- SpawnFlags.SEARCH_PATH | SpawnFlags.DO_NOT_REAP_CHILD,
- null,
- out this.pid,
- out standard_input,
- out standard_output,
+ Process.spawn_async_with_pipes (
+ this.cfg.cwd,
+ this.cfg.args,
+ this.cfg.env,
+ SpawnFlags.SEARCH_PATH | SpawnFlags.DO_NOT_REAP_CHILD,
+ null,
+ out this.pid,
+ out standard_input,
+ out standard_output,
out standard_error);
// stdout:
//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) {
// child can exit before 1we get this far..
if (this.cfg.input != null) {
- print("Trying to call listeners");
+ if (this.cfg.debug) print("Trying to call listeners");
try {
this.write(this.cfg.input());
// this probably needs to be a bit smarter...
this.in_ch = -1;
- } catch (e) {
+ } catch (Error e) {
this.tidyup();
throw e;
}
}
// async - if running - return..
- if (this.async && this.pid > -1) {
- return this;
+ if (this.cfg.async && this.pid > -1) {
+ return;
}
// start mainloop if not async..
- if (this.pid !== false) {
- if (this.debug) {
+ if (this.pid > -1) {
+ if (this.cfg.debug) {
print("starting main loop");
}
-
- this.ctx = isSeed ? new GLib.MainLoop.c_new (null, false) : GLib.MainLoop.new (null, false);;
- this.ctx.run(false); // wait fore exit?
+ this.ctx = new MainLoop ();
+ loop.run(); // wait fore exit?
//print("main_loop done!");
} else {
- tidyup(); // tidyup get's called in main loop.
+ this.tidyup(); // tidyup get's called in main loop.
}
- if (this.exceptions && this.result != 0) {
- this.toString = function() { return this.stderr; };
- throw this; // we throw self...
+ if (this.cfg.exceptions && this.result != 0) {
+ //this.toString = function() { return this.stderr; };
+ ///throw new Exception this; // we throw self...
}
// finally throw, or return self..
- return this;
+ return;
- },
+ }
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 !== false) GLib.source_remove(this.err_src);
- if (this.out_src !== false) 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)
*/
- write : function(str) // write a line to
+ private int write(string str) // write a line to
{
- if (!this.in_ch) {
+ 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";
}
//return ret.value;
return str.length;
- },
+ }
/**
* read from pipe and call appropriate listerner and add to output or stderr string.
* @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);
+ var buffer = new StringBuffer("");
+
+ try {
+ var status = ch.read_line( buffer, term_pos );
+ } catch (Error e) {
+ //FIXme
+ break; // ??
+
+ }
// print('status: ' +JSON.stringify(status));
// print(JSON.stringify(x));
switch(status) {
if (imports.gi.Gtk.events_pending()) {
imports.gi.Gtk.main_iteration();
}
- } catch(e) {
+ } catch(Error e) {
}
}
return false; // allow it to be called again..
}
-};
-/**
- * @function run
- *
- * simple run a process - returns result, or throws stderr result...
- * @param cfg {Object} see spawn
- * @return {string} stdout output.
- */
-function run(cfg) {
- cfg.exceptions = true;
- cfg.async = false;
- var s = new Spawn(cfg);
- var ret = s.run();
- return s.output;
}
- /*
+ /*
// test
try {
Seed.print(run({
projects / gitlive / blobdiff