Mercurial > hg > xemacs-beta
view netinstall/log.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 | 685b588e92d8 |
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@redhat.com> * */ /* The purpose of this file is to centralize all the logging functions. */ #include "win32.h" #include <stdio.h> #include <stdarg.h> #include <stdlib.h> #include <time.h> #include "resource.h" #include "msg.h" #include "log.h" #include "dialog.h" #include "state.h" #include "concat.h" #include "mkdir.h" struct LogEnt { LogEnt *next; int flags; time_t when; char msg[1]; }; static LogEnt *first_logent = 0; static LogEnt **next_logent = &first_logent; void log (int flags, char *fmt, ...) { char buf[1000]; va_list args; va_start (args, fmt); vsprintf (buf, fmt, args); LogEnt *l = (LogEnt *) malloc (sizeof (LogEnt) + strlen (buf) + 20); l->next = 0; l->flags = flags; time (&(l->when)); *next_logent = l; next_logent = &(l->next); char *b = l->msg; if (flags & LOG_TIMESTAMP) { struct tm *tm = localtime (&(l->when)); strftime (b, 1000, "%Y/%m/%d %H:%M:%S ", tm); b += strlen (b); } strcpy (b, buf); msg ("LOG: %d %s", l->flags, l->msg); } void log_save (int babble, char *filename, int append) { static int been_here = 0; if (been_here) return; been_here = 1; mkdir_p (0, filename); FILE *f = fopen (filename, append ? "at" : "wt"); if (!f) { fatal (IDS_NOLOGFILE, filename); return; } LogEnt *l; for (l=first_logent; l; l=l->next) { if (babble || !(l->flags & LOG_BABBLE)) { fputs (l->msg, f); if (l->msg[strlen(l->msg)-1] != '\n') fputc ('\n', f); } } fclose (f); been_here = 0; } void exit_setup (int exit_code) { static int been_here = 0; if (been_here) ExitProcess (1); been_here = 1; if (exit_msg) note (exit_msg); log (LOG_TIMESTAMP, "Ending XEmacs install"); if (source == IDC_SOURCE_DOWNLOAD || !root_dir) { log_save (LOG_BABBLE, "setup.log.full", 0); log_save (0, "setup.log", 1); } else { log_save (LOG_BABBLE, concat (root_dir, "/setup.log.full", 0), 0); log_save (0, concat (root_dir, "/setup.log", 0), 1); } ExitProcess (exit_code); }