ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/Development/ray/src/common/unix_process.c

Comparing ray/src/common/unix_process.c (file contents):
Revision 3.5 by greg, Fri Sep 17 21:43:49 2004 UTC vs.
Revision 3.8 by schorsch, Wed Jun 7 17:52:03 2006 UTC

#	Line 12 | Line 12 | static const char      RCSid[] = "$Id$";
12
13		#include <sys/types.h>
14		#include <sys/wait.h>
15	+	#include <fcntl.h>
16	+	#include <stdlib.h>
17
18		#include "rtprocess.h"
19	+	#include "rtio.h"
20
21
22		int
#	Line 22 | Line 25 | SUBPROC *pd,
25		char    *av[]
26		)
27		{
25	–	extern char     *getpath(), *getenv();
28		char    *compath;
29		int     p0[2], p1[2];
30
#	Line 54 | Line 56 | char   *av[]
56		close(p1[1]);
57		pd->r = p1[0];
58		pd->w = p0[1];
59	+	/*
60	+	* Close write stream on exec to avoid multiprocessing deadlock.
61	+	* No use in read stream without it, so set flag there as well.
62	+	* GW: This bug took me two days to figure out!!
63	+	*/
64	+	fcntl(pd->r, F_SETFD, FD_CLOEXEC);
65	+	fcntl(pd->w, F_SETFD, FD_CLOEXEC);
66		pd->running = 1;
67		return(PIPE_BUF);
68		}
#	Line 65 | Line 74 | close_process(         /* close pipes and wait for process */
74		SUBPROC *pd
75		)
76		{
77	<	int     pid, status;
77	>	int     status;
78
79		if (!pd->running)
80		return(0);

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines (old)
>	Changed lines (new)