Mercurial > hg > xemacs-beta
view netinstall/iniparse.y @ 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 | 3078fd1074e8 |
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> * */ /* Parse the setup.ini files. inilex.l provides the tokens for this. */ #include <stdio.h> #include <stdlib.h> #include <string.h> #include "win32.h" #include "ini.h" #include "iniparse.h" #include "port.h" #define YYERROR_VERBOSE 1 /*#define YYDEBUG 1*/ static Package *cp; static int trust; extern unsigned int setup_timestamp; extern char *setup_version; extern int yylineno; extern int CDECL yyerror (char *s, ...); #define cpt (cp->info+trust) %} %token STRING %token SETUP_TIMESTAMP SETUP_VERSION VERSION INSTALL SOURCE SDESC LDESC TYPE %token T_PREV T_CURR T_TEST T_UNKNOWN %% whole_file : setup_headers packages ; setup_headers : setup_header setup_headers | /* empty */ ; setup_header : SETUP_TIMESTAMP STRING '\n' { setup_timestamp = strtoul ($2, 0, 0); } | SETUP_VERSION STRING '\n' { setup_version = strdup ($2); } | '\n' | error { yyerror ("unrecognized line in setup.ini headers (do you have the latest setup?)"); } '\n' ; packages : package packages | /* empty */ ; package : '@' STRING '\n' { new_package($2); } lines ; lines : simple_line '\n' lines | simple_line ; simple_line : VERSION STRING { cpt->version = $2; } | SDESC STRING { cp->sdesc = $2; } | LDESC STRING { cp->ldesc = $2; } | INSTALL STRING STRING { cpt->install = $2; cpt->install_size = atoi($3); } | SOURCE STRING STRING { cpt->source = $2; cpt->source_size = atoi($3); } | TYPE STRING { if (!strcmp ($2, "cygwin")) cp->type = TY_CYGWIN; else if (!strcmp ($2, "native")) cp->type = TY_NATIVE; else cp->type = TY_GENERIC; } | T_PREV { trust = TRUST_PREV; } | T_CURR { trust = TRUST_CURR; } | T_TEST { trust = TRUST_TEST; } | T_UNKNOWN { trust = TRUST_UNKNOWN; } | /* empty */ | error '\n' { yylineno --; yyerror ("unrecognized line in package %s (do you have the latest setup?)", cp->name); yylineno ++; } ; %% Package *package = 0; Package *xemacs_package = 0; int npackages = 0; static int maxpackages = 0; Package * new_package (char *name) { if (package == 0) maxpackages = npackages = 0; if (npackages >= maxpackages) { maxpackages += 10; if (package) package = (Package *) realloc (package, maxpackages * sizeof (Package)); else package = (Package *) malloc (maxpackages * sizeof (Package)); } cp = package + npackages; npackages ++; memset (cp, 0, sizeof (Package)); cp->name = name; trust = TRUST_CURR; return cp; }