Mercurial > hg > xemacs-beta
annotate netinstall/site.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 | 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 the list of mirror sites and ask | |
| 17 the user which mirror site they want to download from. */ | |
| 18 | |
| 19 #include "win32.h" | |
| 20 #include <stdio.h> | |
| 21 #include <stdlib.h> | |
| 22 #include <string.h> | |
| 23 | |
| 24 #include "dialog.h" | |
| 25 #include "resource.h" | |
| 26 #include "state.h" | |
| 27 #include "geturl.h" | |
| 28 #include "msg.h" | |
| 29 #include "concat.h" | |
| 30 #include "regedit.h" | |
| 31 #include "reginfo.h" | |
| 32 #include "log.h" | |
| 33 | |
| 34 #include "port.h" | |
| 35 | |
| 36 #define NO_IDX (-1) | |
| 37 #define OTHER_IDX (-2) | |
| 38 | |
| 39 typedef struct { | |
| 40 char *url; | |
| 41 char *displayed_url; | |
| 42 char *sort_key; | |
| 43 } site_list_type; | |
| 44 | |
| 45 static site_list_type *site_list = 0; | |
| 46 static int list_idx = NO_IDX; | |
| 47 static int mirror_idx = NO_IDX; | |
| 48 | |
| 49 static void | |
| 50 check_if_enable_next (HWND h) | |
| 51 { | |
| 52 EnableWindow (GetDlgItem (h, IDOK), (mirror_idx != NO_IDX) ? 1 : 0); | |
| 53 } | |
| 54 | |
| 55 static void | |
| 56 load_dialog (HWND h) | |
| 57 { | |
| 58 HWND listbox = GetDlgItem (h, IDC_URL_LIST); | |
| 59 SendMessage (listbox, LB_SETCURSEL, list_idx, 0); | |
| 60 check_if_enable_next (h); | |
| 61 } | |
| 62 | |
| 63 static void | |
| 64 save_dialog (HWND h) | |
| 65 { | |
| 66 HWND listbox = GetDlgItem (h, IDC_URL_LIST); | |
| 67 list_idx = SendMessage (listbox, LB_GETCURSEL, 0, 0); | |
| 68 if (list_idx == LB_ERR) | |
| 69 { | |
| 70 mirror_site = 0; | |
| 71 mirror_idx = NO_IDX; | |
| 72 list_idx = NO_IDX; | |
| 73 } | |
| 74 else | |
| 75 { | |
| 76 mirror_idx = SendMessage (listbox, LB_GETITEMDATA, list_idx, 0); | |
| 77 if (mirror_idx == OTHER_IDX) | |
| 78 mirror_site = 0; | |
| 79 else | |
| 80 mirror_site = site_list[mirror_idx].url; | |
| 81 } | |
| 82 } | |
| 83 | |
| 84 static void | |
| 85 get_root_dir () | |
| 86 { | |
| 87 int issystem, isnative; | |
| 88 if (root_dir) | |
| 89 return; | |
| 90 root_dir = find_root_location (&issystem, &isnative); | |
| 91 } | |
| 92 | |
| 93 void | |
| 94 save_site_url () | |
| 95 { | |
| 96 if (! MIRROR_SITE) | |
| 97 return; | |
| 98 | |
| 99 get_root_dir (); | |
| 100 if (! root_dir) | |
| 101 return; | |
| 102 | |
| 103 FILE *f = fopen (concat (root_dir, XEMACS_SETUP_DIR, "last-mirror", 0), "wb"); | |
| 104 if (!f) | |
| 105 return; | |
| 106 fprintf (f, "%s\n", MIRROR_SITE); | |
| 107 fclose (f); | |
| 108 } | |
| 109 | |
| 110 static BOOL | |
| 111 dialog_cmd (HWND h, int id, HWND hwndctl, UINT code) | |
| 112 { | |
| 113 switch (id) | |
| 114 { | |
| 115 | |
| 116 case IDC_URL_LIST: | |
| 117 save_dialog (h); | |
| 118 check_if_enable_next (h); | |
| 119 break; | |
| 120 | |
| 121 case IDOK: | |
| 122 save_dialog (h); | |
| 123 if (mirror_idx == OTHER_IDX) | |
| 124 NEXT (IDD_OTHER_URL); | |
| 125 else | |
| 126 { | |
| 127 other_url = 0; | |
| 128 save_site_url (); | |
| 129 NEXT (IDD_S_LOAD_INI); | |
| 130 } | |
| 131 break; | |
| 132 | |
| 133 case IDC_BACK: | |
| 134 save_dialog (h); | |
| 135 NEXT (IDD_NET); | |
| 136 break; | |
| 137 | |
| 138 case IDCANCEL: | |
| 139 NEXT (0); | |
| 140 break; | |
| 141 } | |
| 142 return FALSE; | |
| 143 } | |
| 144 | |
| 145 static BOOL CALLBACK | |
| 146 dialog_proc (HWND h, UINT message, WPARAM wParam, LPARAM lParam) | |
| 147 { | |
| 148 int i, j; | |
| 149 HWND listbox; | |
| 150 switch (message) | |
| 151 { | |
| 152 case WM_INITDIALOG: | |
| 153 listbox = GetDlgItem (h, IDC_URL_LIST); | |
| 154 for (i=0; site_list[i].url; i++) | |
| 155 { | |
| 156 j = SendMessage (listbox, LB_ADDSTRING, 0, (LPARAM)site_list[i].displayed_url); | |
| 157 SendMessage (listbox, LB_SETITEMDATA, j, i); | |
| 158 } | |
| 159 j = SendMessage (listbox, LB_ADDSTRING, 0, (LPARAM)"Other URL"); | |
| 160 SendMessage (listbox, LB_SETITEMDATA, j, OTHER_IDX); | |
| 161 load_dialog (h); | |
| 162 return FALSE; | |
| 163 case WM_COMMAND: | |
| 164 return HANDLE_WM_COMMAND (h, wParam, lParam, dialog_cmd); | |
| 165 } | |
| 166 return FALSE; | |
| 167 } | |
| 168 | |
| 169 static int CDECL | |
| 170 site_sort (const void *va, const void *vb) | |
| 171 { | |
| 172 site_list_type *a = (site_list_type *)va; | |
| 173 site_list_type *b = (site_list_type *)vb; | |
| 174 return strcmp (a->sort_key, b->sort_key); | |
| 175 } | |
| 176 | |
| 177 static int | |
| 178 get_site_list (HINSTANCE h) | |
| 179 { | |
| 180 char mirror_url[1000]; | |
| 181 if (LoadString (h, IDS_MIRROR_LST, mirror_url, sizeof (mirror_url)) <= 0) | |
| 182 return 1; | |
| 183 char *mirrors = get_url_to_string (mirror_url); | |
| 184 dismiss_url_status_dialog (); | |
| 185 if (!mirrors) | |
| 186 return 1; | |
| 187 | |
| 188 char *bol, *eol, *nl; | |
| 189 | |
| 190 | |
| 191 /* null plus account for possibly missing NL plus account for "Other | |
| 192 URL" from previous run. */ | |
| 193 int nmirrors = 3; | |
| 194 | |
| 195 for (bol=mirrors; *bol; bol++) | |
| 196 if (*bol == '\n') | |
| 197 nmirrors ++; | |
| 198 | |
| 199 site_list = (site_list_type *) malloc (nmirrors * sizeof (site_list_type)); | |
| 200 nmirrors = 0; | |
| 201 | |
| 202 nl = mirrors; | |
| 203 while (*nl) | |
| 204 { | |
| 205 bol = nl; | |
| 206 for (eol = bol; *eol && *eol != '\n'; eol++) ; | |
| 207 if (*eol) | |
| 208 nl = eol+1; | |
| 209 else | |
| 210 nl = eol; | |
| 211 while (eol > bol && eol[-1] == '\r') | |
| 212 eol--; | |
| 213 *eol = 0; | |
| 214 if (bol[0] != '#' && bol[0] > ' ') | |
| 215 { | |
| 216 char *semi = strchr (bol, ';'); | |
| 217 if (semi) | |
| 218 *semi = 0; | |
| 219 site_list[nmirrors].url = _strdup (bol); | |
| 220 site_list[nmirrors].displayed_url = _strdup (bol); | |
| 221 char *dot = strchr (site_list[nmirrors].displayed_url, '.'); | |
| 222 if (dot) | |
| 223 { | |
| 224 dot = strchr (dot, '/'); | |
| 225 if (dot) | |
| 226 *dot = 0; | |
| 227 } | |
| 228 site_list[nmirrors].sort_key = (char *) malloc (2*strlen (bol) + 3); | |
| 229 | |
| 230 dot = site_list[nmirrors].displayed_url; | |
| 231 dot += strlen (dot); | |
| 232 char *dp = site_list[nmirrors].sort_key; | |
| 233 while (dot != site_list[nmirrors].displayed_url) | |
| 234 { | |
| 235 if (*dot == '.' || *dot == '/') | |
| 236 { | |
| 237 char *sp; | |
| 238 if (dot[3] == 0) | |
| 239 *dp++ = '~'; /* sort .com/.edu/.org together */ | |
| 240 for (sp=dot+1; *sp && *sp != '.' && *sp != '/';) | |
| 241 *dp++ = *sp++; | |
| 242 *dp++ = ' '; | |
| 243 } | |
| 244 dot--; | |
| 245 } | |
| 246 *dp++ = ' '; | |
| 247 strcpy (dp, site_list[nmirrors].displayed_url); | |
| 248 | |
| 249 nmirrors++; | |
| 250 } | |
| 251 } | |
| 252 site_list[nmirrors].url = 0; | |
| 253 | |
| 254 qsort (site_list, nmirrors, sizeof (site_list_type), site_sort); | |
| 255 | |
| 256 return 0; | |
| 257 } | |
| 258 | |
| 259 /* List of machines that should not be used by default when saved | |
| 260 in "last-mirror". */ | |
| 261 #define NOSAVE1 "ftp://ftp.xemacs.org/" | |
| 262 #define NOSAVE1_LEN (sizeof ("ftp://ftp.xemacs.org/") - 1) | |
| 263 | |
| 264 static void | |
| 265 get_initial_list_idx () | |
| 266 { | |
| 267 get_root_dir (); | |
| 268 if (! root_dir) | |
| 269 return; | |
| 270 | |
| 271 FILE *f = fopen (concat (root_dir, XEMACS_SETUP_DIR, "last-mirror", 0), "rt"); | |
| 272 if (!f) | |
| 273 return; | |
| 274 | |
| 275 char site[1000]; | |
| 276 site[0]='\0'; | |
| 277 char * fg_ret = fgets (site, 1000, f); | |
| 278 fclose (f); | |
| 279 if (! fg_ret) | |
| 280 return; | |
| 281 | |
| 282 char *eos = site + strlen (site) - 1; | |
| 283 while (eos >= site && (*eos == '\n' || *eos == '\r')) | |
| 284 *eos-- = '\0'; | |
| 285 | |
| 286 if (eos < site) | |
| 287 return; | |
| 288 | |
| 289 int i; | |
| 290 for (i = 0; site_list[i].url; i++) | |
| 291 if (strcmp (site_list[i].url, site) == 0) | |
| 292 break; | |
| 293 | |
| 294 if (! site_list[i].url) | |
| 295 { | |
| 296 /* Don't default to certain machines ever since they suffer | |
| 297 from bandwidth limitations. */ | |
| 298 if (strnicmp (site, NOSAVE1, NOSAVE1_LEN) == 0) | |
| 299 return; | |
| 300 site_list[i].displayed_url = | |
| 301 site_list[i].url = _strdup (site); | |
| 302 site_list[i+1].url = 0; | |
| 303 } | |
| 304 | |
| 305 mirror_idx = list_idx = i; | |
| 306 } | |
| 307 | |
| 308 void | |
| 309 do_site (HINSTANCE h) | |
| 310 { | |
| 311 int rv = 0; | |
| 312 | |
| 313 if (site_list == 0) | |
| 314 if (get_site_list (h)) | |
| 315 { | |
| 316 NEXT (IDD_NET); | |
| 317 return; | |
| 318 } | |
| 319 | |
| 320 get_initial_list_idx (); | |
| 321 | |
| 322 rv = DialogBox (h, MAKEINTRESOURCE (IDD_SITE), 0, dialog_proc); | |
| 323 if (rv == -1) | |
| 324 fatal (IDS_DIALOG_FAILED); | |
| 325 | |
| 326 if (mirror_idx != OTHER_IDX) | |
| 327 log (0, "site: %s", mirror_site); | |
| 328 } | |
| 329 |