libs/newlib-cygwin
libs/newlib-cygwin
4
0
Fork 0
mirror of git://sourceware.org/git/newlib-cygwin.git synced 2025-01-31 11:30:56 +08:00
Code Issues Projects Releases Wiki Activity

* shared_info.h (SHARED_INFO_CB): Accommodate change to shared_info.

Browse Source 
(CURR_SHARED_MAGIC): Ditto.
	(class shared_info): Add heap_slop_inited member.
	* shared.cc (shared_info::heap_slop_size): Use heap_slop_inited to
	track initializing heap_slop since 0 is a valid value for heap_slop.
	Drop useless < 0 consideration.
This commit is contained in:
Corinna Vinschen 2007-06-27 17:08:19 +00:00
parent 048e00e01d
commit 41391cb2bb
3 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,12 @@
2007-06-27 Corinna Vinschen <corinna@vinschen.de>
* shared_info.h (SHARED_INFO_CB): Accommodate change to shared_info.
(CURR_SHARED_MAGIC): Ditto.
(class shared_info): Add heap_slop_inited member.
* shared.cc (shared_info::heap_slop_size): Use heap_slop_inited to
track initializing heap_slop since 0 is a valid value for heap_slop.
Drop useless < 0 consideration.
2007-06-27 Eric Blake <ebb9@byu.net>
* assert.cc (__assert_func): New function, to match newlib header

9
winsup/cygwin/shared.cc
View File

@ -262,7 +262,7 @@ memory_init ()
unsigned
shared_info::heap_slop_size ()
{
if (!heap_slop)
if (!heap_slop_inited)
{
/* Fetch from registry, first user then local machine. */
for (int i = 0; i < 2; i++)
@ -273,11 +273,8 @@ shared_info::heap_slop_size ()
break;
heap_slop = wincap.heapslop ();
}
if (heap_slop < 0)
heap_slop = 0;
else
heap_slop <<= 20;
heap_slop <<= 20;
heap_slop_inited = true;
}
return heap_slop;

5
winsup/cygwin/shared_info.h
View File

@ -143,9 +143,9 @@ public:
cygwin_version.api_minor)
#define SHARED_VERSION_MAGIC CYGWIN_VERSION_MAGIC (SHARED_MAGIC, SHARED_VERSION)
#define SHARED_INFO_CB 19988
#define SHARED_INFO_CB 19992
#define CURR_SHARED_MAGIC 0x87c42d1eU
#define CURR_SHARED_MAGIC 0xb7048a88U
/* NOTE: Do not make gratuitous changes to the names or organization of the
below class. The layout is checksummed to determine compatibility between
@ -156,6 +156,7 @@ class shared_info
DWORD cb;
public:
unsigned heap_chunk;
bool heap_slop_inited;
unsigned heap_slop;
DWORD sys_mount_table_counter;