Mercurial > hg > xemacs-beta
annotate netinstall/ini.cc @ 5142:f965e31a35f0
reduce lcrecord headers to 2 words, rename printing_unreadable_object
-------------------- ChangeLog entries follow: --------------------
man/ChangeLog addition:
2010-03-13 Ben Wing <ben@xemacs.org>
* internals/internals.texi (Working with Lisp Objects):
* internals/internals.texi (Writing Macros):
* internals/internals.texi (lrecords):
More rewriting to correspond with changes from
*LRECORD* to *LISP_OBJECT*.
modules/ChangeLog addition:
2010-03-13 Ben Wing <ben@xemacs.org>
* postgresql/postgresql.c (print_pgconn):
* postgresql/postgresql.c (print_pgresult):
printing_unreadable_object -> printing_unreadable_object_fmt.
2010-03-13 Ben Wing <ben@xemacs.org>
* ldap/eldap.c (print_ldap):
printing_unreadable_object -> printing_unreadable_object_fmt.
src/ChangeLog addition:
2010-03-13 Ben Wing <ben@xemacs.org>
* alloc.c (alloc_sized_lrecord_1):
* alloc.c (alloc_sized_lrecord_array):
* alloc.c (old_alloc_sized_lcrecord):
* alloc.c (disksave_object_finalization_1):
* alloc.c (mark_lcrecord_list):
* alloc.c (alloc_managed_lcrecord):
* alloc.c (free_managed_lcrecord):
* alloc.c (tick_lcrecord_stats):
* alloc.c (sweep_lcrecords_1):
* buffer.c (print_buffer):
* buffer.c (DEFVAR_BUFFER_LOCAL_1):
* casetab.c:
* casetab.c (print_case_table):
* console.c (print_console):
* console.c (DEFVAR_CONSOLE_LOCAL_1):
* data.c (print_weak_list):
* data.c (print_weak_box):
* data.c (print_ephemeron):
* data.c (ephemeron_equal):
* database.c (print_database):
* database.c (finalize_database):
* device-msw.c (sync_printer_with_devmode):
* device-msw.c (print_devmode):
* device-msw.c (finalize_devmode):
* device.c:
* device.c (print_device):
* elhash.c:
* elhash.c (print_hash_table):
* eval.c (print_subr):
* eval.c (print_multiple_value):
* event-stream.c (event_stream_resignal_wakeup):
* events.c (clear_event_resource):
* events.c (zero_event):
* events.c (print_event):
* extents.c:
* extents.c (print_extent):
* file-coding.c (print_coding_system):
* font-mgr.c:
* font-mgr.c (Ffc_init):
* frame.c:
* frame.c (print_frame):
* gc.c:
* gc.c (GC_CHECK_NOT_FREE):
* glyphs.c:
* glyphs.c (print_image_instance):
* glyphs.c (print_glyph):
* gui.c (print_gui_item):
* gui.c (copy_gui_item):
* keymap.c (print_keymap):
* keymap.c (MARKED_SLOT):
* lisp.h:
* lisp.h (struct Lisp_String):
* lisp.h (DEFUN):
* lisp.h (DEFUN_NORETURN):
* lrecord.h:
* lrecord.h (NORMAL_LISP_OBJECT_UID):
* lrecord.h (struct lrecord_header):
* lrecord.h (set_lheader_implementation):
* lrecord.h (struct old_lcrecord_header):
* lrecord.h (struct free_lcrecord_header):
* marker.c (print_marker):
* mule-charset.c:
* mule-charset.c (print_charset):
* objects.c (print_color_instance):
* objects.c (print_font_instance):
* objects.c (finalize_font_instance):
* print.c (print_cons):
* print.c (printing_unreadable_object_fmt):
* print.c (printing_unreadable_lisp_object):
* print.c (external_object_printer):
* print.c (internal_object_printer):
* print.c (debug_p4):
* print.c (ext_print_begin):
* process.c (print_process):
* rangetab.c (print_range_table):
* rangetab.c (range_table_equal):
* scrollbar.c (free_scrollbar_instance):
* specifier.c (print_specifier):
* specifier.c (finalize_specifier):
* symbols.c (guts_of_unbound_marker):
* symeval.h:
* symeval.h (DEFVAR_SYMVAL_FWD):
* tooltalk.c:
* tooltalk.c (print_tooltalk_message):
* tooltalk.c (print_tooltalk_pattern):
* ui-gtk.c (ffi_object_printer):
* ui-gtk.c (emacs_gtk_object_printer):
* ui-gtk.c (emacs_gtk_boxed_printer):
* window.c (print_window):
* window.c (free_window_mirror):
* window.c (debug_print_window):
* xemacs.def.in.in:
(1) printing_unreadable_object -> printing_unreadable_object_fmt.
(2) printing_unreadable_lcrecord -> printing_unreadable_lisp_object
and fix up so it no longer requires an lcrecord.
These previous changes eliminate most of the remaining places where
the terms `lcrecord' and `lrecord' occurred outside of specialized
code.
(3) Fairly major change: Reduce the number of words in an lcrecord
from 3 to 2. The third word consisted of a uid that duplicated the
lrecord uid, and a single free bit, which was moved into the lrecord
structure. This reduces the size of the `uid' slot from 21 bits to
20 bits. Arguably this isn't enough -- we could easily have more than
1,000,000 or so objects created in a session. The answer is
(a) It doesn't really matter if we overflow the uid field because
it's only used for debugging, to identify an object uniquely
(or pretty much so).
(b) If we cared about it overflowing and wanted to reduce this,
we could make it so that cons, string, float and certain other
frob-block types that never print out the uid simply don't
store a uid in them and don't increment the lrecord_uid_counter.
(4) In conjunction with (3), create new macro NORMAL_LISP_OBJECT_UID()
and use it to abstract out the differences between NEWGC and old-GC
in accessing the `uid' value from a "normal Lisp Object pointer".
(5) In events.c, use zero_nonsized_lisp_object() in place of custom-
written equivalent. In font-mgr.c use external_object_printer()
in place of custom-written equivalents.
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Sat, 13 Mar 2010 05:38:08 -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 /* The purpose of this file is to get and parse the setup.ini file | |
| 17 from the mirror site. A few support routines for the bison and | |
| 18 flex parsers are provided also. We check to see if this setup.ini | |
| 19 is older than the one we used last time, and if so, warn the user. */ | |
| 20 | |
| 21 #include "win32.h" | |
| 22 | |
| 23 #include <stdio.h> | |
| 24 #include <stdlib.h> | |
| 25 #include <stdarg.h> | |
| 26 | |
| 27 #include "ini.h" | |
| 28 #include "resource.h" | |
| 29 #include "concat.h" | |
| 30 #include "state.h" | |
| 31 #include "geturl.h" | |
| 32 #include "dialog.h" | |
| 33 #include "msg.h" | |
| 34 #include "mkdir.h" | |
| 35 #include "log.h" | |
| 36 #include "reginfo.h" | |
| 37 #include "version.h" | |
| 38 | |
| 39 unsigned int setup_timestamp = 0; | |
| 40 char *setup_version = 0; | |
| 41 | |
| 42 extern "C" int yyparse (); | |
| 43 /*extern int yydebug;*/ | |
| 44 | |
| 45 static char *error_buf = 0; | |
| 46 static int error_count = 0; | |
| 47 | |
| 48 void | |
| 49 do_ini (HINSTANCE h) | |
| 50 { | |
| 51 char *ini_file = get_url_to_string (concat (MIRROR_SITE, "/setup.ini", 0)); | |
| 52 dismiss_url_status_dialog (); | |
| 53 | |
| 54 if (!ini_file) | |
| 55 { | |
| 56 note (IDS_SETUPINI_MISSING, MIRROR_SITE); | |
| 57 next_dialog = IDD_SITE; | |
| 58 return; | |
| 59 } | |
| 60 | |
| 61 package = 0; | |
| 62 npackages = 0; | |
| 63 setup_timestamp = 0; | |
| 64 setup_version = 0; | |
| 65 | |
| 66 ini_init (ini_file); | |
| 67 | |
| 68 setup_timestamp = 0; | |
| 69 /*yydebug = 1;*/ | |
| 70 | |
| 71 if (yyparse () || error_count > 0) | |
| 72 { | |
| 73 if (error_count == 1) | |
| 74 MessageBox (0, error_buf, "Parse Error", 0); | |
| 75 else | |
| 76 MessageBox (0, error_buf, "Parse Errors", 0); | |
| 77 } | |
| 78 else | |
| 79 { | |
| 80 /* save known-good setup.ini locally */ | |
| 81 FILE *inif = fopen ("setup.ini", "wb"); | |
| 82 if (inif) | |
| 83 { | |
| 84 fwrite (ini_file, 1, strlen (ini_file), inif); | |
| 85 fclose (inif); | |
| 86 } | |
| 87 } | |
| 88 | |
| 89 if (root_dir) | |
| 90 { | |
| 91 mkdir_p (1, concat (root_dir, XEMACS_SETUP_DIR, 0)); | |
| 92 | |
| 93 unsigned int old_timestamp = 0; | |
| 94 FILE *ots = fopen (concat (root_dir, XEMACS_SETUP_DIR, "timestamp", 0), "rt"); | |
| 95 if (ots) | |
| 96 { | |
| 97 fscanf (ots, "%u", &old_timestamp); | |
| 98 fclose (ots); | |
| 99 if (old_timestamp && setup_timestamp | |
| 100 && (old_timestamp > setup_timestamp)) | |
| 101 { | |
| 102 int yn = yesno (IDS_OLD_SETUPINI); | |
| 103 if (yn == IDNO) | |
| 104 exit_setup (1); | |
| 105 } | |
| 106 } | |
| 107 if (setup_timestamp) | |
| 108 { | |
| 109 FILE *nts = fopen (concat (root_dir, XEMACS_SETUP_DIR, "timestamp", 0), "wt"); | |
| 110 if (nts) | |
| 111 { | |
| 112 fprintf (nts, "%u", setup_timestamp); | |
| 113 fclose (nts); | |
| 114 } | |
| 115 } | |
| 116 } | |
| 117 | |
| 118 msg ("setup_version is %s, our_version is %s", setup_version? setup_version : "(null)", version); | |
| 119 if (setup_version) | |
| 120 { | |
| 121 char *ini_version = canonicalize_version (setup_version); | |
| 122 char *our_version = canonicalize_version (version); | |
| 123 if (strcmp (our_version, ini_version) < 0) | |
| 124 note (IDS_OLD_SETUP_VERSION, version, setup_version); | |
| 125 } | |
| 126 | |
| 127 next_dialog = IDD_CHOOSE; | |
| 128 } | |
| 129 | |
| 130 extern "C" int yylineno; | |
| 131 | |
| 132 extern "C" int CDECL yyerror (char *s, ...) | |
| 133 { | |
| 134 char buf[1000]; | |
| 135 int len; | |
| 136 sprintf (buf, "setup.ini line %d: ", yylineno); | |
| 137 va_list args; | |
| 138 va_start (args, s); | |
| 139 vsprintf (buf + strlen (buf), s, args); | |
| 140 OutputDebugString (buf); | |
| 141 if (error_buf) | |
| 142 { | |
| 143 strcat (error_buf, "\n"); | |
| 144 len = strlen (error_buf) + strlen (buf) + 5; | |
| 145 error_buf = (char *) realloc (error_buf, len); | |
| 146 strcat (error_buf, buf); | |
| 147 } | |
| 148 else | |
| 149 { | |
| 150 len = strlen (buf) + 5; | |
| 151 error_buf = (char *) malloc (len); | |
| 152 strcpy (error_buf, buf); | |
| 153 } | |
| 154 error_count++; | |
| 155 return 0; | |
| 156 } | |
| 157 | |
| 158 extern "C" int CDECL fprintf (FILE *f, const char *s, ...); | |
| 159 | |
| 160 static char stderrbuf[1000]; | |
| 161 | |
| 162 int CDECL | |
| 163 fprintf (FILE *f, const char *fmt, ...) | |
| 164 { | |
| 165 char buf[1000]; | |
| 166 int rv; | |
| 167 va_list args; | |
| 168 va_start (args, fmt); | |
| 169 if (f == stderr) | |
| 170 { | |
| 171 rv = vsprintf (buf, fmt, args); | |
| 172 strcat (stderrbuf, buf); | |
| 173 if (char *nl = strchr (stderrbuf, '\n')) | |
| 174 { | |
| 175 *nl = 0; | |
| 176 /*OutputDebugString (stderrbuf);*/ | |
| 177 MessageBox (0, buf, "XEmacs Setup", 0); | |
| 178 stderrbuf[0] = 0; | |
| 179 } | |
| 180 | |
| 181 } | |
| 182 else | |
| 183 { | |
| 184 rv = vfprintf (f, fmt, args); | |
| 185 } | |
| 186 return rv; | |
| 187 } |