diff options
| author | Christopher Faylor <me@cgf.cx> | 2006-03-14 00:10:14 +0300 |
|---|---|---|
| committer | Christopher Faylor <me@cgf.cx> | 2006-03-14 00:10:14 +0300 |
| commit | 84d38174056e438860213eb0cda919df89c06bd2 (patch) | |
| tree | 061d434bdf553f8de3ea11667fdeeea29d7390a7 /winsup/cygwin/heap.cc | |
| parent | 063fd1266048237629929240f923065bf9941abb (diff) | |
* child_info.h (child_info_fork::handle_failure): Declare new function.
(child_info_fork::retry): New field.
* dcrt0.cc (__api_fatal_exit_val): Define.
(child_info_fork::handle_failure): Define new function.
(__api_fatal): Exit using __api_fatal_exit_val value.
* environ.cc (set_fork_retry): Set fork_retry based on CYGWIN environment
variable.
(parse_thing): Add "fork_retry" setting.
* fork.cc (fork_retry): Define.
(frok::parent): Reorganize to allow retry of failed child creation if child
signalled that it was ok to do so.
* heap.cc (heap_init): Signal parent via handle_failure when VirtualAlloc
fails.
* pinfo.h (EXITCODE_RETRY): Declare.
* sigproc.cc (child_info::sync): Properly exit with failure condition if called
for fork and didn't see subproc_ready.
* spawn.cc (spawn_guts): Use windows pid as first argument.
* winsup.h: Remove obsolete NEW_MACRO_VARARGS define.
(__api_fatal_exit_val): Declare.
(set_api_fatal_return): Define.
(in_dllentry): Declare.
* exceptions.cc (inside_kernel): Remove unneeded in_dllentry declaration.
Diffstat (limited to 'winsup/cygwin/heap.cc')
| -rw-r--r-- | winsup/cygwin/heap.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/winsup/cygwin/heap.cc b/winsup/cygwin/heap.cc index b45019981..bdf7a757f 100644 --- a/winsup/cygwin/heap.cc +++ b/winsup/cygwin/heap.cc @@ -21,6 +21,7 @@ details. */ #include "cygheap.h" #include "registry.h" #include "cygwin_version.h" +#include "child_info.h" #define assert(x) @@ -75,7 +76,7 @@ heap_init () if ((reserve_size -= page_const) < allocsize) break; } - if (!p) + if (!p && in_forkee && !fork_info->handle_failure (GetLastError ())) api_fatal ("couldn't allocate heap, %E, base %p, top %p, " "reserve_size %d, allocsize %d, page_const %d", cygheap->user_heap.base, cygheap->user_heap.top, |