mirror of
git://sourceware.org/git/newlib-cygwin.git
synced 2025-01-28 10:00:23 +08:00
44d2fc0a45
* child_info.h: Redefine CURR_CHILD_INFO_MAGIC. (child_info_fork::abort): Rename from handle_failure. Change arguments. * cygtls.h (_local_storage::ttybuf): New field. * dcrt0.cc (vapi_fatal): Split api_fatal. Add "in forked process" to message when appropriate. (api_fatal): Use vapi_fatal. * devices.h: Make multiple inclusion safe. (fh_devices): Add FH_CONS* stuff. Reorder slightly. (device): Eliminate anonymous union. Add more ways to access minor/major. (device::setunit): Accommodate no-longer-anonymous union. (device::is_fs): Ditto. (device::is_fs_special): Ditto. (device::major): New function. (device::minor): Ditto. (device::is_device): New function. (device::not_device): Ditto. (device::operator int): New operator. (device::operator fh_devices): Ditto. (device::operator bool): Ditto. (device::operator DWORD): Ditto. (device::operator =): Ditto. (isproc_dev): New function. (isprocsys_dev): Ditto. (iscons_dev): Ditto. (istty_slave_dev): Ditto. * devices.in: Add new "/dev/cons*" strings. Accommodate no-longer-anonymous union throughout. (BRACK): Use more precise method for initialization. * devices.cc: Regenerate. * dtable.cc (dtable::stdio_init): Use get_cttyp instead of get_tty. (dtable::find_archetype): Use new DWORD operator in device to test archetypes. (dtable::init_std_file_from_handle): Use different method to initialize 'dev'. Adapt to different ctty handling and accommodate /dev/cons*. (fh_alloc): Accommodate no-longer-anonymous union. Adapt to new /dev/cons*. (build_fh_pc): Make debugging output more useful. * exceptions.cc (ctrl_c_handler): Use get_cttyp instead of get_tty. * external.cc (fillout_pinfo): Accommodate new cons* stuff. * fhandler.cc (fhandler_base::read): Eliminate is_slow() test. * fhandler.h (fhandler_base::*): Adapt to changes in device.h. (fhandler_*::is_slow): Delete. ( fhandler_proc::get_proc_fhandler): Return fh_devices type. * fhandler_console.cc (open_shared_console): New function. (console_unit): New class. (console_unit::console_unit): New constructor. (enum_windows): New function. Declare as friend to console_unit. (fhandler_console::set_unit): New function. (fhandler_console::get_tty_stuff): Call set_unit to set the unit number and determine if initialization is needed. Eliminate flags parameter. (tty_list::get_cttyp): Rename (sorta) from get_tty. Return pointer to correct tty_min. (fhandler_console::open): Adapt to elimination of argument to get_tty_stuff. (fhandler_console::output_tcsetattr): Properly detect error condition. (fhandler_console::fixup_after_fork_exec): Adapt to get_tty_stuff() setting tc automatically. * fhandler_proc.cc: Use FH_BAD rather than 0 throughout where using fh_devices enum. (fhandler_proc::get_proc_fhandler): Return fh_devices. Adapt to devices.h changes. * fhandler_process.cc: Adapt to devices.h changes. Use FH_BAD rather than 0 throughout where using fh_devices enum. * fhandler_procnet.cc: Ditto. * fhandler_procsys.cc: Ditto. * fhandler_procsysvipc.cc: Ditto. * fhandler_tape.cc (fhandler_dev_tape::fhandler_dev_tape): Ditto. * fhandler_termios.cc (handler_termios::bg_check): Use tc->ttyname() rather than assuming that we can construct a tty. * fhandler_tty.cc (fhandler_tty_master::fhandler_tty_master): Just return get_minor() of dev. (fhandler_pty_master::process_slave_output): Add slightly more debugging info. (fhandler_tty_slave::fhandler_tty_slave): Change name from ntty to unit. (fhandler_pty_master::open): Ditto. (fhandler_tty_slave::ioctl): Adapt to change which causes ctty to represent a complete device. (fhandler_tty_master::init_console): Add debugging for failure path. (fhandler_pty_master::setup): Use get_unit() to retrieve unit number rather than relying on raw ntty. (fhandler_pty_master::setup): Ditto. * fhandler_virtual.h (virt_tab_t): Redefine fhandler as fh_devices. * fork.cc: Remove obsolete vfork stuff. (frok::child): Don't assume that a ctty == 0 is valid. * mount.cc (mount_info::conv_to_win32_path): Adapt to device struct changes. (mount_info::conv_to_win32_path): Ditto. * path.cc (path_conv::check): Retrive major/minor numbers via a method rather than accessing them directly from device. Rely on dev operators to set/retrieve device information as required by device struct change. * path.h (isproc_dev): Move to devices.h. (isprocsys_dev): Ditto. (isvirtual_dev): Ditto. (path_conv:{isdevice,isfifo,isspecial,iscygdrive,issocket,get_devn,get_unitn}): Use device methods to access/manipulate devices. * pinfo.cc (pinfo::exit): Don't assume that ctty == 0 is valid. Use iscons_dev to determine if a device is a console. (_pinfo::_ctty): Use device::parse to generate tty/cons name. (_pinfo::set_ctty): Don't assume that ctty == 0 is valid. Remove redundant info from debugging. * shared.cc (offsets): Remove console offset. * shared_info.h (shared_locations): Ditto. * syscalls.cc (umask): Use device methods to manipulate device information. (ctermid): Use device::parse to generate term device name. * tlsoffsets.h: Regenerate. * tty.cc (ttyslot): Return minor number of ctty since ctty now represents a full device. (tty::create_master): Set ctty to a complete device. (tty_list::attach): Rework to detect new /dev/cons* stuff. (tty_list::terminate): Adapt to changes to ctty. (tty_list::init): Adapt to change to setntty - pass in device major number. (tty::exists): Use get_unit() to retrive tty unit number. (tty::open_mutex): Ditto. (tty::open_inuse): Ditto. (tty::create_inuse): Ditto. (tty::get_event): Ditto. (tty_min::ttyname): Define new function. * tty.h (tty_min::ntty): Redefine as fh_devices. (tty::exists): Use get_unit() to retrive tty unit number. (tty::open_mutex): Ditto. (tty::open_inuse): Ditto. (tty::create_inuse): Ditto. (tty::get_event): Ditto. (tty_min::ttyname): Declare new function. (tty::getntty): Declare as const. (tty_list::operator []): Assure that only minor part of argument is used. * dll_init.cc (dll_list::alloc): Detect mismatch of data segments early issuing an explicit error message if necessary. * heap.cc (heap_init): Adapt to changes from fork->handle_failure to fork->abort. * pinfo.h (EXITCODE_FORK_FAILED): New enum. (from Ryan Johnson) * sigproc.cc (child_info_fork::abort): Rename from handle_failure. Change arguments to allow passing in a printf-like message. * winsup.h (api_fatal): Delete macro definition. (api_fatal): Redefine from __api_fatal. (vapi_fatal): Declare new function. * include/sys/strace.h (strace_vprintf): Define new macro. * ntdll.h (_SYSTEM_INFORMATION_CLASS): Add SystemHandleInformation.
222 lines
7.4 KiB
C++
222 lines
7.4 KiB
C++
/* heap.cc: Cygwin heap manager.
|
|
|
|
Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
|
|
2006, 2007, 2008, 2009, 2010, 2011 Red Hat, Inc.
|
|
|
|
This file is part of Cygwin.
|
|
|
|
This software is a copyrighted work licensed under the terms of the
|
|
Cygwin license. Please consult the file "CYGWIN_LICENSE" for
|
|
details. */
|
|
|
|
#include "winsup.h"
|
|
#include "cygerrno.h"
|
|
#include "shared_info.h"
|
|
#include "path.h"
|
|
#include "fhandler.h"
|
|
#include "dtable.h"
|
|
#include "cygheap.h"
|
|
#include "child_info.h"
|
|
#include <sys/param.h>
|
|
|
|
#define assert(x)
|
|
|
|
static unsigned page_const;
|
|
|
|
#define MINHEAP_SIZE (4 * 1024 * 1024)
|
|
|
|
/* Initialize the heap at process start up. */
|
|
void
|
|
heap_init ()
|
|
{
|
|
const DWORD alloctype = MEM_RESERVE;
|
|
/* If we're the forkee, we must allocate the heap at exactly the same place
|
|
as our parent. If not, we (almost) don't care where it ends up. */
|
|
|
|
page_const = wincap.page_size ();
|
|
if (!cygheap->user_heap.base)
|
|
{
|
|
/* Starting with Vista, Windows performs heap ASLR. This spoils
|
|
the entire region below 0x20000000 for us, because that region
|
|
is used by Windows to randomize heap and stack addresses.
|
|
Therefore we put our heap into a safe region starting at 0x20000000.
|
|
This should work right from the start in 99% of the cases. But,
|
|
there's always a but. Read on... */
|
|
uintptr_t start_address = 0x20000000L;
|
|
uintptr_t largest_found = 0;
|
|
size_t largest_found_size = 0;
|
|
SIZE_T ret;
|
|
MEMORY_BASIC_INFORMATION mbi;
|
|
|
|
cygheap->user_heap.chunk = cygwin_shared->heap_chunk_size ();
|
|
do
|
|
{
|
|
cygheap->user_heap.base = VirtualAlloc ((LPVOID) start_address,
|
|
cygheap->user_heap.chunk,
|
|
alloctype, PAGE_NOACCESS);
|
|
if (cygheap->user_heap.base)
|
|
break;
|
|
|
|
/* Ok, so we are at the 1% which didn't work with 0x20000000 out
|
|
of the box. What we do now is to search for the next free
|
|
region which matches our desired heap size. While doing that,
|
|
we keep track of the largest region we found. */
|
|
start_address += wincap.allocation_granularity ();
|
|
while ((ret = VirtualQuery ((LPCVOID) start_address, &mbi,
|
|
sizeof mbi)) != 0)
|
|
{
|
|
if (mbi.State == MEM_FREE)
|
|
{
|
|
if (mbi.RegionSize >= cygheap->user_heap.chunk)
|
|
break;
|
|
if (mbi.RegionSize > largest_found_size)
|
|
{
|
|
largest_found = (uintptr_t) mbi.BaseAddress;
|
|
largest_found_size = mbi.RegionSize;
|
|
}
|
|
}
|
|
/* Since VirtualAlloc only reserves at allocation granularity
|
|
boundaries, we round up here, too. Otherwise we might end
|
|
up at a bogus page-aligned address. */
|
|
start_address = roundup2 (start_address + mbi.RegionSize,
|
|
wincap.allocation_granularity ());
|
|
}
|
|
if (!ret)
|
|
{
|
|
/* In theory this should not happen. But if it happens, we have
|
|
collected the information about the largest available region
|
|
in the above loop. So, next we squeeze the heap into that
|
|
region, unless it's smaller than the minimum size. */
|
|
if (largest_found_size >= MINHEAP_SIZE)
|
|
{
|
|
cygheap->user_heap.chunk = largest_found_size;
|
|
cygheap->user_heap.base =
|
|
VirtualAlloc ((LPVOID) start_address,
|
|
cygheap->user_heap.chunk,
|
|
alloctype, PAGE_NOACCESS);
|
|
}
|
|
/* Last resort (but actually we are probably broken anyway):
|
|
Use the minimal heap size and let the system decide. */
|
|
if (!cygheap->user_heap.base)
|
|
{
|
|
cygheap->user_heap.chunk = MINHEAP_SIZE;
|
|
cygheap->user_heap.base =
|
|
VirtualAlloc (NULL, cygheap->user_heap.chunk,
|
|
alloctype, PAGE_NOACCESS);
|
|
}
|
|
}
|
|
}
|
|
while (!cygheap->user_heap.base && ret);
|
|
if (cygheap->user_heap.base == NULL)
|
|
api_fatal ("unable to allocate heap, heap_chunk_size %p, %E",
|
|
cygheap->user_heap.chunk);
|
|
cygheap->user_heap.ptr = cygheap->user_heap.top = cygheap->user_heap.base;
|
|
cygheap->user_heap.max = (char *) cygheap->user_heap.base
|
|
+ cygheap->user_heap.chunk;
|
|
}
|
|
else
|
|
{
|
|
DWORD chunk = cygheap->user_heap.chunk; /* allocation chunk */
|
|
/* total size commited in parent */
|
|
DWORD allocsize = (char *) cygheap->user_heap.top -
|
|
(char *) cygheap->user_heap.base;
|
|
|
|
/* Loop until we've managed to reserve an adequate amount of memory. */
|
|
char *p;
|
|
DWORD reserve_size = chunk * ((allocsize + (chunk - 1)) / chunk);
|
|
while (1)
|
|
{
|
|
p = (char *) VirtualAlloc (cygheap->user_heap.base, reserve_size,
|
|
alloctype, PAGE_READWRITE);
|
|
if (p)
|
|
break;
|
|
if ((reserve_size -= page_const) < allocsize)
|
|
break;
|
|
}
|
|
if (!p && in_forkee && !fork_info->abort (NULL))
|
|
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,
|
|
reserve_size, allocsize, page_const);
|
|
if (p != cygheap->user_heap.base)
|
|
api_fatal ("heap allocated at wrong address %p (mapped) != %p (expected)", p, cygheap->user_heap.base);
|
|
if (allocsize && !VirtualAlloc (cygheap->user_heap.base, allocsize, MEM_COMMIT, PAGE_READWRITE))
|
|
api_fatal ("MEM_COMMIT failed, %E");
|
|
}
|
|
|
|
debug_printf ("heap base %p, heap top %p", cygheap->user_heap.base,
|
|
cygheap->user_heap.top);
|
|
page_const--;
|
|
// malloc_init ();
|
|
}
|
|
|
|
#define pround(n) (((size_t)(n) + page_const) & ~page_const)
|
|
|
|
/* FIXME: This function no longer handles "split heaps". */
|
|
|
|
extern "C" void *
|
|
sbrk (int n)
|
|
{
|
|
char *newtop, *newbrk;
|
|
unsigned commitbytes, newbrksize;
|
|
|
|
if (n == 0)
|
|
return cygheap->user_heap.ptr; /* Just wanted to find current cygheap->user_heap.ptr address */
|
|
|
|
newbrk = (char *) cygheap->user_heap.ptr + n; /* Where new cygheap->user_heap.ptr will be */
|
|
newtop = (char *) pround (newbrk); /* Actual top of allocated memory -
|
|
on page boundary */
|
|
|
|
if (newtop == cygheap->user_heap.top)
|
|
goto good;
|
|
|
|
if (n < 0)
|
|
{ /* Freeing memory */
|
|
assert (newtop < cygheap->user_heap.top);
|
|
n = (char *) cygheap->user_heap.top - newtop;
|
|
if (VirtualFree (newtop, n, MEM_DECOMMIT)) /* Give it back to OS */
|
|
goto good; /* Didn't take */
|
|
else
|
|
goto err;
|
|
}
|
|
|
|
assert (newtop > cygheap->user_heap.top);
|
|
|
|
/* Find the number of bytes to commit, rounded up to the nearest page. */
|
|
commitbytes = pround (newtop - (char *) cygheap->user_heap.top);
|
|
|
|
/* Need to grab more pages from the OS. If this fails it may be because
|
|
we have used up previously reserved memory. Or, we're just plumb out
|
|
of memory. Only attempt to commit memory that we know we've previously
|
|
reserved. */
|
|
if (newtop <= cygheap->user_heap.max)
|
|
{
|
|
if (VirtualAlloc (cygheap->user_heap.top, commitbytes, MEM_COMMIT, PAGE_READWRITE) != NULL)
|
|
goto good;
|
|
}
|
|
|
|
/* Couldn't allocate memory. Maybe we can reserve some more.
|
|
Reserve either the maximum of the standard cygwin_shared->heap_chunk_size ()
|
|
or the requested amount. Then attempt to actually allocate it. */
|
|
if ((newbrksize = cygheap->user_heap.chunk) < commitbytes)
|
|
newbrksize = commitbytes;
|
|
|
|
if ((VirtualAlloc (cygheap->user_heap.top, newbrksize, MEM_RESERVE, PAGE_NOACCESS)
|
|
|| VirtualAlloc (cygheap->user_heap.top, newbrksize = commitbytes, MEM_RESERVE, PAGE_NOACCESS))
|
|
&& VirtualAlloc (cygheap->user_heap.top, commitbytes, MEM_COMMIT, PAGE_READWRITE) != NULL)
|
|
{
|
|
cygheap->user_heap.max = (char *) cygheap->user_heap.max + pround (newbrksize);
|
|
goto good;
|
|
}
|
|
|
|
err:
|
|
set_errno (ENOMEM);
|
|
return (void *) -1;
|
|
|
|
good:
|
|
void *oldbrk = cygheap->user_heap.ptr;
|
|
cygheap->user_heap.ptr = newbrk;
|
|
cygheap->user_heap.top = newtop;
|
|
return oldbrk;
|
|
}
|