From 1cc651ecafae07b9ed6edff9952e2b31f0503d0a Mon Sep 17 00:00:00 2001 From: Christopher Faylor Date: Tue, 22 Oct 2002 16:18:55 +0000 Subject: * cygheap.cc (cygheap_fixup_in_child): Use user_heap element in cygheap. (init_cheap): Ditto for declaration. * fork.cc (fork_parent): Use user_heap element in cygheap. * heap.h (inheap): Ditto. * heap.cc (sbrk): Ditto. (heap_init): Ditto. Reorganize to shrink heap chunk as required and record new value in cygheap. * dcrt0.cc (dll_crt0_1): More "move the cygthread init" games. * shared.cc (open_shared): Rework memory protection to properly deal with relocated shared segment. (shared_info::heap_chunk_size): Rename element to 'heap_chunk'. * shared_info.h (shared_info): Ditto for declaration. * strace.cc (strace::hello): Report on heap chunk size from cygheap since it may shrink. --- winsup/cygwin/cygheap.h | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'winsup/cygwin/cygheap.h') diff --git a/winsup/cygwin/cygheap.h b/winsup/cygwin/cygheap.h index fd784ae95..703c1d1dc 100644 --- a/winsup/cygwin/cygheap.h +++ b/winsup/cygwin/cygheap.h @@ -198,18 +198,21 @@ struct cygheap_debug }; #endif +struct user_heap_info +{ + void *base; + void *ptr; + void *top; + unsigned chunk; +}; + struct init_cygheap { _cmalloc_entry *chain; char *buckets[32]; - struct /* User heap stuff. */ - { - void *heapbase; - void *heapptr; - void *heaptop; - }; cygheap_root root; cygheap_user user; + user_heap_info user_heap; mode_t umask; HANDLE shared_h; HANDLE console_h; -- cgit v1.2.3