Mercurial > hg > xemacs-beta
annotate netinstall/localdir.cc @ 5157:1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
-------------------- ChangeLog entries follow: --------------------
lisp/ChangeLog addition:
2010-03-18 Ben Wing <ben@xemacs.org>
* diagnose.el (show-memory-usage):
Rewrite to take into account API changes in memory-usage functions.
src/ChangeLog addition:
2010-03-18 Ben Wing <ben@xemacs.org>
* alloc.c:
* alloc.c (disksave_object_finalization_1):
* alloc.c (lisp_object_storage_size):
* alloc.c (listu):
* alloc.c (listn):
* alloc.c (Fobject_memory_usage_stats):
* alloc.c (compute_memusage_stats_length):
* alloc.c (Fobject_memory_usage):
* alloc.c (Ftotal_object_memory_usage):
* alloc.c (malloced_storage_size):
* alloc.c (common_init_alloc_early):
* alloc.c (reinit_alloc_objects_early):
* alloc.c (reinit_alloc_early):
* alloc.c (init_alloc_once_early):
* alloc.c (syms_of_alloc):
* alloc.c (reinit_vars_of_alloc):
* buffer.c:
* buffer.c (struct buffer_stats):
* buffer.c (compute_buffer_text_usage):
* buffer.c (compute_buffer_usage):
* buffer.c (buffer_memory_usage):
* buffer.c (buffer_objects_create):
* buffer.c (syms_of_buffer):
* buffer.c (vars_of_buffer):
* console-impl.h (struct console_methods):
* dynarr.c (Dynarr_memory_usage):
* emacs.c (main_1):
* events.c (clear_event_resource):
* extents.c:
* extents.c (compute_buffer_extent_usage):
* extents.c (extent_objects_create):
* extents.h:
* faces.c:
* faces.c (compute_face_cachel_usage):
* faces.c (face_objects_create):
* faces.h:
* general-slots.h:
* glyphs.c:
* glyphs.c (compute_glyph_cachel_usage):
* glyphs.c (glyph_objects_create):
* glyphs.h:
* lisp.h:
* lisp.h (struct usage_stats):
* lrecord.h:
* lrecord.h (enum lrecord_type):
* lrecord.h (struct lrecord_implementation):
* lrecord.h (MC_ALLOC_CALL_FINALIZER_FOR_DISKSAVE):
* lrecord.h (DEFINE_DUMPABLE_LISP_OBJECT):
* lrecord.h (DEFINE_DUMPABLE_SIZABLE_LISP_OBJECT):
* lrecord.h (DEFINE_DUMPABLE_FROB_BLOCK_LISP_OBJECT):
* lrecord.h (DEFINE_DUMPABLE_FROB_BLOCK_SIZABLE_LISP_OBJECT):
* lrecord.h (DEFINE_DUMPABLE_INTERNAL_LISP_OBJECT):
* lrecord.h (DEFINE_DUMPABLE_SIZABLE_INTERNAL_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_SIZABLE_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_FROB_BLOCK_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_FROB_BLOCK_SIZABLE_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_INTERNAL_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_SIZABLE_INTERNAL_LISP_OBJECT):
* lrecord.h (MAKE_LISP_OBJECT):
* lrecord.h (DEFINE_DUMPABLE_MODULE_LISP_OBJECT):
* lrecord.h (DEFINE_DUMPABLE_MODULE_SIZABLE_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_MODULE_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_MODULE_SIZABLE_LISP_OBJECT):
* lrecord.h (MAKE_MODULE_LISP_OBJECT):
* lrecord.h (INIT_LISP_OBJECT):
* lrecord.h (INIT_MODULE_LISP_OBJECT):
* lrecord.h (UNDEF_LISP_OBJECT):
* lrecord.h (UNDEF_MODULE_LISP_OBJECT):
* lrecord.h (DECLARE_LISP_OBJECT):
* lrecord.h (DECLARE_MODULE_API_LISP_OBJECT):
* lrecord.h (DECLARE_MODULE_LISP_OBJECT):
* lstream.c:
* lstream.c (syms_of_lstream):
* lstream.c (vars_of_lstream):
* marker.c:
* marker.c (compute_buffer_marker_usage):
* mc-alloc.c (mc_alloced_storage_size):
* mc-alloc.h:
* mule-charset.c:
* mule-charset.c (struct charset_stats):
* mule-charset.c (compute_charset_usage):
* mule-charset.c (charset_memory_usage):
* mule-charset.c (mule_charset_objects_create):
* mule-charset.c (syms_of_mule_charset):
* mule-charset.c (vars_of_mule_charset):
* redisplay.c:
* redisplay.c (compute_rune_dynarr_usage):
* redisplay.c (compute_display_block_dynarr_usage):
* redisplay.c (compute_glyph_block_dynarr_usage):
* redisplay.c (compute_display_line_dynarr_usage):
* redisplay.c (compute_line_start_cache_dynarr_usage):
* redisplay.h:
* scrollbar-gtk.c (gtk_compute_scrollbar_instance_usage):
* scrollbar-msw.c (mswindows_compute_scrollbar_instance_usage):
* scrollbar-x.c (x_compute_scrollbar_instance_usage):
* scrollbar.c (compute_scrollbar_instance_usage):
* scrollbar.h:
* symbols.c:
* symbols.c (reinit_symbol_objects_early):
* symbols.c (init_symbols_once_early):
* symbols.c (reinit_symbols_early):
* symbols.c (defsymbol_massage_name_1):
* symsinit.h:
* ui-gtk.c:
* ui-gtk.c (emacs_gtk_object_getprop):
* ui-gtk.c (emacs_gtk_object_putprop):
* ui-gtk.c (ui_gtk_objects_create):
* unicode.c (compute_from_unicode_table_size_1):
* unicode.c (compute_to_unicode_table_size_1):
* unicode.c (compute_from_unicode_table_size):
* unicode.c (compute_to_unicode_table_size):
* window.c:
* window.c (struct window_stats):
* window.c (compute_window_mirror_usage):
* window.c (compute_window_usage):
* window.c (window_memory_usage):
* window.c (window_objects_create):
* window.c (syms_of_window):
* window.c (vars_of_window):
* window.h:
Redo memory-usage mechanism, make it general; add way of dynamically
initializing Lisp object types -- OBJECT_HAS_METHOD(), similar to
CONSOLE_HAS_METHOD().
(1) Create OBJECT_HAS_METHOD(), OBJECT_HAS_PROPERTY() etc. for
specifying that a Lisp object type has a particular method or
property. Call such methods with OBJECT_METH, MAYBE_OBJECT_METH,
OBJECT_METH_OR_GIVEN; retrieve properties with OBJECT_PROPERTY.
Methods that formerly required a DEFINE_*GENERAL_LISP_OBJECT() to
specify them (getprop, putprop, remprop, plist, disksave) now
instead use the dynamic-method mechanism. The main benefit of
this is that new methods or properties can be added without
requiring that the declaration statements of all existing methods
be modified. We have to make the `struct lrecord_implementation'
non-const, but I don't think this should have any effect on speed --
the only possible method that's really speed-critical is the
mark method, and we already extract those out into a separate
(non-const) array for increased cache locality.
Object methods need to be reinitialized after pdump, so we put
them in separate functions such as face_objects_create(),
extent_objects_create() and call them appropriately from emacs.c
The only current object property (`memusage_stats_list') that
objects can specify is a Lisp object and gets staticpro()ed so it
only needs to be set during dump time, but because it references
symbols that might not exist in a syms_of_() function, we
initialize it in vars_of_(). There is also an object property
(`num_extra_memusage_stats') that is automatically initialized based
on `memusage_stats_list'; we do that in reinit_vars_of_alloc(),
which is called after all vars_of_() functions are called.
`disksaver' method was renamed `disksave' to correspond with the
name normally given to the function (e.g. disksave_lstream()).
(2) Generalize the memory-usage mechanism in `buffer-memory-usage',
`window-memory-usage', `charset-memory-usage' into an object-type-
specific mechanism called by a single function
`object-memory-usage'. (Former function `object-memory-usage'
renamed to `total-object-memory-usage'). Generalize the mechanism
of different "slices" so that we can have different "classes" of
memory described and different "slices" onto each class; `t'
separates classes, `nil' separates slices. Currently we have
three classes defined: the memory of an object itself,
non-Lisp-object memory associated with the object (e.g. arrays or
dynarrs stored as fields in the object), and Lisp-object memory
associated with the object (other internal Lisp objects stored in
the object). This isn't completely finished yet and we might need
to further separate the "other internal Lisp objects" class into
two classes.
The memory-usage mechanism uses a `struct usage_stats' (renamed
from `struct overhead_stats') to describe a malloc-view onto a set
of allocated memory (listing how much was requested and various
types of overhead) and a more general `struct generic_usage_stats'
(with a `struct usage_stats' in it) to hold all statistics about
object memory. `struct generic_usage_stats' contains an array of
32 Bytecounts, which are statistics of unspecified semantics. The
intention is that individual types declare a corresponding struct
(e.g. `struct window_stats') with the same structure but with
specific fields in place of the array, corresponding to specific
statistics. The number of such statistics is an object property
computed from the list of tags (Lisp symbols describing the
statistics) stored in `memusage_stats_list'. The idea here is to
allow particular object types to customize the number and
semantics of the statistics where completely avoiding consing.
This doesn't matter so much yet, but the intention is to have the
memory usage of all objects computed at the end of GC, at the same
time as other statistics are currently computed. The values for
all statistics for a single type would be added up to compute
aggregate values for all objects of a specific type. To make this
efficient, we can't allow any memory allocation at all.
(3) Create some additional functions for creating lists that
specify the elements directly as args rather than indirectly through
an array: listn() (number of args given), listu() (list terminated
by Qunbound).
(4) Delete a bit of remaining unused C window_config stuff, also
unused lrecord_type_popup_data.
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Thu, 18 Mar 2010 10:50:06 -0500 |
| parents | 685b588e92d8 |
| 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 Andrej Borsenkow <Andrej.Borsenkow@mow.siemens.ru> | |
| 13 * based on work and suggestions of DJ Delorie | |
| 14 * | |
| 673 | 15 * Sync'ed with cinstall 2001-10-16 |
| 448 | 16 */ |
| 17 | |
| 18 /* The purpose of this file is to ask the user where they want the | |
| 19 root of the installation to be, and to ask whether the user prefers | |
| 20 text or binary mounts. */ | |
| 21 | |
| 22 #include "win32.h" | |
| 23 #include <shlobj.h> | |
| 24 #include <stdio.h> | |
| 25 #include <stdlib.h> | |
| 26 #include <ctype.h> | |
| 673 | 27 #include <io.h> |
| 448 | 28 |
| 673 | 29 #include "mkdir.h" |
| 448 | 30 #include "dialog.h" |
| 31 #include "resource.h" | |
| 32 #include "state.h" | |
| 33 #include "msg.h" | |
| 34 #include "concat.h" | |
| 35 #include "log.h" | |
| 36 | |
| 37 static void | |
| 38 check_if_enable_next (HWND h) | |
| 39 { | |
| 40 EnableWindow (GetDlgItem (h, IDOK), local_dir != 0); | |
| 41 } | |
| 42 | |
| 43 static void | |
| 44 load_dialog (HWND h) | |
| 45 { | |
| 46 eset (h, IDC_LOCAL_DIR, local_dir); | |
| 47 check_if_enable_next (h); | |
| 48 } | |
| 49 | |
| 50 static void | |
| 51 save_dialog (HWND h) | |
| 52 { | |
| 53 local_dir = eget (h, IDC_LOCAL_DIR, local_dir); | |
| 54 } | |
| 55 | |
| 56 | |
| 57 static int CALLBACK | |
| 58 browse_cb (HWND h, UINT m, LPARAM lp, LPARAM data) | |
| 59 { | |
| 60 switch (m) | |
| 61 { | |
| 62 case BFFM_INITIALIZED: | |
| 63 if (local_dir) | |
| 64 SendMessage (h, BFFM_SETSELECTION, TRUE, (LPARAM)local_dir); | |
| 65 break; | |
| 66 } | |
| 67 return 0; | |
| 68 } | |
| 69 | |
| 70 static void | |
| 71 browse (HWND h) | |
| 72 { | |
| 73 BROWSEINFO bi; | |
| 74 CHAR name[MAX_PATH]; | |
| 75 LPITEMIDLIST pidl; | |
| 76 memset (&bi, 0, sizeof (bi)); | |
| 77 bi.hwndOwner = h; | |
| 78 bi.pszDisplayName = name; | |
| 79 bi.lpszTitle = "Select download directory"; | |
| 80 bi.ulFlags = BIF_RETURNONLYFSDIRS; | |
| 81 bi.lpfn = browse_cb; | |
| 82 pidl = SHBrowseForFolder (&bi); | |
| 83 if (pidl) | |
| 84 { | |
| 85 if (SHGetPathFromIDList (pidl, name)) | |
| 86 eset (h, IDC_LOCAL_DIR, name); | |
| 87 } | |
| 88 } | |
| 89 | |
| 90 | |
| 91 static BOOL | |
| 92 dialog_cmd (HWND h, int id, HWND hwndctl, UINT code) | |
| 93 { | |
| 94 switch (id) | |
| 95 { | |
| 96 | |
| 97 case IDC_LOCAL_DIR: | |
| 98 save_dialog (h); | |
| 99 check_if_enable_next (h); | |
| 100 break; | |
| 101 | |
| 102 case IDC_LOCAL_DIR_BROWSE: | |
| 103 browse (h); | |
| 104 break; | |
| 105 | |
| 106 case IDOK: | |
| 107 save_dialog (h); | |
| 673 | 108 if (_access (local_dir, 0) != 0 && yesno (IDS_CREATE_DIR, local_dir) == IDYES) |
| 109 { | |
| 110 log (0, "Created install directory %s\n", local_dir); | |
| 111 mkdir_p (1, local_dir); | |
| 112 } | |
| 448 | 113 if (SetCurrentDirectoryA (local_dir)) |
| 114 { | |
| 115 switch (source) | |
| 116 { | |
| 117 case IDC_SOURCE_DOWNLOAD: | |
| 118 NEXT (IDD_NET); | |
| 119 break; | |
| 120 case IDC_SOURCE_NETINST: | |
| 121 case IDC_SOURCE_CWD: | |
| 122 NEXT (IDD_ROOT); | |
| 123 break; | |
| 124 default: | |
| 125 NEXT (0); | |
| 126 break; | |
| 127 } | |
| 128 } | |
| 129 else | |
| 130 note (IDS_ERR_CHDIR, local_dir); | |
| 131 | |
| 132 break; | |
| 133 | |
| 134 case IDC_BACK: | |
| 135 save_dialog (h); | |
| 136 NEXT (IDD_SOURCE); | |
| 137 break; | |
| 138 | |
| 139 case IDCANCEL: | |
| 140 NEXT (0); | |
| 141 break; | |
| 142 } | |
| 143 } | |
| 144 | |
| 145 static BOOL CALLBACK | |
| 146 dialog_proc (HWND h, UINT message, WPARAM wParam, LPARAM lParam) | |
| 147 { | |
| 148 switch (message) | |
| 149 { | |
| 150 case WM_INITDIALOG: | |
| 151 load_dialog (h); | |
| 152 return FALSE; | |
| 153 case WM_COMMAND: | |
| 154 return HANDLE_WM_COMMAND (h, wParam, lParam, dialog_cmd); | |
| 155 } | |
| 156 return FALSE; | |
| 157 } | |
| 158 | |
| 159 extern char cwd[_MAX_PATH]; | |
| 160 | |
| 161 void | |
| 162 do_local_dir (HINSTANCE h) | |
| 163 { | |
| 164 int rv = 0; | |
| 165 rv = DialogBox (h, MAKEINTRESOURCE (IDD_LOCAL_DIR), 0, dialog_proc); | |
| 166 if (rv == -1) | |
| 167 fatal (IDS_DIALOG_FAILED); | |
| 168 | |
| 169 log (0, "Selected local directory: %s", local_dir); | |
| 170 } | |
| 171 |