Mercurial > hg > xemacs-beta
view lib-src/winclient.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 | 422b4b4fb2a6 |
children | 308d34e9f07d |
line wrap: on
line source
/* DDE client for XEmacs. Copyright (C) 2002 Alastair J. Houghton This file is part of XEmacs. XEmacs is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. XEmacs is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with XEmacs; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* Synched up with: Not in FSF. */ /* -- Includes -------------------------------------------------------------- */ #ifdef HAVE_CONFIG_H # include <config.h> #endif #include <windows.h> #include <ddeml.h> #include <stdlib.h> #include <stdio.h> #include <ctype.h> #include <errno.h> #ifdef __CYGWIN__ #include <stdlib.h> #include <unistd.h> #endif static void error (const char* s1, const char* s2); static void fatal (const char *s1, const char *s2); static void * xmalloc (size_t size); static char * getNextArg (const char **ptr, unsigned *len); /* -- Post-Include Defines -------------------------------------------------- */ /* Timeouts & delays */ #define CONNECT_RETRIES 20 #define CONNECT_DELAY 500 /* ms */ #define TRANSACTION_TIMEOUT 5000 /* ms */ #define MAX_INPUT_IDLE_WAIT INFINITE /* ms */ /* DDE Strings */ #define SERVICE_NAME "XEmacs" #define TOPIC_NAME "System" #define COMMAND_FORMAT "[open(\"%s%s\")]" /* XEmacs program name */ #define GENERIC_PROGRAM EMACS_PROGNAME ".exe" #define VERSIONED_PROGRAM EMACS_PROGNAME "-" EMACS_VERSION ".exe" /* -- Constants ------------------------------------------------------------- */ /* -- Global Variables ------------------------------------------------------ */ HINSTANCE hInstance; DWORD idInst = 0; /* -- Function Declarations ------------------------------------------------- */ HDDEDATA CALLBACK ddeCallback (UINT uType, UINT uFmt, HCONV hconv, HSZ hsz1, HSZ hsz2, HDDEDATA hdata, DWORD dwData1, DWORD dwData2); int WINAPI WinMain (HINSTANCE hInst, HINSTANCE hPrev, LPSTR lpCmdLine, int nCmdShow); static HCONV openConversation (void); static void closeConversation (HCONV hConv); static int doFile (HCONV hConv, LPSTR lpszFileName1, LPSTR lpszFileName2); static int parseCommandLine (HCONV hConv, LPSTR lpszCommandLine); /* -- Function Definitions -------------------------------------------------- */ /* * Name : ddeCallback * Function: Gets called by DDEML. * */ HDDEDATA CALLBACK ddeCallback (UINT uType, UINT uFmt, HCONV hconv, HSZ hsz1, HSZ hsz2, HDDEDATA hdata, DWORD dwData1, DWORD dwData2) { return (HDDEDATA) NULL; } /* * Name : WinMain * Function: The program's entry point function. * */ int WINAPI WinMain (HINSTANCE hInst, HINSTANCE hPrev, LPSTR lpCmdLine, int nCmdShow) { HCONV hConv; int ret = 0; UINT uiRet; /* Initialise the DDEML library */ uiRet = DdeInitialize (&idInst, (PFNCALLBACK) ddeCallback, APPCMD_CLIENTONLY |CBF_FAIL_ALLSVRXACTIONS, 0); if (uiRet != DMLERR_NO_ERROR) { MessageBox (NULL, "Could not initialise DDE management library.", "winclient", MB_ICONEXCLAMATION | MB_OK); return 1; } /* Open a conversation */ hConv = openConversation (); if (hConv) { /* OK. Next, we need to parse the command line. */ ret = parseCommandLine (hConv, lpCmdLine); /* Close the conversation */ closeConversation (hConv); } DdeUninitialize (idInst); return ret; } /* * Name : openConversation * Function: Start a conversation. * */ static HCONV openConversation (void) { HSZ hszService = NULL, hszTopic = NULL; HCONV hConv = NULL; /* Get the application (service) name */ hszService = DdeCreateStringHandle (idInst, SERVICE_NAME, CP_WINANSI); if (!hszService) { MessageBox (NULL, "Could not create string handle for service.", "winclient", MB_ICONEXCLAMATION | MB_OK); goto error; } /* Get the topic name */ hszTopic = DdeCreateStringHandle (idInst, TOPIC_NAME, CP_WINANSI); if (!hszTopic) { MessageBox (NULL, "Could not create string handle for topic.", "winclient", MB_ICONEXCLAMATION | MB_OK); goto error; } /* Try to connect */ hConv = DdeConnect (idInst, hszService, hszTopic, NULL); if (!hConv) { STARTUPINFO sti; PROCESS_INFORMATION pi; int n; /* Try to start the program */ ZeroMemory (&sti, sizeof (sti)); sti.cb = sizeof (sti); if (!CreateProcess (NULL, GENERIC_PROGRAM, NULL, NULL, FALSE, 0, NULL, NULL, &sti, &pi) && !CreateProcess (NULL, VERSIONED_PROGRAM, NULL, NULL, FALSE, 0, NULL, NULL, &sti, &pi)) { MessageBox (NULL, "Could not start process.", "winclient", MB_ICONEXCLAMATION | MB_OK); goto error; } /* Wait for the process to enter an idle state */ WaitForInputIdle (pi.hProcess, MAX_INPUT_IDLE_WAIT); /* Close the handles */ CloseHandle (pi.hThread); CloseHandle (pi.hProcess); /* Try to connect */ for (n = 0; n < CONNECT_RETRIES; n++) { Sleep (CONNECT_DELAY); hConv = DdeConnect (idInst, hszService, hszTopic, NULL); if (hConv) break; } if (!hConv) { /* Still couldn't connect. */ MessageBox (NULL, "Could not connect to DDE server.", "winclient", MB_ICONEXCLAMATION | MB_OK); goto error; } } /* Release the string handles */ DdeFreeStringHandle (idInst, hszService); DdeFreeStringHandle (idInst, hszTopic); return hConv; error: if (hConv) DdeDisconnect (hConv); if (hszService) DdeFreeStringHandle (idInst, hszService); if (hszTopic) DdeFreeStringHandle (idInst, hszTopic); return NULL; } /* * Name : closeConversation * Function: Close a conversation. * */ static void closeConversation (HCONV hConv) { /* Shut down */ DdeDisconnect (hConv); } /* * Name : doFile * Function: Process a file. * */ int doFile (HCONV hConv, LPSTR lpszFileName1, LPSTR lpszFileName2) { char *buf = NULL; unsigned len; /* Calculate the buffer length */ len = strlen (lpszFileName1) + strlen (lpszFileName2) + strlen (COMMAND_FORMAT); /* Allocate a buffer */ buf = (char *) xmalloc (len); if (!buf) { MessageBox (NULL, "Not enough memory.", "winclient", MB_ICONEXCLAMATION | MB_OK); return 1; } /* Build the command */ len = wsprintf (buf, COMMAND_FORMAT, lpszFileName1, lpszFileName2); len++; /* OK. We're connected. Send the message. */ DdeClientTransaction (buf, len, hConv, NULL, 0, XTYP_EXECUTE, TRANSACTION_TIMEOUT, NULL); free (buf); return 0; } /* * Name : getNextArg * Function: Retrieve the next command line argument. * */ static char * getNextArg (const char **ptr, unsigned *len) { int in_quotes = 0, quit = 0, all_in_quotes = 0; const char *p = *ptr, *start; char *buf = NULL; unsigned length = 0; /* Skip whitespace */ while (*p && isspace (*p)) p++; /* If this is the end, return NULL */ if (!*p) return NULL; /* Remember where we are */ start = p; /* Find the next whitespace character outside quotes */ if (*p == '"') all_in_quotes = 1; while (*p && !quit) { switch (*p) { case '"': in_quotes = 1 - in_quotes; p++; break; case '\\': if (!in_quotes) all_in_quotes = 0; p++; if (!*p) break; p++; break; default: if (isspace (*p) && !in_quotes) quit = 1; else if (!in_quotes) all_in_quotes = 0; if (!quit) p++; } } /* Work out the length */ length = p - start; /* Strip quotes if the argument is completely quoted */ if (all_in_quotes) { start++; length -= 2; } /* Copy */ buf = (char *) xmalloc (length + 1); if (!buf) return NULL; strncpy (buf, start, length); buf[length] = '\0'; /* Return the pointer and length */ *ptr = p; *len = length; return buf; } /* * Name : parseCommandLine * Function: Process the command line. This program accepts a list of strings * : (which may contain wildcards) representing filenames. * */ int parseCommandLine (HCONV hConv, LPSTR lpszCommandLine) { char *fullpath, *filepart; char *arg; unsigned len, pathlen; int ret = 0; HANDLE hFindFile = NULL; WIN32_FIND_DATA wfd; /* Retrieve arguments */ while ((arg = getNextArg ((const char**)&lpszCommandLine, &len)) != NULL) { fullpath = NULL; #ifdef __CYGWIN__ /* If the filename is not an absolute path, add the current directory to the pathname */ if (*arg != '/') { len = pathconf(".", _PC_PATH_MAX); fullpath = (char *) xmalloc (len+1); if (!fullpath) { MessageBox (NULL, "Not enough memory.", "winclient", MB_ICONEXCLAMATION | MB_OK); ret = 1; break; } if (!getcwd(fullpath, (size_t)len)) { MessageBox (NULL, "Could not retrieve current directory.", "winclient", MB_ICONEXCLAMATION | MB_OK); ret = 1; break; } /* Append trailing slash */ strcat(fullpath, "/"); ret = doFile (hConv, fullpath, arg); } else { /* The arg has already been expanded, so pass it as it is */ ret = doFile (hConv, "", arg); } #else /* First find the canonical path name */ fullpath = filepart = NULL; pathlen = GetFullPathName (arg, 0, fullpath, &filepart); fullpath = (char *) xmalloc (pathlen); if (!fullpath) { MessageBox (NULL, "Not enough memory.", "winclient", MB_ICONEXCLAMATION | MB_OK); ret = 1; break; } GetFullPathName (arg, pathlen, fullpath, &filepart); /* Find the first matching file */ hFindFile = FindFirstFile (arg, &wfd); if (hFindFile == INVALID_HANDLE_VALUE) ret = doFile (hConv, fullpath, ""); else { /* Chop off the file part from the full path name */ if (filepart) *filepart = '\0'; /* For each matching file */ do { /* Process it */ ret = doFile (hConv, fullpath, wfd.cFileName); if (ret) break; } while (FindNextFile (hFindFile, &wfd)); FindClose (hFindFile); } #endif /* Release the path name buffers */ if (fullpath) free (fullpath); free (arg); if (ret) break; } return ret; } static void fatal (const char *s1, const char *s2) { error (s1, s2); exit (1); } /* Print error message. `s1' is printf control string, `s2' is arg for it. */ static void error (const char* s1, const char* s2) { fprintf (stderr, "winclient: "); fprintf (stderr, s1, s2); fprintf (stderr, "\n"); } /* Like malloc but get fatal error if memory is exhausted. */ static void * xmalloc (size_t size) { void *result = malloc (size); if (result == NULL) fatal ("virtual memory exhausted", (char *) 0); return result; }