annotate netinstall/concat.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
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 /* See concat.h. Note that we canonicalize the result, this avoids
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
17 multiple slashes being interpreted as UNCs. */
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
18
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
19 #include "win32.h"
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
20 #include <stdarg.h>
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
21 #include <stdlib.h>
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
22 #include <string.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 char * CDECL
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
25 concat (char *s, ...)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
26 {
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
27 int len;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
28 char *rv, *arg;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
29 va_list v;
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 if (!s)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
32 return 0;
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 len = strlen (s);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
35
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
36 va_start (v, s);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
37 while (1)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
38 {
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
39 arg = va_arg (v, char *);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
40 if (arg == 0)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
41 break;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
42 len += strlen (arg);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
43 }
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
44 va_end (v);
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 rv = (char *) malloc (len+1);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
47 strcpy (rv, s);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
48 va_start (v, s);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
49 while (1)
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 arg = va_arg (v, char *);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
52 if (arg == 0)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
53 break;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
54 strcat (rv, arg);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
55 }
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
56 va_end (v);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
57
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
58 /* concat is only used for urls and files, so we can safely
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
59 canonicalize the results */
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
60 char *d;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
61 for (s=rv; *s; s++)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
62 if (*s == '\\')
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
63 *s = '/';
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
64 for (s=d=rv; *s; s++)
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 *d++ = *s;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
67 /* special case for URLs */
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
68 if (*s == ':' && s[1] == '/' && s[2] == '/' && s > rv+1)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
69 {
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
70 *d++ = *++s;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
71 *d++ = *++s;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
72 }
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
73 else if (*s == '/')
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
74 while (s[1] == '/')
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
75 s++;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
76 }
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
77 *d = 0;
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 return rv;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
80 }
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
81
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
82 char *
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
83 backslash (char *s)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
84 {
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
85 for (char *t = s; *t; t++)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
86 if (*t == '/')
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
87 *t = '\\';
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
88 return s;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
89 }