fix info reported by memory manager under DL_MALLOC and SYSTEM_MALLOC

git-svn-id: https://yap.svn.sf.net/svnroot/yap/trunk@1635 b08c6af1-5177-4d33-ba66-4b1c6b8b522a
This commit is contained in:
vsc
2006-05-18 16:33:05 +00:00
parent ef80f1df70
commit ee78d90bb9
11 changed files with 77 additions and 23 deletions

View File

@@ -10,7 +10,7 @@
* File: Heap.h *
* mods: *
* comments: Heap Init Structure *
* version: $Id: Heap.h,v 1.99 2006-05-17 18:38:11 vsc Exp $ *
* version: $Id: Heap.h,v 1.100 2006-05-18 16:33:05 vsc Exp $ *
*************************************************************************/
/* information that can be stored in Code Space */
@@ -543,7 +543,12 @@ struct various_codes *Yap_heap_regs;
#define Yap_av Yap_heap_regs->av_
#define Yap_MemoryHoles Yap_heap_regs->memory_holes
#define Yap_NOfMemoryHoles Yap_heap_regs->nof_memory_holes
#if USE_DL_MALLOC || (USE_SYSTEM_MALLOC && HAVE_MALLINFO)
#define HeapUsed Yap_givemallinfo()
#else
#define HeapUsed Yap_heap_regs->heap_used
#define HeapUsedLock Yap_heap_regs->heap_used_lock
#endif
#define HeapMax Yap_heap_regs->heap_max
#define HeapTop Yap_heap_regs->heap_top
#define HeapLim Yap_heap_regs->heap_lim
@@ -895,7 +900,6 @@ struct various_codes *Yap_heap_regs;
#define NOfThreads Yap_heap_regs->n_of_threads
#define NOfThreadsCreated Yap_heap_regs->n_of_threads_created
#define ThreadsTotalTime Yap_heap_regs->threads_total_time
#define HeapUsedLock Yap_heap_regs->heap_used_lock
#define DeadStaticClausesLock Yap_heap_regs->dead_static_clauses_lock
#define DeadMegaClausesLock Yap_heap_regs->dead_mega_clauses_lock
#define DeadStaticIndicesLock Yap_heap_regs->dead_static_indices_lock
@@ -926,6 +930,11 @@ struct various_codes *Yap_heap_regs;
#define ReadlinePos Yap_heap_regs->readline_pos
#endif
#if (USE_SYSTEM_MALLOC && HAVE_MALLINFO)||USE_DL_MALLOC
UInt STD_PROTO(Yap_givemallinfo, (void));
#endif
ADDR STD_PROTO(Yap_ExpandPreAllocCodeSpace, (UInt, void *));
#define Yap_ReleasePreAllocCodeSpace(x)
#if USE_SYSTEM_MALLOC||USE_DL_MALLOC