ViewVC Help

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

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

Comparing ray/src/common/win_process.c (file contents):
Revision 3.3 by schorsch, Mon Jul 14 20:02:29 2003 UTC vs.
Revision 3.9 by greg, Wed Feb 12 00:15:40 2014 UTC

#	Line 21 | Line 21 | static char RCSid[]="$Id$";
21		#include "rtprocess.h"
22
23
24	<	/* Looks like some Windows versions use negative PIDs.
25	<	Let's just hope they either make them *all* negative, or none.  */
26	<	static int system_uses_negative_pids = 0;
24	>	int
25	>	win_nice(int inc) /* simple nice(2) replacement for Windows */
26	>	{
27	>	/* We don't have much granularity available: IDLE_PRIORITY_CLASS
28	>	will run whenever no other higher priority process is running */
29	>	if (inc > 0) {
30	>	return (int)!SetPriorityClass(GetCurrentProcess(), IDLE_PRIORITY_CLASS);
31	>	}
32	>	return 0;
33	>	}
34
35
36		/*
#	Line 160 | Line 167 | start_process(SUBPROC *proc, char *cmdstr)
167		CloseHandle(hFromChildWrite); hFromChildWrite = NULL;
168		CloseHandle(hToChildRead); hToChildRead = NULL;
169		/* get the file descriptors */
170	<	proc->r = _open_osfhandle((long)hRead, _O_RDONLY);
171	<	proc->w = _open_osfhandle((long)hWrite, _O_APPEND);
170	>	proc->r = _open_osfhandle((long)hRead, _O_RDONLY|_O_BINARY);
171	>	proc->w = _open_osfhandle((long)hWrite, _O_APPEND|_O_BINARY);
172		proc->pid = PInfo.dwProcessId;
173		proc->running = 1;
174		CloseHandle(hCurProc);
#	Line 178 | Line 185 | error: /* cleanup */
185		if(hWrite) CloseHandle(hWrite);
186		if(hCurProc) CloseHandle(hCurProc);
187		proc->running = 0;
188	<	return 0;
188	>	return -1;
189		/* There... Are we happy now? */
190		}
191
#	Line 272 | Line 279 | open_process(SUBPROC *proc, char *av[])
279		char *cmdpath;
280		char *cmdstr;
281
282	+	if (av == NULL || av[0] == NULL) {
283	+	fputs("Illegal call to open_process()!\n", stderr);
284	+	return -1;
285	+	}
286		proc->running = 0;
287	+	if (av == NULL) { return -1; }
288		cmdpath = getpath(av[0], getenv("PATH"), X_OK);
289	<	cmdstr = quoted_cmdline(cmdpath, av);
289	>	cmdstr = quoted_cmdline(cmdpath, av+1);
290		if (cmdstr == NULL) { return 0; }
291		return start_process(proc, cmdstr);
292		}
293
294
295	+	int win_kill(RT_PID pid, int sig) /* we ignore sig... */
296	+	{
297	+	HANDLE hProc;
298	+
299	+	hProc = OpenProcess(SYNCHRONIZE|PROCESS_TERMINATE, FALSE, pid);
300	+	/*  it looks like we want to ignore errors here */
301	+	if(hProc != NULL) {
302	+	#ifdef OBSOLETE_WINDOWS
303	+	#define KILL_TIMEOUT 10 * 1000 /* milliseconds */
304	+	/* it might have some windows open... */
305	+	EnumWindows((WNDENUMPROC)TerminateAppEnum, (LPARAM)pid);
306	+	if(WaitForSingleObject(hProc, KILL_TIMEOUT)!=WAIT_OBJECT_0) {
307	+	/* No way to avoid dangling DLLs here. */
308	+	TerminateProcess(hProc, 0);
309	+	}
310	+	#else
311	+	SafeTerminateProcess(hProc, 0);
312	+	#endif
313	+	/* WaitForSingleObject(hProc, 0); */
314	+	/* not much use to wait on Windows */
315	+	CloseHandle(hProc);
316	+	}
317	+	return 0; /* XXX we need to figure out more here... */
318	+	}
319	+
320	+
321		int
322		close_process(SUBPROC *proc) {
323		int icres, ocres;
324		DWORD pid;
287	–	HANDLE hProc;
325
326		ocres = close(proc->w);
327		icres = close(proc->r);
328		pid = proc->pid;
329		if(ocres != 0 || icres != 0) {
293	–	hProc = OpenProcess(SYNCHRONIZE|PROCESS_TERMINATE, FALSE, pid);
330		/* something went wrong: enforce infanticide */
331		/* other than that, it looks like we want to ignore errors here */
332		if (proc->running) {
333	<	if(hProc != NULL) {
298	<	#ifdef OBSOLETE_WINDOWS
299	<	#define KILL_TIMEOUT 10 * 1000 /* milliseconds */
300	<	/* it might have some windows open... */
301	<	EnumWindows((WNDENUMPROC)TerminateAppEnum, (LPARAM)pid);
302	<	if(WaitForSingleObject(hProc, KILL_TIMEOUT)!=WAIT_OBJECT_0) {
303	<	/* No way to avoid dangling DLLs here. */
304	<	TerminateProcess(hProc, 0);
305	<	}
306	<	#else
307	<	SafeTerminateProcess(hProc, 0);
308	<	#endif
309	<	/* WaitForSingleObject(hProc, 0); */
310	<	/* not much use to wait on Windows */
311	<	CloseHandle(hProc);
312	<	}
333	>	win_kill(pid, 0);
334		}
335		}
336		proc->running = 0;

Diff Legend

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