Mercurial > hg > xemacs-beta
view netinstall/ini.h @ 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 |
parents | ce0b3f2eff35 |
children |
line wrap: on
line source
/* * Copyright (c) 2000, Red Hat, Inc. * * This program 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 of the License, or * (at your option) any later version. * * A copy of the GNU General Public License can be found at * http://www.gnu.org/ * * Written by DJ Delorie <dj@cygnus.com> * */ /* When setup.ini is parsed, the information is stored according to the declarations here. ini.cc (via inilex and iniparse) initializes these structures. choose.cc sets the action and trust fields. download.cc downloads any needed files for selected packages (the chosen "install" field). install.cc installs selected packages. */ #define YYSTYPE char * /* lowest number must be most trusted, highest least trusted */ #define TRUST_PREV 0 #define TRUST_CURR 1 #define TRUST_TEST 2 #define NTRUST 3 #define TRUST_UNKNOWN 3 /* intentionally not in NTRUST */ #define TY_GENERIC 0 #define TY_CYGWIN 1 #define TY_NATIVE 2 #define ACTION_UNKNOWN 0 #define ACTION_SAME 1 #define ACTION_NEW 2 #define ACTION_UPGRADE 3 #define ACTION_UNINSTALL 4 #define ACTION_ERROR 5 #define SRCACTION_NO 0 #define SRCACTION_YES 1 typedef struct { char *name; /* package name, like "cygwin" */ char *sdesc; /* short description (replaces "name" if provided) */ char *ldesc; /* long description (multi-line) */ int action; /* ACTION_* - only NEW and UPGRADE get installed */ int srcaction;/* SRCACTION_ */ int trust; /* TRUST_* (selects among info[] below) */ int type; /* TY_GENERIC, TY_CYGWIN or TY_NATIVE. */ struct { char *version; /* version part of filename */ char *install; /* file name to install */ int install_size; /* in bytes */ char *source; /* sources for installed binaries */ int source_size; /* in bytes */ } info[NTRUST+1]; /* +1 for TRUST_UNKNOWN */ } Package; #ifdef __cplusplus extern "C" { #endif extern Package *package; extern Package *xemacs_package; extern int npackages; Package *new_package (char *name); void ini_init (char *string); #define pinfo(p) ((p).info[(p).trust]) #define pi pinfo(package[i]) #define LOOP_PACKAGES \ for (i=0; i<npackages; i++) \ if ((package[i].action == ACTION_NEW \ || package[i].action == ACTION_UPGRADE) \ && pi.install) #ifdef __cplusplus } #endif