Mercurial > hg > xemacs-beta
view netinstall/hash.cc @ 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 (2010-03-19) |
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> * */ /* Simple hash class for install.cc */ #include "win32.h" #include <stdlib.h> #include <string.h> #include "hash.h" class hash_internals { public: char **keys; int numkeys; int maxkeys; int prev_index; }; hash::hash () { h = new hash_internals; h->numkeys = 0; h->maxkeys = 10; h->keys = (char **) malloc (h->maxkeys * sizeof (char *)); h->prev_index = 0; } hash::~hash () { free (h->keys); free (h); } void hash::add (char *string) { int i; for (i=0; i<h->numkeys; i++) if (strcmp (h->keys[i], string) == 0) return; if (h->numkeys >= h->maxkeys) { h->maxkeys += 10; h->keys = (char **) realloc (h->keys, h->maxkeys * sizeof (char *)); } h->keys[h->numkeys] = _strdup (string); h->numkeys ++; } int hash::has (char *string) { int i; for (i=0; i<h->numkeys; i++) if (strcmp (h->keys[i], string) == 0) return 1; return 0; } char * hash::enumerate (char *prev) { if (prev == 0) h->prev_index = -1; h->prev_index ++; if (h->prev_index >= h->numkeys) return 0; return h->keys[h->prev_index]; } static int CDECL rev_len (const void *va, const void *vb) { char *a = *(char **)va; char *b = *(char **)vb; return strcmp (b, a); } void hash::reverse_sort () { qsort (h->keys, h->numkeys, sizeof (h->keys[0]), rev_len); }