b0e82b74fb
* child_info.h: Add specific exec class. * cygheap.h: New file. Contains declarations for cygwin heap. * cygheap.cc: New file. Implements cygwin heap functions. * dcrt0.cc (quoted): Simplify due to new method for passing arguments between cygwin programs. (alloc_stack_hard_way): Attempt to handle overlapped stack. (dll_crt0_1): Move child_info processing here. Accomodate new method for passing arguments between cygwin programs. Initialize cygwin heap. Establish __argc and __argv variables. (_dll_crt0): Move most of child_info processing to dll_crt0_1. (cygwin_dll_init): Remove duplication. * dtable.cc (dtable::extend): Allocate dtable using cygwin heap. (dtable::build_fhandler): Ditto for fhandler type being constructed. (dtable::dup_worker): Free new fhandler from cygwin heap on error. (dtable::select_*): Don't assume that this == fdtab. (dtable::linearize_fd_array): Delete. (dtable::delinearize_fd_array): Delete. (dtable::fixup_after_exec): New file. (dtable::vfork_child_dup): Use cygwin heap. (dtable::vfork_parent_restore): Ditto. * dtable.h: Remove obsolete methods. Add new method. * environ.cc (posify): Eliminate already_posix parameter and logic. (envsize): New function. (_addenv): Use envsize. (environ_init): Accept an argument pointing to an existing environment list. If supplied, allocate space for this in the the program's heap. * fhandler.cc (fhandler_base::operator =): Move here from fhandler.h. Use cygwin heap to allocate filenames. (fhandler_base::set_name): Allocate/free names from cygwin heap. (fhandler_base::linearize): Delete. (fhandler_base::de_linearize): Delete. (fhandler_base::operator delete): Free from cygwin heap. (fhandler_base::~fhandler_base): Ditto. * fhandler.h: Accomodate elimination of *linearize and other changes above. * fhandler_console.cc (fhandler_console::fixup_after_exec): Rename from de_linearize. * heap.h: New file. * fhandler_tty.cc (fhandler_tty_slave::fhandler_tty_slave): Use cygwin heap for name. fhandler_tty::fixup_after_exec): Rename from de_linearize. * fork.cc (fork): Call cygheap_fixup_in_child. * heap.cc: Use declarations in heap.h. * malloc.cc: Sprinkle assertions throughout to catch attempts to free/realloc something from the cygwin heap. * path.cc: Throughout, eliminate use of per-thread cache for cwd. Use cwd_* functions rather than cwd_* variables to access cwd_win32 and cwd_posix. (cwd_win32): New function. (cwd_posix): New function. (cwd_hash): New function. (cwd_fixup_after_exec): New function. * path.h: Accomodate path.cc changes. * pinfo.cc (pinfo_init): Accept a pointer to an environment table. Pass this to environ_init. Eliminate old 'title' tests. * pinfo.h: Accomodate above change in argument. * spawn.cc (struct av): New method for building argv list. (av::unshift): New method. (spawn_guts): Allocate everything that the child process needs in the cygwin heap and pass a pointer to this to the child. Build argv list using new method. Eliminate delinearize stuff. * thread.h: Eliminate _cwd_win32 and _cwd_posix buffers. * winsup.h: Eliminate obsolete functions. Add envsize() declaration.
141 lines
3.7 KiB
C++
141 lines
3.7 KiB
C++
/* heap.cc: Cygwin heap manager.
|
|
|
|
Copyright 1996, 1997, 1998, 1999, 2000 Cygnus Solutions.
|
|
|
|
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 <errno.h>
|
|
#include "cygerrno.h"
|
|
#include "sync.h"
|
|
#include "sigproc.h"
|
|
#include "pinfo.h"
|
|
#include "heap.h"
|
|
|
|
#define assert(x)
|
|
|
|
static unsigned page_const = 0;
|
|
|
|
static __inline__ int
|
|
getpagesize(void)
|
|
{
|
|
SYSTEM_INFO si;
|
|
GetSystemInfo(&si);
|
|
return (int)si.dwPageSize;
|
|
}
|
|
|
|
/* Initialize the heap at process start up. */
|
|
|
|
void
|
|
heap_init ()
|
|
{
|
|
/* If we're the forkee, we must allocate the heap at exactly the same place
|
|
as our parent. If not, we don't care where it ends up. */
|
|
|
|
page_const = getpagesize();
|
|
if (brkbase)
|
|
{
|
|
DWORD chunk = brkchunk; /* allocation chunk */
|
|
/* total size commited in parent */
|
|
DWORD allocsize = (char *) brktop - (char *) brkbase;
|
|
/* round up by chunk size */
|
|
DWORD reserve_size = chunk * ((allocsize + (chunk - 1)) / chunk);
|
|
|
|
/* Loop until we've managed to reserve an adequate amount of memory. */
|
|
char *p;
|
|
for (;;)
|
|
{
|
|
p = (char *) VirtualAlloc (brkbase, reserve_size,
|
|
MEM_RESERVE, PAGE_READWRITE);
|
|
if (p)
|
|
break;
|
|
if ((reserve_size -= page_const) <= allocsize)
|
|
break;
|
|
}
|
|
if (p == NULL)
|
|
api_fatal ("1. unable to allocate heap, heap_chunk_size %d, pid %d, %E",
|
|
brkchunk, myself->pid);
|
|
if (p != brkbase)
|
|
api_fatal ("heap allocated but not at %p", brkbase);
|
|
if (! VirtualAlloc (brkbase, allocsize, MEM_COMMIT, PAGE_READWRITE))
|
|
api_fatal ("MEM_COMMIT failed, %E");
|
|
}
|
|
else
|
|
{
|
|
/* Initialize page mask and default heap size. Preallocate a heap
|
|
* to assure contiguous memory. */
|
|
brk = brktop = brkbase = VirtualAlloc(NULL, brkchunk, MEM_RESERVE, PAGE_NOACCESS);
|
|
if (brkbase == NULL)
|
|
api_fatal ("2. unable to allocate heap, heap_chunk_size %d, %E",
|
|
brkchunk);
|
|
}
|
|
|
|
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 brk; /* Just wanted to find current brk address */
|
|
|
|
newbrk = (char *) brk + n; /* Where new brk will be */
|
|
newtop = (char *) pround (newbrk); /* Actual top of allocated memory -
|
|
on page boundary */
|
|
|
|
if (newtop == brktop)
|
|
goto good;
|
|
|
|
if (n < 0)
|
|
{ /* Freeing memory */
|
|
assert(newtop < brktop);
|
|
n = (char *) brktop - newtop;
|
|
if (VirtualFree(newtop, n, MEM_DECOMMIT)) /* Give it back to OS */
|
|
goto good; /* Didn't take */
|
|
else
|
|
goto err;
|
|
}
|
|
|
|
assert(newtop > brktop);
|
|
|
|
/* 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. */
|
|
commitbytes = pround (newtop - (char *) brktop);
|
|
if (VirtualAlloc(brktop, 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 brkchunk or the requested
|
|
amount. Then attempt to actually allocate it. */
|
|
|
|
if ((newbrksize = brkchunk) < commitbytes)
|
|
newbrksize = commitbytes;
|
|
|
|
if ((VirtualAlloc(brktop, newbrksize, MEM_RESERVE, PAGE_NOACCESS) != NULL) &&
|
|
(VirtualAlloc(brktop, commitbytes, MEM_COMMIT, PAGE_READWRITE) != NULL))
|
|
goto good;
|
|
|
|
err:
|
|
set_errno (ENOMEM);
|
|
return (void *) -1;
|
|
|
|
good:
|
|
void *oldbrk = brk;
|
|
brk = newbrk;
|
|
brktop = newtop;
|
|
return oldbrk;
|
|
}
|