Mercurial > hg > xemacs-beta
view nt/xpm.mak @ 5059:c8f90d61dcf3
fix memory usage stats to include pdumped objects
-------------------- ChangeLog entries follow: --------------------
lisp/ChangeLog addition:
2010-02-21 Ben Wing <ben@xemacs.org>
* diagnose.el:
* diagnose.el (show-object-memory-usage-stats):
Fix errors preventing this from working properly, account for
words like "entry" pluralized to "entries".
src/ChangeLog addition:
2010-02-21 Ben Wing <ben@xemacs.org>
* alloc.c:
* alloc.c (FREE_FIXED_TYPE_WHEN_NOT_IN_GC):
* alloc.c (struct):
* alloc.c (tick_lrecord_stats):
* alloc.c (tick_lcrecord_stats):
* alloc.c (sweep_lcrecords_1):
* alloc.c (COUNT_FROB_BLOCK_USAGE):
* alloc.c (SWEEP_FIXED_TYPE_BLOCK_1):
* alloc.c (free_cons):
* alloc.c (free_key_data):
* alloc.c (free_button_data):
* alloc.c (free_motion_data):
* alloc.c (free_process_data):
* alloc.c (free_timeout_data):
* alloc.c (free_magic_data):
* alloc.c (free_magic_eval_data):
* alloc.c (free_eval_data):
* alloc.c (free_misc_user_data):
* alloc.c (free_marker):
* alloc.c (gc_sweep_1):
* alloc.c (HACK_O_MATIC):
* alloc.c (FROB):
* alloc.c (object_memory_usage_stats):
* alloc.c (Fgarbage_collect):
* dumper.c:
* dumper.c (pdump_objects_unmark):
* lrecord.h:
* lrecord.h (enum lrecord_alloc_status):
Fixes to memory-usage-tracking code, etc.
(1) Incorporate NEW_GC stuff into FREE_FIXED_TYPE_WHEN_NOT_IN_GC
to avoid duplication.
(2) Rewrite tick_lcrecord_stats() to include separate
tick_lrecord_stats(); use in dumper.c to note pdumped objects.
(3) Instead of handling frob-block objects specially in
object_memory_usage_stats(), have SWEEP_FIXED_TYPE_BLOCK_1
increment the stats in lrecord_stats[] so that they get handled
like other objects.
(4) Pluralize entry as entries, etc.
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Sun, 21 Feb 2010 15:29:12 -0600 |
| parents | 5274591ce707 |
| children | ba07c880114a |
line wrap: on
line source
# # XPM Makefile for Microsoft NMAKE without X libraries # # Copyright (C) 1997 Free Software Foundation, Inc. # # This file is part of XEmacs. # # XEmacs is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the # Free Software Foundation; either version 2, or (at your option) any # later version. # # XEmacs is distributed in the hope that it will be useful, but WITHOUT # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License # for more details. # # You should have received a copy of the GNU General Public License # along with XEmacs; see the file COPYING. If not, write to # the Free Software Foundation, Inc., 51 Franklin St. - Fifth Floor, # Boston, MA 02110-1301, USA. # !if !defined(DEBUG) !if defined(DEBUG_XEMACS) DEBUG=$(DEBUG_XEMACS) !else DEBUG=0 !endif !endif !if !defined(USE_CRTDLL) USE_CRTDLL=1 !endif !if $(DEBUG) OPT=-Od -Zi LINK_DEBUG=-debug !else OPT=-Ox !endif !if $(USE_CRTDLL) !if $(DEBUG) C_LIBFLAG=-MDd !else C_LIBFLAG=-MD !endif !else !if $(DEBUG) C_LIBFLAG=-MLd !else C_LIBFLAG=-ML !endif !endif WARN_CPP_FLAGS = -W3 CC=cl CFLAGS=-nologo -DFOR_MSW $(C_LIBFLAG) $(WARN_CPP_FLAGS) \ $(OPT) $(INCLUDES) -c OBJS= data.obj create.obj misc.obj rgb.obj scan.obj parse.obj hashtab.obj \ WrFFrI.obj RdFToI.obj CrIFrDat.obj CrDatFrI.obj \ CrIFrBuf.obj CrBufFrI.obj \ RdFToDat.obj WrFFrDat.obj \ Attrib.obj Image.obj Info.obj RdFToBuf.obj WrFFrBuf.obj \ simx.obj # nmake rule .SUFFIXES: .SUFFIXES: .c .c.obj:: $(CC) $(CFLAGS) $< # targets all: ..\X11\xpm.h Xpm.lib ..\X11\xpm.h: ..\X11\NUL xpm.h copy xpm.h ..\X11 ..\X11\NUL: mkdir ..\X11 Xpm.lib: $(OBJS) lib -nologo -out:$@ $(OBJS)