Mercurial > hg > xemacs-beta
view nt/tiff.mak @ 5158:9e0b43d3095c
more cleanups to object-memory-usage stuff
-------------------- ChangeLog entries follow: --------------------
lisp/ChangeLog addition:
2010-03-19 Ben Wing <ben@xemacs.org>
* diagnose.el (show-object-memory-usage-stats):
Rewrite to take into account non-lisp-storage statistics
returned by garbage-collect-1 and friends.
src/ChangeLog addition:
2010-03-19 Ben Wing <ben@xemacs.org>
* alloc.c:
* alloc.c (struct):
* alloc.c (tick_lrecord_stats):
* alloc.c (gc_sweep_1):
* alloc.c (finish_object_memory_usage_stats):
* alloc.c (object_memory_usage_stats):
* alloc.c (compute_memusage_stats_length):
Call new memory-usage mechanism at sweep time to compute extra
memory utilization for all objects. Add up the values element-by-
element to get an aggregrate set of statistics, where each is the
sum of the values of a single statistic across different objects
of the same type. At end of sweep time, call
finish_object_memory_usage_stats() to add up all the aggreggrate
stats that are related to non-Lisp memory storage to compute
a single value, and add it to the list of values returned by
`garbage-collect' and `object-memory-usage-stats'.
* buffer.c (compute_buffer_text_usage):
Don't crash on buffers without text (killed buffers?) and don't
double-count indirect buffers.
* elhash.c:
* elhash.c (hash_table_objects_create):
* elhash.c (vars_of_elhash):
* symsinit.h:
Add memory-usage method to count the size of `hentries'.
* emacs.c (main_1):
Call new functions in elhash.c, frame.c at init.
* frame.c:
* frame.c (compute_frame_usage):
* frame.c (frame_memory_usage):
* frame.c (frame_objects_create):
* symsinit.h:
Add memory-usage method to count gutter display structures,
subwindow exposures.
* gc.c (gc_finish):
* lisp.h:
Declare finish_object_memory_usage_stats(), call it in gc_finish().
* lrecord.h (struct lrecord_implementation):
* lrecord.h (INIT_MEMORY_USAGE_STATS):
New value in implementation struct to track number of non-Lisp-memory
statistics. Computed in alloc.c.
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Fri, 19 Mar 2010 14:47:44 -0500 (2010-03-19) |
parents | 03ab78e48ef6 |
children | ba07c880114a |
line wrap: on
line source
## TIFF makefile for Microsoft nmake ## Copyright (C) 2001 Ben Wing. ## 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_XEMACS) DEBUG_XEMACS=0 !endif !if $(DEBUG_XEMACS) OPT=-Od -Zi !else OPT=-O2 -G5 !endif WARN_CPP_FLAGS = -W3 CFLAGS=-nologo -DFOR_MSW $(WARN_CPP_FLAGS) $(OPT) -c OUTDIR=.\WinRel OBJDIR=.\WinRel # the following is because fax3sm.c references "tiff.h" and "tif_fax3.h", # under the assumption that those header files are in the same directory # as fax3sm.c But, since we're using a special fax3sm.c file, and we # can't be sure the user has patch to change "xx" to "..\..\libtiff\xx", # let's just copy these header files to this directory. (Symbolic links # would be _so_ nice) NEED_FOR_COMPILE= tiff.h tif_fax3.h CPP=cl.exe CPP_PROJ= /GX /YX /I "." /I ".." /D "WIN32" /D "NDEBUG" /D\ "_WINDOWS" /FR$(OBJDIR)/ /Fp$(OUTDIR)/"libtiff.pch" $(CFLAGS) BSC32=bscmake.exe BSC32_FLAGS=/nologo /o$(OUTDIR)/libtiff.bsc LIB32=lib.exe LIB32_FLAGS=/NOLOGO /OUT:$(OUTDIR)\libtiff.lib DEF_FLAGS= DEF_FILE= BSC32_SBRS= \ $(OBJDIR)\tif_jpeg.sbr \ $(OBJDIR)\tif_dirinfo.sbr \ $(OBJDIR)\tif_win32.sbr \ $(OBJDIR)\tif_flush.sbr \ $(OBJDIR)\tif_thunder.sbr \ $(OBJDIR)\tif_compress.sbr \ $(OBJDIR)\tif_print.sbr \ $(OBJDIR)\tif_dirread.sbr \ $(OBJDIR)\tif_getimage.sbr \ $(OBJDIR)\tif_fax3.sbr \ $(OBJDIR)\tif_version.sbr \ $(OBJDIR)\tif_codec.sbr \ $(OBJDIR)\tif_dir.sbr \ $(OBJDIR)\tif_predict.sbr \ $(OBJDIR)\tif_close.sbr \ $(OBJDIR)\tif_dumpmode.sbr \ $(OBJDIR)\tif_aux.sbr \ $(OBJDIR)\tif_error.sbr \ $(OBJDIR)\tif_lzw.sbr \ $(OBJDIR)\tif_zip.sbr \ $(OBJDIR)\tif_read.sbr \ $(OBJDIR)\tif_packbits.sbr \ $(OBJDIR)\tif_swab.sbr \ $(OBJDIR)\tif_dirwrite.sbr \ $(OBJDIR)\tif_open.sbr \ $(OBJDIR)\tif_warning.sbr \ $(OBJDIR)\tif_tile.sbr \ $(OBJDIR)\tif_strip.sbr \ $(OBJDIR)\tif_next.sbr \ $(OBJDIR)\tif_write.sbr \ $(OBJDIR)\fax3sm.sbr LIB32_OBJS= \ $(OBJDIR)\tif_jpeg.obj \ $(OBJDIR)\tif_dirinfo.obj \ $(OBJDIR)\tif_win32.obj \ $(OBJDIR)\tif_flush.obj \ $(OBJDIR)\tif_thunder.obj \ $(OBJDIR)\tif_compress.obj \ $(OBJDIR)\tif_print.obj \ $(OBJDIR)\tif_dirread.obj \ $(OBJDIR)\tif_getimage.obj \ $(OBJDIR)\tif_fax3.obj \ $(OBJDIR)\tif_version.obj \ $(OBJDIR)\tif_codec.obj \ $(OBJDIR)\tif_dir.obj \ $(OBJDIR)\tif_predict.obj \ $(OBJDIR)\tif_close.obj \ $(OBJDIR)\tif_dumpmode.obj \ $(OBJDIR)\tif_aux.obj \ $(OBJDIR)\tif_error.obj \ $(OBJDIR)\tif_lzw.obj \ $(OBJDIR)\tif_zip.obj \ $(OBJDIR)\tif_read.obj \ $(OBJDIR)\tif_packbits.obj \ $(OBJDIR)\tif_swab.obj \ $(OBJDIR)\tif_dirwrite.obj \ $(OBJDIR)\tif_open.obj \ $(OBJDIR)\tif_warning.obj \ $(OBJDIR)\tif_tile.obj \ $(OBJDIR)\tif_strip.obj \ $(OBJDIR)\tif_next.obj \ $(OBJDIR)\tif_write.obj \ $(OBJDIR)\fax3sm.obj # nmake rule .SUFFIXES: .SUFFIXES: .c .obj {..\..\libtiff}.c{$(OBJDIR)}.obj: $(CPP) $(CPP_PROJ) $< -Fo$@ ALL : $(OUTDIR)/libtiff.lib $(OUTDIR)/libtiff.bsc clean : -del tiff.h -del tif_fax3.h -del t4.h -del tiffcomp.h -del tiffconf.h -del tiffio.h -del ..\..\libtiff\libtiff.lib -del *.pdb -del $(OBJDIR)\*.obj -del $(OBJDIR)\*.sbr -del $(OUTDIR)\libtiff.lib -del $(OUTDIR)\libtiff.bsc -del $(OUTDIR)\libtiff.pch -rmdir $(OUTDIR) tiff.h : if not exist ./tiff.h copy ..\..\libtiff\tiff.h . tif_fax3.h : if not exist ./tif_fax3.h copy ..\..\libtiff\tif_fax3.h . $(OUTDIR) : $(NEED_FOR_COMPILE) if not exist $(OUTDIR)/nul mkdir $(OUTDIR) $(OUTDIR)/libtiff.bsc : $(OUTDIR) $(BSC32_SBRS) $(BSC32) @<< $(BSC32_FLAGS) $(BSC32_SBRS) << $(OUTDIR)/libtiff.lib : $(OUTDIR) $(DEF_FILE) $(LIB32_OBJS) $(LIB32) @<< $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS) << copy $(OUTDIR)\libtiff.lib ..\..\libtiff\libtiff.lib DEP_FAX3S=\ ..\..\libtiff\tiff.h \ ..\..\libtiff\tif_fax3.h $(OBJDIR)/fax3sm.obj : $(DEP_FAX3S) $(OBJDIR) $(CPP) $(CPP_PROJ) .\fax3sm.c -Fo$@