Mercurial > hg > xemacs-beta
view netinstall/ini.cc @ 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> * */ /* The purpose of this file is to get and parse the setup.ini file from the mirror site. A few support routines for the bison and flex parsers are provided also. We check to see if this setup.ini is older than the one we used last time, and if so, warn the user. */ #include "win32.h" #include <stdio.h> #include <stdlib.h> #include <stdarg.h> #include "ini.h" #include "resource.h" #include "concat.h" #include "state.h" #include "geturl.h" #include "dialog.h" #include "msg.h" #include "mkdir.h" #include "log.h" #include "reginfo.h" #include "version.h" unsigned int setup_timestamp = 0; char *setup_version = 0; extern "C" int yyparse (); /*extern int yydebug;*/ static char *error_buf = 0; static int error_count = 0; void do_ini (HINSTANCE h) { char *ini_file = get_url_to_string (concat (MIRROR_SITE, "/setup.ini", 0)); dismiss_url_status_dialog (); if (!ini_file) { note (IDS_SETUPINI_MISSING, MIRROR_SITE); next_dialog = IDD_SITE; return; } package = 0; npackages = 0; setup_timestamp = 0; setup_version = 0; ini_init (ini_file); setup_timestamp = 0; /*yydebug = 1;*/ if (yyparse () || error_count > 0) { if (error_count == 1) MessageBox (0, error_buf, "Parse Error", 0); else MessageBox (0, error_buf, "Parse Errors", 0); } else { /* save known-good setup.ini locally */ FILE *inif = fopen ("setup.ini", "wb"); if (inif) { fwrite (ini_file, 1, strlen (ini_file), inif); fclose (inif); } } if (root_dir) { mkdir_p (1, concat (root_dir, XEMACS_SETUP_DIR, 0)); unsigned int old_timestamp = 0; FILE *ots = fopen (concat (root_dir, XEMACS_SETUP_DIR, "timestamp", 0), "rt"); if (ots) { fscanf (ots, "%u", &old_timestamp); fclose (ots); if (old_timestamp && setup_timestamp && (old_timestamp > setup_timestamp)) { int yn = yesno (IDS_OLD_SETUPINI); if (yn == IDNO) exit_setup (1); } } if (setup_timestamp) { FILE *nts = fopen (concat (root_dir, XEMACS_SETUP_DIR, "timestamp", 0), "wt"); if (nts) { fprintf (nts, "%u", setup_timestamp); fclose (nts); } } } msg ("setup_version is %s, our_version is %s", setup_version? setup_version : "(null)", version); if (setup_version) { char *ini_version = canonicalize_version (setup_version); char *our_version = canonicalize_version (version); if (strcmp (our_version, ini_version) < 0) note (IDS_OLD_SETUP_VERSION, version, setup_version); } next_dialog = IDD_CHOOSE; } extern "C" int yylineno; extern "C" int CDECL yyerror (char *s, ...) { char buf[1000]; int len; sprintf (buf, "setup.ini line %d: ", yylineno); va_list args; va_start (args, s); vsprintf (buf + strlen (buf), s, args); OutputDebugString (buf); if (error_buf) { strcat (error_buf, "\n"); len = strlen (error_buf) + strlen (buf) + 5; error_buf = (char *) realloc (error_buf, len); strcat (error_buf, buf); } else { len = strlen (buf) + 5; error_buf = (char *) malloc (len); strcpy (error_buf, buf); } error_count++; return 0; } extern "C" int CDECL fprintf (FILE *f, const char *s, ...); static char stderrbuf[1000]; int CDECL fprintf (FILE *f, const char *fmt, ...) { char buf[1000]; int rv; va_list args; va_start (args, fmt); if (f == stderr) { rv = vsprintf (buf, fmt, args); strcat (stderrbuf, buf); if (char *nl = strchr (stderrbuf, '\n')) { *nl = 0; /*OutputDebugString (stderrbuf);*/ MessageBox (0, buf, "XEmacs Setup", 0); stderrbuf[0] = 0; } } else { rv = vfprintf (f, fmt, args); } return rv; }