Mercurial > hg > xemacs-beta
view nt/tiff.mak @ 5170:5ddbab03b0e6
various fixes to memory-usage stats
-------------------- ChangeLog entries follow: --------------------
lisp/ChangeLog addition:
2010-03-25 Ben Wing <ben@xemacs.org>
* diagnose.el (show-memory-usage):
* diagnose.el (show-object-memory-usage-stats):
Further changes to correspond with changes in the C code;
add an additional column in show-object-memory-usage-stats showing
the ancillary Lisp overhead used with each type; shrink columns for
windows in show-memory-usage to get it to fit in 79 chars.
src/ChangeLog addition:
2010-03-25 Ben Wing <ben@xemacs.org>
* alloc.c:
* alloc.c (struct):
* alloc.c (finish_object_memory_usage_stats):
* alloc.c (object_memory_usage_stats):
* alloc.c (Fobject_memory_usage):
* alloc.c (lisp_object_memory_usage_full):
* alloc.c (compute_memusage_stats_length):
* lrecord.h:
* lrecord.h (struct lrecord_implementation):
Add fields to the `lrecord_implementation' structure to list an
offset into the array of extra statistics in a
`struct generic_usage_stats' and a length, listing the first slice
of ancillary Lisp-object memory. Compute automatically in
compute_memusage_stats_length(). Use to add an entry
`FOO-lisp-ancillary-storage' for object type FOO.
Don't crash when an int or char is given to object-memory-usage,
signal an error instead.
Add functions lisp_object_memory_usage_full() and
lisp_object_memory_usage() to compute the total memory usage of an
object (sum of object, non-Lisp attached, and Lisp ancillary
memory).
* array.c:
* array.c (gap_array_memory_usage):
* array.h:
Add function to return memory usage of a gap array.
* buffer.c (struct buffer_stats):
* buffer.c (compute_buffer_usage):
* buffer.c (vars_of_buffer):
* extents.c (compute_buffer_extent_usage):
* marker.c:
* marker.c (compute_buffer_marker_usage):
* extents.h:
* lisp.h:
Remove `struct usage_stats' arg from compute_buffer_marker_usage()
and compute_buffer_extent_usage() -- these are ancillary Lisp
objects and don't get accumulated into `struct usage_stats';
change the value of `memusage_stats_list' so that `markers' and
`extents' memory is in Lisp-ancillary, where it belongs.
In compute_buffer_marker_usage(), use lisp_object_memory_usage()
rather than lisp_object_storage_size().
* casetab.c:
* casetab.c (case_table_memory_usage):
* casetab.c (vars_of_casetab):
* emacs.c (main_1):
Add memory usage stats for case tables.
* lisp.h:
Add comment explaining the `struct generic_usage_stats' more,
as well as the new fields in lrecord_implementation.
* console-impl.h:
* console-impl.h (struct console_methods):
* scrollbar-gtk.c:
* scrollbar-gtk.c (gtk_compute_scrollbar_instance_usage):
* scrollbar-msw.c:
* scrollbar-msw.c (mswindows_compute_scrollbar_instance_usage):
* scrollbar-x.c:
* scrollbar-x.c (x_compute_scrollbar_instance_usage):
* scrollbar.c:
* scrollbar.c (struct scrollbar_instance_stats):
* scrollbar.c (compute_all_scrollbar_instance_usage):
* scrollbar.c (scrollbar_instance_memory_usage):
* scrollbar.c (scrollbar_objects_create):
* scrollbar.c (vars_of_scrollbar):
* scrollbar.h:
* symsinit.h:
* window.c:
* window.c (find_window_mirror_maybe):
* window.c (struct window_mirror_stats):
* window.c (compute_window_mirror_usage):
* window.c (window_mirror_memory_usage):
* window.c (compute_window_usage):
* window.c (window_objects_create):
* window.c (syms_of_window):
* window.c (vars_of_window):
Redo memory-usage associated with windows, window mirrors, and
scrollbar instances. Should fix crash in find_window_mirror,
among other things. Properly assign memo ry to object memory,
non-Lisp extra memory, and Lisp ancillary memory. For example,
redisplay structures are non-Lisp memory hanging off a window
mirror, not a window; make it an ancillary Lisp-object field.
Window mirrors and scrollbar instances have their own statistics,
among other things.
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Thu, 25 Mar 2010 06:07:25 -0500 |
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$@