nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

date.c vs MONITOR_HEAP

Browse Source 
I tried building with MONITOR_HEAP defined for the first time in a
while.  It wasn't pretty.

date.c was calling libc's strdup() instead of our dupstr() so alloc.c
wasn't tracking those allocations when/if MONITOR_HEAP is enabled.
Then it called free() which is actually a call to nhfree() in that
situation.  If the file of allocations and releases was subsequently
fed to heaputil, it would complain about freeing pointers that hadn't
been allocated.

Worse, makedefs and tilemap wouldn't link.  For MONITOR_HEAP,
makedefs was undefining free() in order to avoid nhfree() but it now
links with date.o so got nhfree() calls anyway.  And it wouldn't link
because that routine isn't available without alloc.o.  tilemap
doesn't link with date.o but it does call malloc() and free() and it
wasn't undefining free(), so looked for nhfree() when linking and got
the same no-such-routine failure.
This commit is contained in:
PatR
2021-12-15 18:39:29 -08:00
parent d6a1835f0d
commit 0a0ee2d1e6
3 changed files with 69 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
util/makedefs.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.7 makedefs.c $NHDT-Date: 1600855420 2020/09/23 10:03:40 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.188 $ */
/* NetHack 3.7 makedefs.c $NHDT-Date: 1639622361 2021/12/16 02:39:21 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.207 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Kenneth Lorber, Kensington, Maryland, 2015. */
/* Copyright (c) M. Stephenson, 1990, 1991. */
@@ -8,9 +8,6 @@
#define MAKEDEFS_C /* use to conditionally include file sections */
#include "config.h"
#ifdef MONITOR_HEAP
#undef free /* makedefs doesn't use the alloc and free in src/alloc.c */
#endif
#include "permonst.h"
#include "objclass.h"
#include "sym.h"
@@ -174,6 +171,40 @@ static boolean use_enum = TRUE;
extern unsigned _stklen = STKSIZ;
#endif
#ifdef MONITOR_HEAP
/* for monitor heap, free(ptr) is a macro that expands to
nhfree(ptr,__FILE__,__LINE__) and nhfree() calls actual free();
makedefs wants to call actual free() so get rid of the macro */
#undef free
/* makedefs doesn't use alloc() from src/alloc.c but it links with
src/date.o which calls free() hence nhfree() if MONITOR_HEAP is
enabled; provide a substitute to satisfy the linker */
void
nhfree(genericptr_t ptr, const char *file UNUSED, int line UNUSED)
{
free(ptr);
}
/* likewise for dupstr() which is also used in src/date.c */
#undef dupstr
char *
nhdupstr(const char *string, const char *file UNUSED, int line UNUSED)
{
return strcpy((char *) malloc(strlen(string) + 1), string);
}
#else /* !MONITOR_HEAP */
/* without MONITOR_HEAP, we don't need to undef dupstr or provide
nhdupstr() but we do still need to provide a substitute dupstr() */
char *
dupstr(const char *string)
{
return strcpy((char *) malloc(strlen(string) + 1), string);
}
#endif /* ?MONITOR_HEAP */
/*
* Some of the routines in this source file were moved into .../src/mdlib
* to facilitate the use of a cross-compiler generation of some of the
@@ -2238,6 +2269,7 @@ tmpdup(const char* str)
return buf;
}
/* the STRICT_REF_DEF checking is way out of date... */
#ifdef STRICT_REF_DEF
NEARDATA struct flag flags;
#ifdef ATTRIB_H