Mercurial > hg > xemacs-beta
view 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 |
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> * */ /* The purpose of this file is to get and parse the setup.ini file from the mirror site. A few support routines for the bison and flex parsers are provided also. We check to see if this setup.ini is older than the one we used last time, and if so, warn the user. */ #include "win32.h" #include <stdio.h> #include <stdlib.h> #include <stdarg.h> #include "ini.h" #include "resource.h" #include "concat.h" #include "state.h" #include "geturl.h" #include "dialog.h" #include "msg.h" #include "mkdir.h" #include "log.h" #include "reginfo.h" #include "version.h" unsigned int setup_timestamp = 0; char *setup_version = 0; extern "C" int yyparse (); /*extern int yydebug;*/ static char *error_buf = 0; static int error_count = 0; void do_ini (HINSTANCE h) { char *ini_file = get_url_to_string (concat (MIRROR_SITE, "/setup.ini", 0)); dismiss_url_status_dialog (); if (!ini_file) { note (IDS_SETUPINI_MISSING, MIRROR_SITE); next_dialog = IDD_SITE; return; } package = 0; npackages = 0; setup_timestamp = 0; setup_version = 0; ini_init (ini_file); setup_timestamp = 0; /*yydebug = 1;*/ if (yyparse () || error_count > 0) { if (error_count == 1) MessageBox (0, error_buf, "Parse Error", 0); else MessageBox (0, error_buf, "Parse Errors", 0); } else { /* save known-good setup.ini locally */ FILE *inif = fopen ("setup.ini", "wb"); if (inif) { fwrite (ini_file, 1, strlen (ini_file), inif); fclose (inif); } } if (root_dir) { mkdir_p (1, concat (root_dir, XEMACS_SETUP_DIR, 0)); unsigned int old_timestamp = 0; FILE *ots = fopen (concat (root_dir, XEMACS_SETUP_DIR, "timestamp", 0), "rt"); if (ots) { fscanf (ots, "%u", &old_timestamp); fclose (ots); if (old_timestamp && setup_timestamp && (old_timestamp > setup_timestamp)) { int yn = yesno (IDS_OLD_SETUPINI); if (yn == IDNO) exit_setup (1); } } if (setup_timestamp) { FILE *nts = fopen (concat (root_dir, XEMACS_SETUP_DIR, "timestamp", 0), "wt"); if (nts) { fprintf (nts, "%u", setup_timestamp); fclose (nts); } } } msg ("setup_version is %s, our_version is %s", setup_version? setup_version : "(null)", version); if (setup_version) { char *ini_version = canonicalize_version (setup_version); char *our_version = canonicalize_version (version); if (strcmp (our_version, ini_version) < 0) note (IDS_OLD_SETUP_VERSION, version, setup_version); } next_dialog = IDD_CHOOSE; } extern "C" int yylineno; extern "C" int CDECL yyerror (char *s, ...) { char buf[1000]; int len; sprintf (buf, "setup.ini line %d: ", yylineno); va_list args; va_start (args, s); vsprintf (buf + strlen (buf), s, args); OutputDebugString (buf); if (error_buf) { strcat (error_buf, "\n"); len = strlen (error_buf) + strlen (buf) + 5; error_buf = (char *) realloc (error_buf, len); strcat (error_buf, buf); } else { len = strlen (buf) + 5; error_buf = (char *) malloc (len); strcpy (error_buf, buf); } error_count++; return 0; } extern "C" int CDECL fprintf (FILE *f, const char *s, ...); static char stderrbuf[1000]; int CDECL fprintf (FILE *f, const char *fmt, ...) { char buf[1000]; int rv; va_list args; va_start (args, fmt); if (f == stderr) { rv = vsprintf (buf, fmt, args); strcat (stderrbuf, buf); if (char *nl = strchr (stderrbuf, '\n')) { *nl = 0; /*OutputDebugString (stderrbuf);*/ MessageBox (0, buf, "XEmacs Setup", 0); stderrbuf[0] = 0; } } else { rv = vfprintf (f, fmt, args); } return rv; }