Mercurial > hg > xemacs-beta
annotate netinstall/hash.cc @ 5014:c2e0c3af5fe3
cleanups to debug-print, try harder to make it work during GC
-------------------- ChangeLog entries follow: --------------------
src/ChangeLog addition:
2010-02-08 Ben Wing <ben@xemacs.org>
* emacs.c:
* emacs.c (assert_failed):
Fix comments about when inhibit_non_essential_printing_operations
is set and how used. Increment/decrement in assert_failed rather
than just setting/resetting to avoid hosing things in case we're
called when the value is already non-zero. Similarly increment/
decrement in_assert_failed.
* gc.c (gc_prepare):
* gc.c (gc_finish):
Increment/decrement inhibit_non_essential_printing_operations
rather than setting/resetting.
* print.c:
* print.c (debug_out):
* print.c (write_string_to_alternate_debugging_output):
* print.c (restore_inhibit_non_essential_conversion_operations):
* print.c (debug_print_exit):
* print.c (debug_print_enter):
* print.c (debug_prin1):
* print.c (debug_p4):
* print.c (ext_print_begin):
* print.c (ext_print_end):
* print.c (external_debug_print):
* print.c (debug_p3):
* print.c (debug_backtrace):
* print.c (debug_short_backtrace):
* print.c (vars_of_print):
Lots of cleanup. Fix debug_out() so it binds
inhibit_non_essential_printing_operations around it to ensure no
conversion. Remove many other places that set the same var since
the lower-level functions now all do it. A few other places, add
inhibit_non_essential_printing_operations bindings.Extract the
code out that sets up and resets lots of bindings in debug_prin1()
so that debug_backtrace() can use it, and rewrite it to use the
new STORE_VOID_IN_LISP() rather than having to have a single
static opaque structure holding all the bindings (and not handling
reentrancy). Fix raw `char' to be `CIbyte' in the declaration of
`alternate_do_string'.
* signal.c (check_what_happened):
Fix bug: Don't try to check for QUIT when
inhibit_non_essential_printing_operations or we may screw things
up if QUIT happens during debug printing.
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Mon, 08 Feb 2010 07:00:24 -0600 |
| parents | 3078fd1074e8 |
| children |
| rev | line source |
|---|---|
| 448 | 1 /* |
| 2 * Copyright (c) 2000, Red Hat, Inc. | |
| 3 * | |
| 4 * This program is free software; you can redistribute it and/or modify | |
| 5 * it under the terms of the GNU General Public License as published by | |
| 6 * the Free Software Foundation; either version 2 of the License, or | |
| 7 * (at your option) any later version. | |
| 8 * | |
| 9 * A copy of the GNU General Public License can be found at | |
| 10 * http://www.gnu.org/ | |
| 11 * | |
| 12 * Written by DJ Delorie <dj@cygnus.com> | |
| 13 * | |
| 14 */ | |
| 15 | |
| 16 /* Simple hash class for install.cc */ | |
| 17 | |
| 18 #include "win32.h" | |
| 19 #include <stdlib.h> | |
| 20 #include <string.h> | |
| 21 | |
| 22 #include "hash.h" | |
| 23 | |
| 24 class hash_internals { | |
| 25 public: | |
| 26 char **keys; | |
| 27 int numkeys; | |
| 28 int maxkeys; | |
| 29 int prev_index; | |
| 30 }; | |
| 31 | |
| 32 hash::hash () | |
| 33 { | |
| 34 h = new hash_internals; | |
| 35 h->numkeys = 0; | |
| 36 h->maxkeys = 10; | |
| 37 h->keys = (char **) malloc (h->maxkeys * sizeof (char *)); | |
| 38 h->prev_index = 0; | |
| 39 } | |
| 40 | |
| 41 hash::~hash () | |
| 42 { | |
| 43 free (h->keys); | |
| 44 free (h); | |
| 45 } | |
| 46 | |
| 47 | |
| 48 void | |
| 49 hash::add (char *string) | |
| 50 { | |
| 51 int i; | |
| 52 for (i=0; i<h->numkeys; i++) | |
| 53 if (strcmp (h->keys[i], string) == 0) | |
| 54 return; | |
| 55 if (h->numkeys >= h->maxkeys) | |
| 56 { | |
| 57 h->maxkeys += 10; | |
| 58 h->keys = (char **) realloc (h->keys, h->maxkeys * sizeof (char *)); | |
| 59 } | |
| 60 | |
| 61 h->keys[h->numkeys] = _strdup (string); | |
| 62 h->numkeys ++; | |
| 63 } | |
| 64 | |
| 65 | |
| 66 int | |
| 67 hash::has (char *string) | |
| 68 { | |
| 69 int i; | |
| 70 for (i=0; i<h->numkeys; i++) | |
| 71 if (strcmp (h->keys[i], string) == 0) | |
| 72 return 1; | |
| 73 return 0; | |
| 74 } | |
| 75 | |
| 76 char * | |
| 77 hash::enumerate (char *prev) | |
| 78 { | |
| 79 if (prev == 0) | |
| 80 h->prev_index = -1; | |
| 81 h->prev_index ++; | |
| 82 if (h->prev_index >= h->numkeys) | |
| 83 return 0; | |
| 84 return h->keys[h->prev_index]; | |
| 85 } | |
| 86 | |
| 87 static int CDECL | |
| 88 rev_len (const void *va, const void *vb) | |
| 89 { | |
| 90 char *a = *(char **)va; | |
| 91 char *b = *(char **)vb; | |
| 92 return strcmp (b, a); | |
| 93 } | |
| 94 | |
| 95 void | |
| 96 hash::reverse_sort () | |
| 97 { | |
| 98 qsort (h->keys, h->numkeys, sizeof (h->keys[0]), rev_len); | |
| 99 } |