Mercurial > hg > xemacs-beta
view netinstall/ini.h @ 5160:ab9ee10a53e4
fix various problems with allocation statistics, track overhead properly
-------------------- ChangeLog entries follow: --------------------
lisp/ChangeLog addition:
2010-03-20 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 showing the overhead used with each type,
and add it into the grand total memory usage.
src/ChangeLog addition:
2010-03-20 Ben Wing <ben@xemacs.org>
* alloc.c:
* alloc.c (init_lrecord_stats):
* alloc.c (free_normal_lisp_object):
* alloc.c (struct):
* alloc.c (clear_lrecord_stats):
* alloc.c (tick_lrecord_stats):
* alloc.c (COUNT_FROB_BLOCK_USAGE):
* alloc.c (COPY_INTO_LRECORD_STATS):
* alloc.c (sweep_strings):
* alloc.c (UNMARK_string):
* alloc.c (gc_sweep_1):
* alloc.c (finish_object_memory_usage_stats):
* alloc.c (object_memory_usage_stats):
* alloc.c (object_dead_p):
* alloc.c (fixed_type_block_overhead):
* alloc.c (lisp_object_storage_size):
* emacs.c (main_1):
* lisp.h:
* lrecord.h:
Export lisp_object_storage_size() and malloced_storage_size() even
when not MEMORY_USAGE_STATS, to get the non-MEMORY_USAGE_STATS
build to compile.
Don't export fixed_type_block_overhead() any more.
Some code cleanup, rearrangement, add some section headers.
Clean up various bugs especially involving computation of overhead
and double-counting certain usage in total_gc_usage. Add
statistics computing the overhead used by all types. Don't add a
special entry for string headers in the object-memory-usage-stats
because it's already present as just "string". But do count the
overhead used by long strings. Don't try to call the
memory_usage() methods when NEW_GC because there's nowhere obvious
in the sweep stage to make the calls.
* marker.c (compute_buffer_marker_usage):
Just use lisp_object_storage_size() rather than trying to
reimplement it.
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Sat, 20 Mar 2010 20:20:30 -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