Mercurial > hg > xemacs-beta
annotate lib-src/tcp.c @ 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 | 13e47461d509 |
| children | cd167465bf69 061f4f90f874 |
| rev | line source |
|---|---|
| 0 | 1 /* |
| 613 | 2 * TCP/IP stream emulation for XEmacs. |
| 0 | 3 * Copyright (C) 1988, 1989, 1992, 1993 Free Software Foundation, Inc. |
| 4 | |
| 5 * Author: Masanobu Umeda | |
| 6 * Maintainer: umerin@mse.kyutech.ac.jp | |
| 7 | |
| 613 | 8 This file is part of XEmacs. |
| 0 | 9 |
| 613 | 10 XEmacs is free software; you can redistribute it and/or modify |
| 0 | 11 it under the terms of the GNU General Public License as published by |
| 12 the Free Software Foundation; either version 2, or (at your option) | |
| 13 any later version. | |
| 14 | |
| 613 | 15 XEmacs is distributed in the hope that it will be useful, |
| 0 | 16 but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 17 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 18 GNU General Public License for more details. | |
| 19 | |
| 20 You should have received a copy of the GNU General Public License | |
| 613 | 21 along with XEmacs; see the file COPYING. If not, write to |
| 0 | 22 the Free the Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
| 23 Boston, MA 02111-1307, USA. | |
| 24 | |
| 25 * | |
| 26 * Yasunari, Itoh at PFU limited contributed for Fujitsu UTS and SX/A. | |
| 27 * | |
| 28 * Thu Apr 6 13:47:37 JST 1989 | |
| 29 * USG fixes by Sakaeda <saka@mickey.trad.pf.fujitsu.junet> | |
| 30 * | |
| 31 * For Fujitsu UTS compile with: | |
| 32 * cc -O -o tcp tcp.c -DFUJITSU_UTS -lu -lsocket | |
| 33 */ | |
| 34 | |
| 978 | 35 #ifdef HAVE_CONFIG_H |
| 36 #include <config.h> | |
| 37 #endif | |
| 0 | 38 #include <stdio.h> |
| 39 #include <fcntl.h> | |
| 40 #include <ctype.h> | |
| 41 #include <sys/types.h> | |
| 42 | |
| 43 #ifdef FUJITSU_UTS | |
| 44 #define USG | |
| 45 #include <sys/ucbtypes.h> | |
| 46 #include <sys/tisp/socket.h> | |
| 47 #include <netdb.h> | |
| 48 #include <sys/tisp/in.h> | |
| 49 #else | |
| 50 #include <sys/socket.h> | |
| 51 #include <netdb.h> | |
| 52 #include <netinet/in.h> | |
| 53 #endif | |
| 54 | |
| 55 #ifdef USG | |
| 56 #include <sys/stat.h> | |
| 978 | 57 #include "syssignal.h" |
| 0 | 58 #endif |
| 59 | |
| 60 #ifdef USG | |
| 61 int selectable = 1; | |
| 62 | |
| 63 sigout () | |
| 64 { | |
| 65 fcntl (fileno (stdin), F_SETFL, 0); | |
| 66 exit (-1); | |
| 67 } | |
| 68 #endif | |
| 69 | |
| 70 main (argc, argv) | |
| 71 int argc; | |
| 72 char *argv[]; | |
| 73 { | |
| 74 struct hostent *host; | |
| 75 struct sockaddr_in sockin, sockme; | |
| 76 struct servent *serv; | |
| 77 char *hostname = NULL; | |
| 78 char *service = "nntp"; | |
| 79 int port; | |
| 80 int readfds; | |
| 81 int writefds; | |
| 82 int server; /* NNTP Server */ | |
| 83 int emacsIn = fileno (stdin); /* Emacs intput */ | |
| 84 int emacsOut = fileno (stdout); /* Emacs output */ | |
| 85 char buffer[1024]; | |
| 86 int nbuffer; /* Number of bytes in buffer */ | |
| 87 int wret; | |
| 88 char *retry; /* retry bufferp */ | |
| 89 int false = 0; /* FALSE flag for setsockopt () */ | |
| 90 | |
| 91 if (argc < 2) | |
| 92 { | |
| 93 fprintf (stderr, "Usage: %s HOST [SERVICE]\n", argv[0]); | |
| 94 exit (1); | |
| 95 } | |
| 96 if (argc >= 2) | |
| 97 hostname = argv[1]; | |
| 98 if (argc >= 3) | |
| 99 service = argv[2]; | |
| 100 | |
| 101 if ((host = gethostbyname (hostname)) == NULL) | |
| 102 { | |
| 103 perror ("gethostbyname"); | |
| 104 exit (1); | |
| 105 } | |
| 106 if (isdigit (service[0])) | |
| 107 port = atoi (service); | |
| 108 else | |
| 109 { | |
| 110 serv = getservbyname (service, "tcp"); | |
| 111 if (serv == NULL) | |
| 112 { | |
| 113 perror ("getservbyname"); | |
| 114 exit (1); | |
| 115 } | |
| 116 port = serv->s_port; | |
| 117 } | |
| 118 | |
| 119 memset (&sockin, 0, sizeof (sockin)); | |
| 120 sockin.sin_family = host->h_addrtype; | |
| 121 memcpy (&sockin.sin_addr, host->h_addr, host->h_length); | |
| 122 sockin.sin_port = port; | |
| 123 if ((server = socket (AF_INET, SOCK_STREAM, 0)) < 0) | |
| 124 { | |
| 125 perror ("socket"); | |
| 126 exit (1); | |
| 127 } | |
| 128 if (setsockopt (server, SOL_SOCKET, SO_REUSEADDR, &false, sizeof (false))) | |
| 129 { | |
| 130 perror ("setsockopt"); | |
| 131 exit (1); | |
| 132 } | |
| 133 memset (&sockme, 0, sizeof (sockme)); | |
| 134 sockme.sin_family = sockin.sin_family; | |
| 135 sockme.sin_addr.s_addr = INADDR_ANY; | |
| 136 if (bind (server, &sockme, sizeof (sockme)) < 0) | |
| 137 { | |
| 138 perror ("bind"); | |
| 139 exit (1); | |
| 140 } | |
| 141 if (connect (server, &sockin, sizeof (sockin)) < 0) | |
| 142 { | |
| 143 perror ("connect"); | |
| 144 close (server); | |
| 145 exit (1); | |
| 146 } | |
| 147 | |
| 148 #ifdef O_NDELAY | |
| 149 fcntl (server, F_SETFL, O_NDELAY); | |
| 150 | |
| 151 #ifdef USG | |
| 152 /* USG pipe cannot not select emacsIn */ | |
| 153 { | |
| 154 struct stat statbuf; | |
| 155 fstat (emacsIn, &statbuf); | |
| 156 if (statbuf.st_mode & 010000) | |
| 157 selectable = 0; | |
| 158 if (!selectable) | |
| 159 { | |
| 160 signal (SIGINT, sigout); | |
| 161 fcntl (emacsIn, F_SETFL, O_NDELAY); | |
| 162 } | |
| 163 } | |
| 164 #endif | |
| 165 #endif | |
| 166 | |
| 167 /* Connection established. */ | |
| 168 while (1) | |
| 169 { | |
| 170 readfds = (1 << server) | (1 << emacsIn); | |
| 171 if (select (32, &readfds, NULL, NULL, (struct timeval *)NULL) == -1) | |
| 172 { | |
| 173 perror ("select"); | |
| 174 exit (1); | |
| 175 } | |
| 176 if (readfds & (1 << emacsIn)) | |
| 177 { | |
| 178 /* From Emacs */ | |
| 179 nbuffer = read (emacsIn, buffer, sizeof buffer -1); | |
| 180 | |
| 181 #ifdef USG | |
| 182 if (selectable && nbuffer == 0) | |
| 183 { | |
| 184 goto finish; | |
| 185 } | |
| 186 else if (!(readfds & (1 << server)) && nbuffer == 0) | |
| 187 { | |
| 188 sleep (1); | |
| 189 } | |
| 190 else | |
| 191 #else | |
| 192 if (nbuffer == 0) | |
| 193 goto finish; | |
| 194 #endif | |
| 195 for (retry = buffer; nbuffer > 0; nbuffer -= wret, retry += wret) | |
| 196 { | |
| 197 writefds = 1 << server; | |
| 198 if (select (server+1, NULL, &writefds, NULL, (struct timeval*)NULL) == -1) | |
| 199 { | |
| 200 perror ("select"); | |
| 201 exit (1); | |
| 202 } | |
| 203 wret = write (server, retry, nbuffer); | |
| 204 if (wret < 0) goto finish; | |
| 205 } | |
| 206 } | |
| 207 if (readfds & (1 << server)) | |
| 208 { | |
| 209 /* From NNTP server */ | |
| 210 nbuffer = read (server, buffer, sizeof buffer -1); | |
| 211 if (nbuffer == 0) | |
| 212 goto finish; | |
| 213 for (retry = buffer; nbuffer > 0; nbuffer -= wret, retry += wret) | |
| 214 { | |
| 215 writefds = 1 << emacsOut; | |
| 216 #ifdef USG | |
| 217 if (selectable) | |
| 218 #endif | |
| 219 if (select (emacsOut+1, NULL, &writefds, NULL, (struct timeval*)NULL) == -1) | |
| 220 { | |
| 221 perror ("select"); | |
| 222 exit (1); | |
| 223 } | |
| 224 wret = write (emacsOut, retry, nbuffer); | |
| 225 if (wret < 0) goto finish; | |
| 226 } | |
| 227 } | |
| 228 } | |
| 229 | |
| 230 /* End of communication. */ | |
| 231 finish: | |
| 232 close (server); | |
| 233 #ifdef USG | |
| 234 if (!selectable) fcntl (emacsIn, F_SETFL, 0); | |
| 235 #endif | |
| 236 close (emacsIn); | |
| 237 close (emacsOut); | |
| 238 exit (0); | |
| 239 } |