[PATCH] Move __func__ to jemalloc_internal_macros.h

Jason Evans jasone at canonware.com
Tue May 27 16:10:39 PDT 2014


On May 21, 2014, at 2:42 AM, Mike Hommey <mh+jemalloc at glandium.org> wrote:
> On Wed, May 21, 2014 at 06:06:14PM +0900, Mike Hommey wrote:
>> From: Mike Hommey <mh at glandium.org>
>> 
>> test/integration/aligned_alloc.c needs it.
>> ---
>> include/jemalloc/internal/jemalloc_internal.h.in     | 1 -
>> include/jemalloc/internal/jemalloc_internal_macros.h | 4 ++++
>> 2 files changed, 4 insertions(+), 1 deletion(-)
>> 
>> diff --git a/include/jemalloc/internal/jemalloc_internal.h.in b/include/jemalloc/internal/jemalloc_internal.h.in
>> index c9462e5..d9bfadf 100644
>> --- a/include/jemalloc/internal/jemalloc_internal.h.in
>> +++ b/include/jemalloc/internal/jemalloc_internal.h.in
>> @@ -46,7 +46,6 @@
>> typedef intptr_t ssize_t;
> 
> This (ssize_t) is also needed in another integration test. It seems
> convoluted to move that in _macros.h.
> 
> Jason, how do you think I should handle this?

What do you think of creating include/jemalloc/internal/jemalloc_internal_decls.h (sibling of jemalloc_internal_macros.h), moving the ssize_t definition there, and including the new header in the same places as its sibling?

> Relatedly, with the 10 patches I just sent (one of which is in the
> moderation queue because the patch is big), I have two remaining
> build failures on tests with MSVC:
> - test/unit/math.c fails to build because of the lack of INFINITY.
> I haven't found a replacement definition that works in a const array.

This is likely to work:

	#define	INFINITY	1e500

> - test/unit/mq.c fails to build because of the use of
>  nanosleep/timespec. I haven't looked for a replacement yet.
> 
> As for running tests, the following unit tests crash:
> - ckh
> - rtree
> - tsd
> 
> They all crash in malloc_tsd_malloc, which is fishy.

Probably a bootstrapping order issue, but I don't have any concrete guesses as to how it's failing.

> In integration tests, thread_arena, posix_memalign and aligned_alloc
> fail with assertions. Haven't looked further.

Thank you for fixing the bitrot that has accumulated in the Windows port.  You've motivated me to make another attempt at purchasing the necessary MS software to add Windows to my testing regime.

Jason


More information about the jemalloc-discuss mailing list