Mercurial > hg > xemacs-beta
view netinstall/hash.cc @ 5059:c8f90d61dcf3
fix memory usage stats to include pdumped objects
-------------------- ChangeLog entries follow: --------------------
lisp/ChangeLog addition:
2010-02-21 Ben Wing <ben@xemacs.org>
* diagnose.el:
* diagnose.el (show-object-memory-usage-stats):
Fix errors preventing this from working properly, account for
words like "entry" pluralized to "entries".
src/ChangeLog addition:
2010-02-21 Ben Wing <ben@xemacs.org>
* alloc.c:
* alloc.c (FREE_FIXED_TYPE_WHEN_NOT_IN_GC):
* alloc.c (struct):
* alloc.c (tick_lrecord_stats):
* alloc.c (tick_lcrecord_stats):
* alloc.c (sweep_lcrecords_1):
* alloc.c (COUNT_FROB_BLOCK_USAGE):
* alloc.c (SWEEP_FIXED_TYPE_BLOCK_1):
* alloc.c (free_cons):
* alloc.c (free_key_data):
* alloc.c (free_button_data):
* alloc.c (free_motion_data):
* alloc.c (free_process_data):
* alloc.c (free_timeout_data):
* alloc.c (free_magic_data):
* alloc.c (free_magic_eval_data):
* alloc.c (free_eval_data):
* alloc.c (free_misc_user_data):
* alloc.c (free_marker):
* alloc.c (gc_sweep_1):
* alloc.c (HACK_O_MATIC):
* alloc.c (FROB):
* alloc.c (object_memory_usage_stats):
* alloc.c (Fgarbage_collect):
* dumper.c:
* dumper.c (pdump_objects_unmark):
* lrecord.h:
* lrecord.h (enum lrecord_alloc_status):
Fixes to memory-usage-tracking code, etc.
(1) Incorporate NEW_GC stuff into FREE_FIXED_TYPE_WHEN_NOT_IN_GC
to avoid duplication.
(2) Rewrite tick_lcrecord_stats() to include separate
tick_lrecord_stats(); use in dumper.c to note pdumped objects.
(3) Instead of handling frob-block objects specially in
object_memory_usage_stats(), have SWEEP_FIXED_TYPE_BLOCK_1
increment the stats in lrecord_stats[] so that they get handled
like other objects.
(4) Pluralize entry as entries, etc.
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Sun, 21 Feb 2010 15:29:12 -0600 |
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); }