diff options
| author | Christopher Faylor <me@cgf.cx> | 2002-08-18 07:28:52 +0400 |
|---|---|---|
| committer | Christopher Faylor <me@cgf.cx> | 2002-08-18 07:28:52 +0400 |
| commit | a80add95d9e1598ff55e32801d1719a79146be8c (patch) | |
| tree | 345dd2360ed3d4d69bbdda2c9614b1ff80f7049e /winsup/cygwin/malloc.cc | |
| parent | aaac1d9e19b8d758b5cf92f3546f55ab91038f38 (diff) | |
* malloc.cc: Update to 2.7.2.
* malloc_wrapper.cc (malloc_init): Call user level mallocs to determine if the
malloc has been wrapped.
Diffstat (limited to 'winsup/cygwin/malloc.cc')
| -rw-r--r-- | winsup/cygwin/malloc.cc | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/winsup/cygwin/malloc.cc b/winsup/cygwin/malloc.cc index 45005fdb8..440716529 100644 --- a/winsup/cygwin/malloc.cc +++ b/winsup/cygwin/malloc.cc @@ -5,7 +5,7 @@ way you wish. Send questions, comments, complaints, performance data, etc to dl@cs.oswego.edu -* VERSION 2.7.1 Thu Jul 25 10:58:03 2002 Doug Lea (dl at gee) +* VERSION 2.7.2 Sat Aug 17 09:07:30 2002 Doug Lea (dl at gee) Note: There may be an updated version of this malloc obtainable at ftp://gee.cs.oswego.edu/pub/misc/malloc.c @@ -1567,8 +1567,8 @@ static pthread_mutex_t mALLOC_MUTEx = PTHREAD_MUTEX_INITIALIZER; /* Substitute anything you like for these */ -#define MALLOC_PREACTION __malloc_lock () -#define MALLOC_POSTACTION __malloc_unlock () +#define MALLOC_PREACTION (0) +#define MALLOC_POSTACTION (0) #endif @@ -2412,8 +2412,8 @@ struct malloc_state { /* Normal bins packed as described above */ mchunkptr bins[NBINS * 2]; - /* Bitmap of bins */ - unsigned int binmap[BINMAPSIZE]; + /* Bitmap of bins. Trailing zero map handles cases of largest binned size */ + unsigned int binmap[BINMAPSIZE+1]; /* Tunable parameters */ CHUNK_SIZE_T trim_threshold; @@ -5433,6 +5433,9 @@ static int cpuinfo (int whole, CHUNK_SIZE_T *kernel, CHUNK_SIZE_T *user) { /* ------------------------------------------------------------ History: + V2.7.2 Sat Aug 17 09:07:30 2002 Doug Lea (dl at gee) + * Fix malloc_state bitmap array misdeclaration + V2.7.1 Thu Jul 25 10:58:03 2002 Doug Lea (dl at gee) * Allow tuning of FIRST_SORTED_BIN_SIZE * Use PTR_UINT as type for all ptr->int casts. Thanks to John Belmonte. |