Mercurial > hg > xemacs-beta
annotate src/objects.h @ 5167:e374ea766cc1
clean up, rearrange allocation statistics code
-------------------- ChangeLog entries follow: --------------------
src/ChangeLog addition:
2010-03-21 Ben Wing <ben@xemacs.org>
* alloc.c:
* alloc.c (assert_proper_sizing):
* alloc.c (c_readonly):
* alloc.c (malloced_storage_size):
* alloc.c (fixed_type_block_overhead):
* alloc.c (lisp_object_storage_size):
* alloc.c (inc_lrecord_stats):
* alloc.c (dec_lrecord_stats):
* alloc.c (pluralize_word):
* alloc.c (object_memory_usage_stats):
* alloc.c (Fobject_memory_usage):
* alloc.c (compute_memusage_stats_length):
* alloc.c (disksave_object_finalization_1):
* alloc.c (Fgarbage_collect):
* mc-alloc.c:
* mc-alloc.c (mc_alloced_storage_size):
* mc-alloc.h:
No functionality change here. Collect the allocations-statistics
code that was scattered throughout alloc.c into one place. Add
remaining section headings so that all sections have headings
clearly identifying the start of the section and its purpose.
Expose mc_alloced_storage_size() even when not MEMORY_USAGE_STATS;
this fixes build problems and is related to the export of
lisp_object_storage_size() and malloced_storage_size() when
non-MEMORY_USAGE_STATS in the previous change set.
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Sun, 21 Mar 2010 04:41:49 -0500 |
parents | 7be849cb8828 |
children |
rev | line source |
---|---|
872 | 1 /* Generic object functions -- interface. |
428 | 2 Copyright (C) 1995 Board of Trustees, University of Illinois. |
872 | 3 Copyright (C) 1995, 1996, 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 | |
22 /* Synched up with: Not in FSF. */ | |
23 | |
440 | 24 #ifndef INCLUDED_objects_h_ |
25 #define INCLUDED_objects_h_ | |
428 | 26 |
2268 | 27 DECLARE_DOESNT_RETURN (finalose (void *ptr)); |
428 | 28 |
872 | 29 /**************************************************************************** |
30 * Color Instance Object * | |
31 ****************************************************************************/ | |
428 | 32 |
5118
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
parents:
3659
diff
changeset
|
33 DECLARE_LISP_OBJECT (color_instance, Lisp_Color_Instance); |
872 | 34 #define XCOLOR_INSTANCE(x) XRECORD (x, color_instance, Lisp_Color_Instance) |
35 #define wrap_color_instance(p) wrap_record (p, color_instance) | |
36 #define COLOR_INSTANCEP(x) RECORDP (x, color_instance) | |
37 #define CHECK_COLOR_INSTANCE(x) CHECK_RECORD (x, color_instance) | |
38 #define CONCHECK_COLOR_INSTANCE(x) CONCHECK_RECORD (x, color_instance) | |
428 | 39 |
872 | 40 EXFUN (Fmake_color_instance, 3); |
41 | |
42 extern Lisp_Object Vthe_null_color_instance; | |
428 | 43 |
44 void set_color_attached_to (Lisp_Object obj, Lisp_Object face, | |
45 Lisp_Object property); | |
46 | |
872 | 47 /**************************************************************************** |
48 * Font Instance Object * | |
49 ****************************************************************************/ | |
428 | 50 |
872 | 51 void initialize_charset_font_caches (struct device *d); |
52 void invalidate_charset_font_caches (Lisp_Object charset); | |
428 | 53 |
5118
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
parents:
3659
diff
changeset
|
54 DECLARE_LISP_OBJECT (font_instance, Lisp_Font_Instance); |
872 | 55 #define XFONT_INSTANCE(x) XRECORD (x, font_instance, Lisp_Font_Instance) |
56 #define wrap_font_instance(p) wrap_record (p, font_instance) | |
57 #define FONT_INSTANCEP(x) RECORDP (x, font_instance) | |
58 #define CHECK_FONT_INSTANCE(x) CHECK_RECORD (x, font_instance) | |
59 #define CONCHECK_FONT_INSTANCE(x) CONCHECK_RECORD (x, font_instance) | |
428 | 60 |
3094 | 61 EXFUN (Fmake_font_instance, 4); |
872 | 62 EXFUN (Ffont_instance_name, 1); |
63 EXFUN (Ffont_instance_p, 1); | |
64 EXFUN (Ffont_instance_truename, 1); | |
3094 | 65 EXFUN (Ffont_instance_charset, 1); |
872 | 66 |
67 extern Lisp_Object Vthe_null_font_instance; | |
428 | 68 |
69 void set_font_attached_to (Lisp_Object obj, Lisp_Object face, | |
70 Lisp_Object property); | |
71 | |
72 /***************************************************************************** | |
73 * Face Boolean Specifier Object * | |
74 *****************************************************************************/ | |
75 | |
76 void set_face_boolean_attached_to (Lisp_Object obj, Lisp_Object face, | |
77 Lisp_Object property); | |
78 | |
5080
5502045ec510
The background-placement face property.
Didier Verna <didier@lrde.epita.fr>
parents:
4960
diff
changeset
|
79 /***************************************************************************** |
5502045ec510
The background-placement face property.
Didier Verna <didier@lrde.epita.fr>
parents:
4960
diff
changeset
|
80 * Face Background Placement Specifier Object * |
5502045ec510
The background-placement face property.
Didier Verna <didier@lrde.epita.fr>
parents:
4960
diff
changeset
|
81 *****************************************************************************/ |
5502045ec510
The background-placement face property.
Didier Verna <didier@lrde.epita.fr>
parents:
4960
diff
changeset
|
82 |
5502045ec510
The background-placement face property.
Didier Verna <didier@lrde.epita.fr>
parents:
4960
diff
changeset
|
83 void set_face_background_placement_attached_to |
5502045ec510
The background-placement face property.
Didier Verna <didier@lrde.epita.fr>
parents:
4960
diff
changeset
|
84 (Lisp_Object obj, Lisp_Object face); |
5502045ec510
The background-placement face property.
Didier Verna <didier@lrde.epita.fr>
parents:
4960
diff
changeset
|
85 |
5502045ec510
The background-placement face property.
Didier Verna <didier@lrde.epita.fr>
parents:
4960
diff
changeset
|
86 |
440 | 87 #endif /* INCLUDED_objects_h_ */ |