Mercurial > hg > xemacs-beta
annotate src/procimpl.h @ 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 | a9c41067dd88 |
| children | 308d34e9f07d |
| rev | line source |
|---|---|
| 428 | 1 /* Processes implementation header |
| 2 Copyright (C) 1985, 1992, 1993, 1994 Free Software Foundation, Inc. | |
| 853 | 3 Copyright (C) 2002 Ben Wing. |
| 428 | 4 |
| 5 This file is part of XEmacs. | |
| 6 | |
| 7 XEmacs is free software; you can redistribute it and/or modify it | |
| 8 under the terms of the GNU General Public License as published by the | |
| 9 Free Software Foundation; either version 2, or (at your option) any | |
| 10 later version. | |
| 11 | |
| 12 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
| 13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 15 for more details. | |
| 16 | |
| 17 You should have received a copy of the GNU General Public License | |
| 18 along with XEmacs; see the file COPYING. If not, write to | |
| 19 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 20 Boston, MA 02111-1307, USA. */ | |
| 21 | |
| 1204 | 22 /* Synched up with: ????. Split out of process.h. */ |
| 23 | |
| 428 | 24 /* This file must be only included by the process implementation files: |
| 25 process-unix.c, process-msw.c etc. The Lisp_Process structure and other | |
| 26 contents of this file is not exported to the rest of the world */ | |
| 27 | |
| 440 | 28 #ifndef INCLUDED_procimpl_h_ |
| 29 #define INCLUDED_procimpl_h_ | |
| 428 | 30 |
| 31 /* | |
| 32 * Structure which keeps methods of the process implementation. | |
| 33 * There is only one object of this class exists in a particular | |
| 34 * XEmacs implementation. | |
| 35 */ | |
| 36 | |
| 37 /* #### Comment me... */ | |
| 38 | |
| 39 struct process_methods | |
| 40 { | |
| 440 | 41 void (*print_process_data) (Lisp_Process *proc, Lisp_Object printcharfun); |
|
5124
623d57b7fbe8
separate regular and disksave finalization, print method fixes.
Ben Wing <ben@xemacs.org>
parents:
5120
diff
changeset
|
42 void (*finalize_process_data) (Lisp_Process *proc); |
| 440 | 43 void (*alloc_process_data) (Lisp_Process *p); |
| 44 void (*init_process_io_handles) (Lisp_Process *p, | |
| 853 | 45 void* in, void* out, void *err, int flags); |
| 440 | 46 int (*create_process) (Lisp_Process *p, |
| 428 | 47 Lisp_Object *argv, int nargv, |
| 853 | 48 Lisp_Object program, Lisp_Object cur_dir, |
| 49 int separate_err); | |
| 440 | 50 int (*tooltalk_connection_p) (Lisp_Process *p); |
| 428 | 51 #ifdef HAVE_SOCKETS |
| 52 void (*open_network_stream) (Lisp_Object name, Lisp_Object host, | |
| 53 Lisp_Object service, Lisp_Object protocol, | |
| 54 void** vinfd, void** voutfd); | |
| 55 #ifdef HAVE_MULTICAST | |
| 56 void (*open_multicast_group) (Lisp_Object name, Lisp_Object dest, | |
| 57 Lisp_Object port, Lisp_Object ttl, | |
| 58 void** vinfd, void** voutfd); | |
| 59 #endif /* HAVE_MULTICAST */ | |
| 60 #endif /* HAVE_SOCKETS */ | |
| 61 Lisp_Object (*canonicalize_host_name) (Lisp_Object host); | |
| 440 | 62 int (*set_window_size) (Lisp_Process* p, int height, int width); |
| 428 | 63 void (*send_process) (Lisp_Object proc, struct lstream* lstream); |
| 64 void (*reap_exited_processes) (void); | |
| 440 | 65 void (*update_status_if_terminated) (Lisp_Process* p); |
| 428 | 66 void (*kill_child_process) (Lisp_Object proc, int signo, |
| 67 int current_group, int nomsg); | |
| 68 int (*kill_process_by_pid) (int pid, int sigcode); | |
| 69 int (*process_send_eof) (Lisp_Object proc); | |
| 853 | 70 void (*deactivate_process) (Lisp_Process *p, |
| 71 USID* in_usid, | |
| 72 USID* err_usid); | |
| 428 | 73 void (*init_process) (void); |
| 74 }; | |
| 75 | |
| 76 extern struct process_methods the_process_methods; | |
| 77 | |
| 78 /* | |
| 79 * Accessors for process_methods | |
| 80 */ | |
| 81 | |
| 82 #define HAS_PROCMETH_P(name) (the_process_methods.name != 0) | |
| 83 #define PROCMETH(name, par) ((the_process_methods.name) par) | |
| 84 #define PROCMETH_OR_GIVEN(name, par, given) (HAS_PROCMETH_P(name) ? PROCMETH(name, par) : (given)) | |
| 85 #define MAYBE_PROCMETH(name, par) do { if (HAS_PROCMETH_P(name)) PROCMETH(name, par); } while (0); | |
| 86 #define MAYBE_LISP_PROCMETH(name, par) PROCMETH_OR_GIVEN(name, par, Qnil) | |
| 87 #define MAYBE_INT_PROCMETH(name, par) PROCMETH_OR_GIVEN(name, par, 0) | |
| 88 #define PROCESS_HAS_METHOD(os, name) the_process_methods.name = os##_##name | |
| 89 | |
| 90 /* | |
| 91 * Structure records pertinent information about open channels. | |
| 92 * There is one channel associated with each process. | |
| 93 */ | |
| 94 | |
| 95 struct Lisp_Process | |
| 96 { | |
|
5127
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5124
diff
changeset
|
97 NORMAL_LISP_OBJECT_HEADER header; |
| 428 | 98 |
| 99 /* Exit code if process has terminated, | |
| 100 signal which stopped/interrupted process | |
| 101 or 0 if process is running */ | |
| 102 int exit_code; | |
| 103 /* Non-false if process has exited and "dumped core" on its way down */ | |
| 104 char core_dumped; | |
| 105 | |
| 2297 | 106 /* #### Is this field unused? */ |
| 428 | 107 /* if this flag is not NIL, then filter will do the read on the |
| 108 channel, rather than having a call to make_string. | |
| 109 This only works if the filter is a subr. */ | |
| 110 char filter_does_read; | |
| 853 | 111 /* Non-zero means kill silently if Emacs is exited. */ |
| 428 | 112 char kill_without_query; |
| 853 | 113 char in_selected, err_selected; |
| 428 | 114 /* Event-count of last event in which this process changed status. */ |
| 115 volatile int tick; | |
| 116 /* Event-count of last such event reported. */ | |
| 117 int update_tick; | |
| 853 | 118 /* Non-zero if stderr and stdout are separated. */ |
| 119 char separate_stderr; | |
| 428 | 120 |
| 1204 | 121 #define MARKED_SLOT(x) Lisp_Object x; |
| 122 #include "process-slots.h" | |
| 934 | 123 |
| 428 | 124 /* Implementation dependent data */ |
| 125 void *process_data; | |
| 126 }; | |
| 127 | |
| 128 /* Macros to refer to data connection streams */ | |
| 129 #define DATA_INSTREAM(p) (p)->coding_instream | |
| 130 #define DATA_OUTSTREAM(p) (p)->coding_outstream | |
| 853 | 131 #define DATA_ERRSTREAM(p) (p)->coding_errstream |
| 428 | 132 |
| 133 /* Random externs from process.c */ | |
| 134 extern Lisp_Object Qrun, Qstop, Qopen, Qclosed; | |
| 135 extern Lisp_Object Qtcp, Qudp; | |
| 136 extern Lisp_Object Vprocess_connection_type; | |
| 137 extern Lisp_Object Vprocess_list; | |
| 138 | |
| 139 extern struct hash_table *usid_to_process; | |
| 140 | |
| 141 extern volatile int process_tick; | |
| 142 | |
| 143 extern int windowed_process_io; | |
| 144 | |
| 145 #ifdef PROCESS_IO_BLOCKING | |
| 146 extern Lisp_Object network_stream_blocking_port_list; | |
| 147 #endif /* PROCESS_IO_BLOCKING */ | |
| 148 | |
| 149 Lisp_Object make_process_internal (Lisp_Object name); | |
| 440 | 150 void init_process_io_handles (Lisp_Process *p, void* in, |
| 853 | 151 void* out, void *err, int flags); |
| 428 | 152 void send_process (Lisp_Object proc, |
| 153 Lisp_Object relocatable, | |
| 867 | 154 const Ibyte *nonrelocatable, |
| 428 | 155 int start, int len); |
| 156 | |
| 440 | 157 #endif /* INCLUDED_procimpl_h_ */ |