Mercurial > hg > xemacs-beta
annotate src/process.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 | b5df3737028a |
| children | 308d34e9f07d |
| rev | line source |
|---|---|
| 428 | 1 /* Definitions for asynchronous process control in XEmacs. |
| 2 Copyright (C) 1985, 1992, 1993, 1994 Free Software Foundation, Inc. | |
| 814 | 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 | |
| 440 | 22 #ifndef INCLUDED_process_h_ |
| 23 #define INCLUDED_process_h_ | |
| 428 | 24 |
| 1743 | 25 BEGIN_C_DECLS |
| 1650 | 26 |
| 442 | 27 /* struct Lisp_Process is defined in procimpl.h; only process-*.c need |
| 28 to know about the guts of it. */ | |
| 428 | 29 |
|
5118
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
parents:
4759
diff
changeset
|
30 DECLARE_LISP_OBJECT (process, Lisp_Process); |
| 440 | 31 #define XPROCESS(x) XRECORD (x, process, Lisp_Process) |
| 617 | 32 #define wrap_process(p) wrap_record (p, process) |
| 428 | 33 #define PROCESSP(x) RECORDP (x, process) |
| 34 #define CHECK_PROCESS(x) CHECK_RECORD (x, process) | |
| 863 | 35 #define PROCESS_LIVE_P(x) (EQ ((x)->status_symbol, Qrun)) |
| 36 #define PROCESS_READABLE_P(x) (!NILP ((x)->pipe_instream)) | |
| 440 | 37 |
| 38 #define CHECK_LIVE_PROCESS(x) do { \ | |
| 39 CHECK_PROCESS (x); \ | |
| 40 if (! PROCESS_LIVE_P (XPROCESS (x))) \ | |
| 41 dead_wrong_type_argument (Qprocess_live_p, (x)); \ | |
| 42 } while (0) | |
| 428 | 43 |
| 863 | 44 #define CHECK_READABLE_PROCESS(x) do { \ |
| 45 CHECK_PROCESS (x); \ | |
| 46 if (! PROCESS_READABLE_P (XPROCESS (x))) \ | |
| 47 dead_wrong_type_argument (Qprocess_readable_p, (x)); \ | |
| 48 } while (0) | |
| 49 | |
| 872 | 50 EXFUN (Fdelete_process, 1); |
| 51 EXFUN (Fget_buffer_process, 1); | |
| 52 EXFUN (Fget_process, 1); | |
| 53 EXFUN (Fprocess_status, 1); | |
| 428 | 54 EXFUN (Fprocess_kill_without_query, 2); |
| 55 EXFUN (Fprocess_id, 1); | |
| 56 | |
| 1632 | 57 MODULE_API |
|
4952
19a72041c5ed
Mule-izing, various fixes related to char * arguments
Ben Wing <ben@xemacs.org>
parents:
4759
diff
changeset
|
58 DECLARE_DOESNT_RETURN (report_process_error (const Ascbyte *, Lisp_Object)); |
|
19a72041c5ed
Mule-izing, various fixes related to char * arguments
Ben Wing <ben@xemacs.org>
parents:
4759
diff
changeset
|
59 DECLARE_DOESNT_RETURN (report_network_error (const Ascbyte *, Lisp_Object)); |
| 872 | 60 extern Lisp_Object Vlisp_EXEC_SUFFIXES; |
| 61 | |
| 1632 | 62 MODULE_API Ibyte *egetenv (const CIbyte *var); |
| 63 MODULE_API void eputenv (const CIbyte *var, const CIbyte *value); | |
| 872 | 64 extern int env_initted; |
| 65 | |
| 771 | 66 extern Lisp_Object Qprocess_live_p; |
| 67 | |
| 428 | 68 Lisp_Object connect_to_file_descriptor (Lisp_Object name, |
| 69 Lisp_Object buffer, | |
| 70 Lisp_Object infd, | |
| 71 Lisp_Object outfd); | |
| 440 | 72 int connected_via_filedesc_p (Lisp_Process *p); |
| 428 | 73 void kill_buffer_processes (Lisp_Object buffer); |
| 74 void close_process_descs (void); | |
| 853 | 75 void set_process_filter (Lisp_Object proc, Lisp_Object filter, |
| 76 int filter_does_read, | |
| 77 int set_stderr); | |
| 428 | 78 void update_process_status (Lisp_Object p, |
| 79 Lisp_Object status_symbol, | |
| 80 int exit_code, int core_dumped); | |
| 440 | 81 void get_process_streams (Lisp_Process *p, |
| 853 | 82 Lisp_Object *instr, Lisp_Object *outstr, |
| 83 Lisp_Object *errstr); | |
| 84 int get_process_selected_p (Lisp_Process *p, int do_err); | |
| 85 void set_process_selected_p (Lisp_Process *p, int in_selected, | |
| 86 int err_selected); | |
| 440 | 87 Lisp_Process *get_process_from_usid (USID usid); |
| 428 | 88 |
| 89 #ifdef HAVE_SOCKETS | |
| 90 int network_connection_p (Lisp_Object process); | |
| 91 #else | |
| 92 #define network_connection_p(x) 0 | |
| 93 #endif | |
| 94 | |
| 95 extern Lisp_Object Qclosed, Qmulticast, Qopen, Qrun, Qstop, Qtcp, Qudp; | |
| 96 extern Lisp_Object Vprocess_connection_type, Vprocess_list; | |
| 97 | |
| 98 /* Report all recent events of a change in process status | |
| 99 (either run the sentinel or output a message). | |
| 100 This is done while Emacs is waiting for keyboard input. */ | |
| 101 void status_notify (void); | |
| 102 void kick_status_notify (void); | |
| 103 void deactivate_process (Lisp_Object proc); | |
| 853 | 104 Charcount read_process_output (Lisp_Object proc, int read_stderr); |
| 105 int process_has_separate_stderr (Lisp_Object proc); | |
| 442 | 106 const char *signal_name (int signum); |
| 428 | 107 Lisp_Object canonicalize_host_name (Lisp_Object host); |
| 108 | |
| 1743 | 109 END_C_DECLS |
| 1650 | 110 |
| 428 | 111 /* The name of the file open to get a null file, or a data sink. |
| 112 MS-DOS, and OS/2 redefine this. */ | |
| 113 #ifndef NULL_DEVICE | |
| 114 #define NULL_DEVICE "/dev/null" | |
| 115 #endif | |
| 116 | |
| 117 /* A string listing the possible suffixes used for executable files, | |
| 118 separated by colons. MS-DOS, and OS/2 redefine this. */ | |
| 119 #ifndef EXEC_SUFFIXES | |
| 120 #define EXEC_SUFFIXES "" | |
| 121 #endif | |
| 122 | |
| 440 | 123 #endif /* INCLUDED_process_h_ */ |