From 54030e2146f80ba055f4b7efa20467beab1487e9 Mon Sep 17 00:00:00 2001 From: Christopher Faylor Date: Mon, 14 Oct 2002 20:25:52 +0000 Subject: * child_info.h (CURR_CHILD_INFO_MAGIC): Reset. (child_info_fork::heaptop): Remove obsolete element. (child_info_fork::heabbase): Ditto. (child_info_fork::heapptr): Ditto. (child_info_fork::mount_table): New element. (child_info_fork::myself_addr): Ditto. * dcrt0.cc (dll_crt0_1): Set mount_table and myself_addr when forking. (initial_env): Add newline to "sleeping" message. * dll_init.cc (reserve_upto): Accommodate cygwin heap when freeing memory. Make debugging output a little more descriptive. * fork.cc (fork_parent): Save mount_table and myself_addr. * pinfo.cc (myself_addr): New variable. (set_myself): Pass PID_MYSELF flag to init. (pinfo::Init): Honor PID_MYSELF. Save address where myself shared memory resides in myself_addr, for fork. * pinfo.h (myself_addr): Declare. * shared.cc (memory_init): On fork, use previously saved address for location of mount table. * include/sys/cygwin.h (PID_MYSELF): New value. * dtable.cc (dtable::stdio_init): Don't pass access type to init_std_file_from_handle. It's always the same. (dtable::init_std_file_from_handle): Remove access type argument. Assume read/write. * dtable.h (dtable::init_std_file_from_handle): Ditto for declaration. * exceptions.cc (try_to_debug): Don't try to debug if already being debugged. * fhandler_console.cc (shared_console_info_save): New variable. (fhandler_console::get_tty_stuff): Save address of shared console stuff for fork. --- winsup/cygwin/dll_init.cc | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'winsup/cygwin/dll_init.cc') diff --git a/winsup/cygwin/dll_init.cc b/winsup/cygwin/dll_init.cc index ea4265ee5..592381cde 100644 --- a/winsup/cygwin/dll_init.cc +++ b/winsup/cygwin/dll_init.cc @@ -231,7 +231,7 @@ reserve_upto (const char *name, DWORD here) MEMORY_BASIC_INFORMATION mb; for (DWORD start = 0x10000; start < here; start += size) if (!VirtualQuery ((void *) start, &mb, sizeof (mb))) - size = 64 * 1024; + size = A64K; else { size = A64K * ((mb.RegionSize + A64K - 1) / A64K); @@ -261,7 +261,8 @@ release_upto (const char *name, DWORD here) { size = mb.RegionSize; if (!(mb.State == MEM_RESERVE && mb.AllocationProtect == PAGE_NOACCESS && - ((void *) start < cygheap->heapbase || (void *) start > cygheap->heaptop))) + (((void *) start < cygheap->heapbase || (void *) start > cygheap->heaptop) && + ((void *) start < (void *) cygheap || (void *) start > (void *) ((char *) cygheap + CYGHEAPSIZE))))) continue; if (!VirtualFree ((void *) start, 0, MEM_RELEASE)) api_fatal ("couldn't release memory %p(%d) for '%s' alignment, %E\n", @@ -307,7 +308,8 @@ dll_list::load_after_fork (HANDLE parent, dll *first) LoadLibrary (d.name); } else if (try2) - api_fatal ("unable to remap %s to same address as parent -- %p", d.name, h); + api_fatal ("unable to remap %s to same address as parent(%p) != %p", + d.name, d.handle, h); else { /* It loaded in the wrong place. Dunno why this happens but it always -- cgit v1.2.3