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.2 by schorsch, Thu Jul 3 22:41:44 2003 UTC vs.
Revision 3.7 by greg, Thu Jun 14 05:13:25 2012 UTC

#	Line 16 | Line 16 | static char RCSid[]="$Id$";
16		#include <io.h>      /* _open_osfhandle */
17		#include <fcntl.h>   /* _O_XXX */
18
19	<	#include "standard.h"
19	>	#include "rterror.h"
20	>	#include "rtio.h"
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 177 | 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 280 | open_process(SUBPROC *proc, char *av[])
280		char *cmdstr;
281
282		proc->running = 0;
283	+	if (av == NULL) { return -1; }
284		cmdpath = getpath(av[0], getenv("PATH"), X_OK);
285	<	cmdstr = quoted_cmdline(cmdpath, av);
285	>	cmdstr = quoted_cmdline(cmdpath, av+1);
286		if (cmdstr == NULL) { return 0; }
287		return start_process(proc, cmdstr);
288		}
289
290
291	+	int win_kill(RT_PID pid, int sig) /* we ignore sig... */
292	+	{
293	+	HANDLE hProc;
294	+
295	+	hProc = OpenProcess(SYNCHRONIZE|PROCESS_TERMINATE, FALSE, pid);
296	+	/*  it looks like we want to ignore errors here */
297	+	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	+	}
313	+	return 0; /* XXX we need to figure out more here... */
314	+	}
315	+
316	+
317		int
318		close_process(SUBPROC *proc) {
319		int icres, ocres;
320		DWORD pid;
286	–	HANDLE hProc;
321
322		ocres = close(proc->w);
323		icres = close(proc->r);
324		pid = proc->pid;
325		if(ocres != 0 || icres != 0) {
292	–	hProc = OpenProcess(SYNCHRONIZE|PROCESS_TERMINATE, FALSE, pid);
326		/* something went wrong: enforce infanticide */
327		/* other than that, it looks like we want to ignore errors here */
328		if (proc->running) {
329	<	if(hProc != NULL) {
297	<	#ifdef OBSOLETE_WINDOWS
298	<	#define KILL_TIMEOUT 10 * 1000 /* milliseconds */
299	<	/* it might have some windows open... */
300	<	EnumWindows((WNDENUMPROC)TerminateAppEnum, (LPARAM)pid);
301	<	if(WaitForSingleObject(hProc, KILL_TIMEOUT)!=WAIT_OBJECT_0) {
302	<	/* No way to avoid dangling DLLs here. */
303	<	TerminateProcess(hProc, 0);
304	<	}
305	<	#else
306	<	SafeTerminateProcess(hProc, 0);
307	<	#endif
308	<	/* WaitForSingleObject(hProc, 0); */
309	<	/* not much use to wait on Windows */
310	<	CloseHandle(hProc);
311	<	}
329	>	win_kill(pid, 0);
330		}
331		}
332		proc->running = 0;

Diff Legend

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