diff options
| author | Paul Smith <psmith@gnu.org> | 2006-02-01 07:54:22 +0000 |
|---|---|---|
| committer | Paul Smith <psmith@gnu.org> | 2006-02-01 07:54:22 +0000 |
| commit | 4cd35390242bc3e7720dd9831e4bd03e55c636e2 (patch) | |
| tree | 08930384ac32dd0cf2f910272ad38f76aaef2811 /w32 | |
| parent | 64e16d6c00a59fcff9681e032ac8dbec46d3e960 (diff) | |
| download | gunmake-4cd35390242bc3e7720dd9831e4bd03e55c636e2.tar.gz | |
Various updates, mainly to the Windows port, from Eli Zaretskii and
Markus Maurhart.
Diffstat (limited to 'w32')
| -rw-r--r-- | w32/include/sub_proc.h | 1 | ||||
| -rw-r--r-- | w32/subproc/sub_proc.c | 20 |
2 files changed, 18 insertions, 3 deletions
diff --git a/w32/include/sub_proc.h b/w32/include/sub_proc.h index 2654b34..612400f 100644 --- a/w32/include/sub_proc.h +++ b/w32/include/sub_proc.h @@ -29,6 +29,7 @@ EXTERN_DECL(HANDLE process_wait_for_any, (VOID_DECL)); EXTERN_DECL(void process_register, (HANDLE proc));
EXTERN_DECL(HANDLE process_easy, (char** argv, char** env));
EXTERN_DECL(BOOL process_kill, (HANDLE proc, int signal));
+EXTERN_DECL(int process_used_slots, (VOID_DECL));
/* support routines */
EXTERN_DECL(long process_errno, (HANDLE proc));
diff --git a/w32/subproc/sub_proc.c b/w32/subproc/sub_proc.c index ae1a354..6af33bc 100644 --- a/w32/subproc/sub_proc.c +++ b/w32/subproc/sub_proc.c @@ -31,7 +31,7 @@ typedef struct sub_process_t { } sub_process; /* keep track of children so we can implement a waitpid-like routine */ -static sub_process *proc_array[256]; +static sub_process *proc_array[MAXIMUM_WAIT_OBJECTS]; static int proc_index = 0; static int fake_exits_pending = 0; @@ -66,7 +66,7 @@ process_adjust_wait_state(sub_process* pproc) static sub_process * process_wait_for_any_private(void) { - HANDLE handles[256]; + HANDLE handles[MAXIMUM_WAIT_OBJECTS]; DWORD retval, which; int i; @@ -120,7 +120,17 @@ process_kill(HANDLE proc, int signal) void process_register(HANDLE proc) { - proc_array[proc_index++] = (sub_process *) proc; + if (proc_index < MAXIMUM_WAIT_OBJECTS) + proc_array[proc_index++] = (sub_process *) proc; +} + +/* + * Return the number of processes that we are still waiting for. + */ +int +process_used_slots(void) +{ + return proc_index; } /* @@ -1169,6 +1179,10 @@ process_easy( HANDLE hErr; HANDLE hProcess; + if (proc_index >= MAXIMUM_WAIT_OBJECTS) { + DB (DB_JOBS, ("process_easy: All process slots used up\n")); + return INVALID_HANDLE_VALUE; + } if (DuplicateHandle(GetCurrentProcess(), GetStdHandle(STD_INPUT_HANDLE), GetCurrentProcess(), |