Changeset 149

Timestamp:

05/14/06 11:43:30 (3 years ago)

Author:

Ant

Message:

Added Makefile.Duit (completly useless for now)

Files:

• trunk/Makefile.Duit (added)
• trunk/demos/gtk/SpawnTests.d (modified) (1 diff)
• trunk/src/glib/Spawn.d (modified) (5 diffs)
• trunk/src/glib/Str.d (modified) (2 diffs)
• trunk/wrap/APILookupGLib.txt (modified) (1 diff)

trunk/demos/gtk/SpawnTests.d

@@ -83 +83 @@
-        }
-        Spawn spawn = new Spawn(args[0]);
+        spawn.addChildWatch(&childEnded);
-        if (args.length > 1 )
-        {
-            for( int i=1 ; i<args.length ; i++ )
-            {
+                writefln("SpawnTests.exec adding parameter [%s] %s",i,args[i]);
-                spawn.addParm(args[i]);
-            }
-        }
-
+//
-        return exec(spawn);
+    }
+    
+    void childEnded(int process, int status)
+    {
+        writefln("process %s ended with status %s", process, status);
-    }
-    

trunk/src/glib/Spawn.d

@@ -63 +63 @@
-private import std.c.string;;
-
+private import std.thread;
+
-/**
- * Description
@@ -110 +112 @@
-    }
-    
+    /**
+     * Adds a delegate to be notified on the end of the child process.
+     * Params:
+     *      delegate(int =  
+     *      dlg =   
+     */
-    public void addChildWatch(void delegate(int,int) dlg)
-    {
@@ -166 +174 @@
-     * Executes the prepared process
-     */
-
-
+
+
+
+
+
+
+
+
-        char** command = Str.toStringzArray(argv);
-        char* parm = *command;
@@ -198 +212 @@
-            standardOutput = fdopen(stdOut, "r");
-            standardError = fdopen(stdErr, "r");
+            
+            if ( outReader !is null )
+            {
+                //(new SpawnOutRead(outReader)).start();
+                readLoop(outReader);
+            }
-        }
-        
-        return result;
-    }
+    
+    int readLoop(bool delegate(char[])outReader)
+    {
+        writefln("SpawnOutRead.run 1");
+        while ( !endOfOutput() )
+        {
+            writefln("SpawnOutRead.run 2");
+            char[] line = readLine();
+            writefln("\t%s", line);
+            outReader(line);
+            writefln("SpawnOutRead.run 3");
+        }
+        writefln("SpawnOutRead.readLoop 4");
+        if ( externalWatch !is null )
+        {
+            writefln("Spawn.readLoop 2");
+            externalWatch(childPid, 0);
+        }
+        return 0;
+    }
+    
+//  class SpawnOutRead : Thread
+//  {
+//      bool delegate(char[])outReader;
+//      this(bool delegate(char[])outReader)
+//      {
+//          this.outReader = outReader;
+//      }
+//      
+//      int run()
+//      {
+//          return readLoop(outReader);
+//      }
+//  }
+    
+    
+
-    
-    public char[] readLine(int max=4096)
@@ -231 +288 @@
-    extern(C) static void childWatchCallback(int pid, int status, Spawn spawn)
-    {
+        writefln("Spawn.childWatchCallback 1");
-        if ( spawn.externalWatch !is null )
-        {
+        writefln("Spawn.childWatchCallback 2");
-            spawn.externalWatch(pid, status);
-        }
+        writefln("Spawn.childWatchCallback 3");
-        spawn.close();
-    }

trunk/src/glib/Str.d

@@ -140 +140 @@
-        foreach ( int i, char[] arg ; args)
-        {
-o
+
-        }
-
@@ -149 +149 @@
-        foreach (char[] p; args)
-        {
-.%s.
+\"%s\"
-            argv[argc++] = toStringz(p);
-        }

trunk/wrap/APILookupGLib.txt

@@ -675 +675 @@
-    }
-    
+    /**
+     * Adds a delegate to be notified on the end of the child process.
+     * Params:
+     *      delegate(int =  
+     *      dlg =   
+     */
-    public void addChildWatch(void delegate(int,int) dlg)
-    {