annotate netinstall/hash.cc @ 1292:f3437b56874d

[xemacs-hg @ 2003-02-13 09:57:04 by ben] profile updates profile.c: Major reworking. Keep track of new information -- total function timing (includes descendants), GC usage, total GC usage (includes descendants). New functions to be called appropriately from eval.c, alloc.c to keep track of this information. Keep track of when we're actually in a function vs. in its profile, for more accurate timing counts. Track profile overhead separately. Create new mechanism for specifying "internal sections" that are tracked just like regular Lisp functions and even appear in the backtrace if `backtrace-with-internal-sections' is non-nil (t by default for error-checking builds). Add some KKCC information for the straight (non-Elisp) hash table used by profile, which contains Lisp objects in its keys -- but not used yet. Remove old ad-hoc methods for tracking garbage collection, redisplay (which was incorrect anyway when Lisp was called within these sections). Don't record any tick info when blocking under MS Windows, since the timer there is in real time rather than in process time. Make `start-profiling', `stop-profiling' interactive. Be consistent wrt. recursive functions and functions currently on the stack when starting or stopping -- together these make implementing the `total' values extremely difficult. When we start profiling, we act as if we just entered all the functions currently on the stack. Likewise when exiting. Create vars in_profile for tracking time spent inside of profiling, and profiling_lock for setting exclusive access to the main hash table when reading from it or modifying it. (protects against getting screwed up by the signal handle going off at the same time. profile.h: New file. Create macros for declaring internal profiling sections. lisp.h: Move profile-related stuff to profile.h. alloc.c: Keep track of total consing, for profile. Tell profile when we are consing. Use new profile-section method for noting garbage-collection. alloc.c: Abort if we attempt to call the allocator reentrantly. backtrace.h, eval.c: Add info for use by profile in the backtrace frame and transfer PUSH_BACKTRACE/POP_BACKTRACE from eval.c, for use with profile. elhash.c: Author comment. eval.c, lisp.h: New Lisp var `backtrace-with-internal-sections'. Set to t when error-checking is on. eval.c: When unwinding, eval.c: Report to profile when we are about-to-call and just-called wrt. a function. alloc.c, eval.c: Allow for "fake" backtrace frames, for internal sections (used by profile and `backtrace-with-internal-sections'. event-Xt.c, event-gtk.c, event-msw.c, event-tty.c: Record when we are actually blocking on an event, for profile's sake. event-stream.c: Record internal profiling sections for getting, dispatching events. extents.c: Record internal profiling sections for map_extents. hash.c, hash.h: Add pregrow_hash_table_if_necessary(). (Used in profile code since the signal handler is the main grower but can't allow a realloc(). We make sure, at critical points, that the table is large enough.) lread.c: Create internal profiling sections for `load' (which may be triggered internally by autoload, etc.). redisplay.c: Remove old profile_redisplay_flag. Use new macros to declare internal profiling section for redisplay. text.c: Use new macros to declare internal profiling sections for char-byte conversion and internal-external conversion. SEMI-UNRELATED CHANGES: ----------------------- text.c: Update the long comments.
author ben
date Thu, 13 Feb 2003 09:57:08 +0000
parents 3078fd1074e8
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
448
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
1 /*
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
2 * Copyright (c) 2000, Red Hat, Inc.
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
3 *
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
4 * This program is free software; you can redistribute it and/or modify
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
5 * it under the terms of the GNU General Public License as published by
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
6 * the Free Software Foundation; either version 2 of the License, or
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
7 * (at your option) any later version.
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
8 *
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
9 * A copy of the GNU General Public License can be found at
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
10 * http://www.gnu.org/
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
11 *
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
12 * Written by DJ Delorie <dj@cygnus.com>
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
13 *
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
14 */
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
15
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
16 /* Simple hash class for install.cc */
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
17
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
18 #include "win32.h"
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
19 #include <stdlib.h>
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
20 #include <string.h>
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
21
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
22 #include "hash.h"
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
23
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
24 class hash_internals {
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
25 public:
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
26 char **keys;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
27 int numkeys;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
28 int maxkeys;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
29 int prev_index;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
30 };
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
31
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
32 hash::hash ()
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
33 {
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
34 h = new hash_internals;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
35 h->numkeys = 0;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
36 h->maxkeys = 10;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
37 h->keys = (char **) malloc (h->maxkeys * sizeof (char *));
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
38 h->prev_index = 0;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
39 }
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
40
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
41 hash::~hash ()
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
42 {
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
43 free (h->keys);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
44 free (h);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
45 }
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
46
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
47
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
48 void
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
49 hash::add (char *string)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
50 {
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
51 int i;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
52 for (i=0; i<h->numkeys; i++)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
53 if (strcmp (h->keys[i], string) == 0)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
54 return;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
55 if (h->numkeys >= h->maxkeys)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
56 {
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
57 h->maxkeys += 10;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
58 h->keys = (char **) realloc (h->keys, h->maxkeys * sizeof (char *));
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
59 }
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
60
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
61 h->keys[h->numkeys] = _strdup (string);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
62 h->numkeys ++;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
63 }
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
64
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
65
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
66 int
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
67 hash::has (char *string)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
68 {
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
69 int i;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
70 for (i=0; i<h->numkeys; i++)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
71 if (strcmp (h->keys[i], string) == 0)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
72 return 1;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
73 return 0;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
74 }
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
75
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
76 char *
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
77 hash::enumerate (char *prev)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
78 {
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
79 if (prev == 0)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
80 h->prev_index = -1;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
81 h->prev_index ++;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
82 if (h->prev_index >= h->numkeys)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
83 return 0;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
84 return h->keys[h->prev_index];
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
85 }
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
86
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
87 static int CDECL
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
88 rev_len (const void *va, const void *vb)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
89 {
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
90 char *a = *(char **)va;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
91 char *b = *(char **)vb;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
92 return strcmp (b, a);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
93 }
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
94
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
95 void
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
96 hash::reverse_sort ()
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
97 {
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
98 qsort (h->keys, h->numkeys, sizeof (h->keys[0]), rev_len);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
99 }