Mercurial > hg > xemacs-beta
view netinstall/site.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 (2010-03-13) |
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 the list of mirror sites and ask the user which mirror site they want to download from. */ #include "win32.h" #include <stdio.h> #include <stdlib.h> #include <string.h> #include "dialog.h" #include "resource.h" #include "state.h" #include "geturl.h" #include "msg.h" #include "concat.h" #include "regedit.h" #include "reginfo.h" #include "log.h" #include "port.h" #define NO_IDX (-1) #define OTHER_IDX (-2) typedef struct { char *url; char *displayed_url; char *sort_key; } site_list_type; static site_list_type *site_list = 0; static int list_idx = NO_IDX; static int mirror_idx = NO_IDX; static void check_if_enable_next (HWND h) { EnableWindow (GetDlgItem (h, IDOK), (mirror_idx != NO_IDX) ? 1 : 0); } static void load_dialog (HWND h) { HWND listbox = GetDlgItem (h, IDC_URL_LIST); SendMessage (listbox, LB_SETCURSEL, list_idx, 0); check_if_enable_next (h); } static void save_dialog (HWND h) { HWND listbox = GetDlgItem (h, IDC_URL_LIST); list_idx = SendMessage (listbox, LB_GETCURSEL, 0, 0); if (list_idx == LB_ERR) { mirror_site = 0; mirror_idx = NO_IDX; list_idx = NO_IDX; } else { mirror_idx = SendMessage (listbox, LB_GETITEMDATA, list_idx, 0); if (mirror_idx == OTHER_IDX) mirror_site = 0; else mirror_site = site_list[mirror_idx].url; } } static void get_root_dir () { int issystem, isnative; if (root_dir) return; root_dir = find_root_location (&issystem, &isnative); } void save_site_url () { if (! MIRROR_SITE) return; get_root_dir (); if (! root_dir) return; FILE *f = fopen (concat (root_dir, XEMACS_SETUP_DIR, "last-mirror", 0), "wb"); if (!f) return; fprintf (f, "%s\n", MIRROR_SITE); fclose (f); } static BOOL dialog_cmd (HWND h, int id, HWND hwndctl, UINT code) { switch (id) { case IDC_URL_LIST: save_dialog (h); check_if_enable_next (h); break; case IDOK: save_dialog (h); if (mirror_idx == OTHER_IDX) NEXT (IDD_OTHER_URL); else { other_url = 0; save_site_url (); NEXT (IDD_S_LOAD_INI); } break; case IDC_BACK: save_dialog (h); NEXT (IDD_NET); break; case IDCANCEL: NEXT (0); break; } return FALSE; } static BOOL CALLBACK dialog_proc (HWND h, UINT message, WPARAM wParam, LPARAM lParam) { int i, j; HWND listbox; switch (message) { case WM_INITDIALOG: listbox = GetDlgItem (h, IDC_URL_LIST); for (i=0; site_list[i].url; i++) { j = SendMessage (listbox, LB_ADDSTRING, 0, (LPARAM)site_list[i].displayed_url); SendMessage (listbox, LB_SETITEMDATA, j, i); } j = SendMessage (listbox, LB_ADDSTRING, 0, (LPARAM)"Other URL"); SendMessage (listbox, LB_SETITEMDATA, j, OTHER_IDX); load_dialog (h); return FALSE; case WM_COMMAND: return HANDLE_WM_COMMAND (h, wParam, lParam, dialog_cmd); } return FALSE; } static int CDECL site_sort (const void *va, const void *vb) { site_list_type *a = (site_list_type *)va; site_list_type *b = (site_list_type *)vb; return strcmp (a->sort_key, b->sort_key); } static int get_site_list (HINSTANCE h) { char mirror_url[1000]; if (LoadString (h, IDS_MIRROR_LST, mirror_url, sizeof (mirror_url)) <= 0) return 1; char *mirrors = get_url_to_string (mirror_url); dismiss_url_status_dialog (); if (!mirrors) return 1; char *bol, *eol, *nl; /* null plus account for possibly missing NL plus account for "Other URL" from previous run. */ int nmirrors = 3; for (bol=mirrors; *bol; bol++) if (*bol == '\n') nmirrors ++; site_list = (site_list_type *) malloc (nmirrors * sizeof (site_list_type)); nmirrors = 0; nl = mirrors; while (*nl) { bol = nl; for (eol = bol; *eol && *eol != '\n'; eol++) ; if (*eol) nl = eol+1; else nl = eol; while (eol > bol && eol[-1] == '\r') eol--; *eol = 0; if (bol[0] != '#' && bol[0] > ' ') { char *semi = strchr (bol, ';'); if (semi) *semi = 0; site_list[nmirrors].url = _strdup (bol); site_list[nmirrors].displayed_url = _strdup (bol); char *dot = strchr (site_list[nmirrors].displayed_url, '.'); if (dot) { dot = strchr (dot, '/'); if (dot) *dot = 0; } site_list[nmirrors].sort_key = (char *) malloc (2*strlen (bol) + 3); dot = site_list[nmirrors].displayed_url; dot += strlen (dot); char *dp = site_list[nmirrors].sort_key; while (dot != site_list[nmirrors].displayed_url) { if (*dot == '.' || *dot == '/') { char *sp; if (dot[3] == 0) *dp++ = '~'; /* sort .com/.edu/.org together */ for (sp=dot+1; *sp && *sp != '.' && *sp != '/';) *dp++ = *sp++; *dp++ = ' '; } dot--; } *dp++ = ' '; strcpy (dp, site_list[nmirrors].displayed_url); nmirrors++; } } site_list[nmirrors].url = 0; qsort (site_list, nmirrors, sizeof (site_list_type), site_sort); return 0; } /* List of machines that should not be used by default when saved in "last-mirror". */ #define NOSAVE1 "ftp://ftp.xemacs.org/" #define NOSAVE1_LEN (sizeof ("ftp://ftp.xemacs.org/") - 1) static void get_initial_list_idx () { get_root_dir (); if (! root_dir) return; FILE *f = fopen (concat (root_dir, XEMACS_SETUP_DIR, "last-mirror", 0), "rt"); if (!f) return; char site[1000]; site[0]='\0'; char * fg_ret = fgets (site, 1000, f); fclose (f); if (! fg_ret) return; char *eos = site + strlen (site) - 1; while (eos >= site && (*eos == '\n' || *eos == '\r')) *eos-- = '\0'; if (eos < site) return; int i; for (i = 0; site_list[i].url; i++) if (strcmp (site_list[i].url, site) == 0) break; if (! site_list[i].url) { /* Don't default to certain machines ever since they suffer from bandwidth limitations. */ if (strnicmp (site, NOSAVE1, NOSAVE1_LEN) == 0) return; site_list[i].displayed_url = site_list[i].url = _strdup (site); site_list[i+1].url = 0; } mirror_idx = list_idx = i; } void do_site (HINSTANCE h) { int rv = 0; if (site_list == 0) if (get_site_list (h)) { NEXT (IDD_NET); return; } get_initial_list_idx (); rv = DialogBox (h, MAKEINTRESOURCE (IDD_SITE), 0, dialog_proc); if (rv == -1) fatal (IDS_DIALOG_FAILED); if (mirror_idx != OTHER_IDX) log (0, "site: %s", mirror_site); }