DistRen Changeset - 34d3e7887adb · protofusion repositories

Changeset - 34d3e7887adb

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Nathan Brink (binki) - 16 years ago 2009-04-08 16:09:42
ohnobinki@ohnopublishing.net

execio: cleaned up some comments

1 file changed with 2 insertions and 6 deletions:

src/common/execio.c

0 comments (0 inline, 0 general)

src/common/execio.c

➞

Show inline comments

@@ @@ -51,16 +51,12 @@ int execio_open(struct execio **rem, con @@
+    {
       close(pipe_write[0]);
       close(pipe_write[1]);
       return 1;
+    }
   /* make our side of the pipes nonblocking? I'll consider this type of stuff later and just keep this code in a comment like I always do... */
   //fcntl(pipe_write[1], F_SETFD, fcntl(pipe_write[1], F_GETFD) | O_NONBLOCK);
   //fucntl(pipe_read[0], F_SETFD, fcntl(pipe_read[0], F_GETFD) | O_NONBLOCK);
   /* parent */
   child = fork();
   if(child == -1)
+    {
       close(pipe_write[0]);
       close(pipe_write[1]);
@@ @@ -80,13 +76,13 @@ int execio_open(struct execio **rem, con @@
       if(!(*rem))
+	{
 	  /* we should tell the child we're dead - use wait and close our end of the pipes! */
 	  close(pipe_write[1]);
 	  close(pipe_read[0]);
 	  /* we should probably pass of the wait() call to a thread that just does boring things like that. Especially for when the server tries to connect to other servers... */
 	  /* maybe we should just kill the child */
+	  /* maybe we should just kill instead of term the child */
 	  kill(child, SIGTERM);
 	  /* the waitpid(2) seems to indicate that only when the child is terminated will this wait return. */
 	  waitpid(child, &childstatus, 0);
+	}
       (*rem)->pipe_write = pipe_write[1];
       (*rem)->pipe_read = pipe_read[0];
@@ @@ -222,13 +218,13 @@ int execio_close(struct execio *eio) @@
+{
   int childstatus;
   close(eio->pipe_read);
   close(eio->pipe_write);
   /* maybe we should just kill the child */
+  /* maybe we should just kill rather than term the child */
   kill(eio->child, SIGTERM);
   /*
      the waitpid(2) seems to indicate that only when the child is terminated will this wait return.
      This are of code will probably need improving - the ability to seng SIGKILL after a timeout? So we'll output a debug line before running waitpid
   */
   fprintf(stderr, "execio_close: running waitpid\n");

0 comments (0 inline, 0 general)