CVS update by stephent xemacs/man ...
19 years
CVS Monitor
CVS Monitor
User: stephent
Date: 05/10/04 19:00:34
Modified: xemacs/man ChangeLog emodules.texi
Log:
Document build infra for modules distributed in core
<871x31uslr.fsf(a)tleepslib.sk.tsukuba.ac.jp>
Revision Changes Path
1.315 +6 -0 XEmacs/xemacs/man/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/man/ChangeLog,v
retrieving revision 1.314
retrieving revision 1.315
diff -u -p -r1.314 -r1.315
--- ChangeLog 2005/09/27 21:43:19 1.314
+++ ChangeLog 2005/10/04 17:00:32 1.315
＠＠ -1,3 +1,9 ＠＠
+2005-10-04 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * emodules.texi (Distribution with XEmacs): New node describing
+ organization of module-related code in top-level configure.ac and
+ src/Makefile.in.in.
+
2005-09-27 Adrian Aichner <adrian(a)xemacs.org>
* lispref/compile.texi (Compilation Options): Lowercase SYMBOL
1.7 +51 -2 XEmacs/xemacs/man/emodules.texi
Index: emodules.texi
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/man/emodules.texi,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- emodules.texi 2002/06/24 22:00:17 1.6
+++ emodules.texi 2005/10/04 17:00:33 1.7
＠＠ -124,6 +124,7 ＠＠ module support documentation.
* Introduction:: Introducing Emacs Modules
* Anatomy of a Module:: Basic module layout and technology
* Using ellcc:: How to use the module compiler
+* Distribution with XEmacs:: Adding your module to the distribution
* Defining Functions:: Creating new Lisp primitives
* Defining Variables:: Creating new Lisp variables
* Index:: Concept Index
＠＠ -497,7 +498,7 ＠＠ shared library containing those symbols,
that library. Otherwise, interactions between modules must take place
via Lisp function calls and Lisp variables accesses.
-＠node Using ellcc, Defining Functions, Anatomy of a Module, Top
+＠node Using ellcc, Distribution with XEmacs, Anatomy of a Module, Top
＠chapter Using ＠code{ellcc}
＠cindex ＠code{ellcc}
＠cindex module compiler
＠＠ -822,7 +823,55 ＠＠ Sets the name of the ＠file{make-docfile}
Used during the compile phase of ＠value{emacs} itself.
＠end table
-＠node Defining Functions, Defining Variables, Using ellcc, Top
+＠node Distribution with XEmacs, Defining Functions, Using ellcc, Top
+＠chapter Adding Modules to the XEmacs Distribution
+＠cindex XEmacs integration
+＠cindex integration, XEmacs
+＠cindex modules and configure.ac
+＠cindex configure.ac, modules and
+＠cindex modules and Makefiles
+＠cindex Makefiles, modules and
+
+#### This section needs to be filled out.
+
+＠strong{Warning: The procedure described in the section is subject to
+change, as it is very stylized and thus a good candidate for further
+automation.}
+
+Modules distributed with XEmacs are placed in the ＠file{modules}
+subdirectory of the root of the source tree. Each module's code is
+placed in a separate subdirectory. The build infrastructure for a
+module consists of a ＠file{Makefile.in.in}, a ＠file{configure.ac}, and
+＠file{install-sh}. ＠file{install-sh} is a constant, and may simply be
+copied from an existing module.
+
+Most of the job of building a module is encapsulated in
+(a)file{modules/common/Makefile.common} and in ＠file{ellcc}. The module's
+(a)file{Makefile.in.in} normally needs only to define module name and
+version information, and include ＠file{modules/common/Makefile.common}.
+The ＠file{configure.ac} is very module-specific, and little can be said
+about its contents. However, since no logic that depends on XEmacs
+itself or other modules needs to be present, it is easier to write and
+maintain than if it were contained in the XEmacs distribution's
+(a)file{configure.ac}.
+
+Modules can usually be trivially built in to the XEmacs binary. To make
+this work, you need to duplicate the detection logic for any resources
+the module requires in the top-level ＠file{configure.ac}. Since module
+objects may be linked into modules or into ＠file{xemacs}, instead of
+adding library path and library information directly to some
+＠file{＠var{subsystem}_libs} variable, you should add them to a
+＠file{＠var{module}_libs} variable, which in turn must be added to
+＠code{ld_libs_module} in the section ``Compute SUBST-itutable variables.''
+
+Furthermore, in ＠file{src/Makefile.in.in} you add rules to build the
+object without the module wrapper, and conditionalize these and the
+addition of the object to ＠code{objs} on ＠code{HAVE_SHLIB}. The right
+way to do this is somewhat indirect. Study the integration of LDAP and
+PostgreSQL for the details.
+
+
+＠node Defining Functions, Defining Variables, Distribution with XEmacs, Top
＠chapter Defining Functions
＠cindex defining functions
- 1 participants
- 0 comments
CVS update by stephent xemacs/src ...
19 years
CVS Monitor
CVS Monitor
User: stephent
Date: 05/10/04 18:47:16
Modified: xemacs/src alloc.c
Log:
undo accidental commit
Revision Changes Path
1.115 +29 -54 XEmacs/xemacs/src/alloc.c
Index: alloc.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/alloc.c,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -p -r1.114 -r1.115
--- alloc.c 2005/10/04 16:43:38 1.114
+++ alloc.c 2005/10/04 16:47:10 1.115
＠＠ -1,7 +1,7 ＠＠
/* Storage allocation and gc for XEmacs Lisp interpreter.
Copyright (C) 1985-1998 Free Software Foundation, Inc.
Copyright (C) 1995 Sun Microsystems, Inc.
- Copyright (C) 1995, 1996, 2001, 2002, 2003, 2004, 2005 Ben Wing.
+ Copyright (C) 1995, 1996, 2001, 2002, 2003, 2004 Ben Wing.
This file is part of XEmacs.
＠＠ -94,8 +94,6 ＠＠ static Fixnum debug_allocation_backtrace
/* Number of bytes of consing done since the last gc */
static EMACS_INT consing_since_gc;
EMACS_UINT total_consing;
-EMACS_INT total_gc_usage;
-int total_gc_usage_set;
int need_to_garbage_collect;
int need_to_check_c_alloca;
＠＠ -5527,13 +5525,13 ＠＠ garbage_collect_1 (void)
}
{
- struct catchtag *c;
- for (c = catchlist; c; c = c->next)
+ struct catchtag *catch;
+ for (catch = catchlist; catch; catch = catch->next)
{
- mark_object (c->tag);
- mark_object (c->val);
- mark_object (c->actual_tag);
- mark_object (c->backtrace);
+ mark_object (catch->tag);
+ mark_object (catch->val);
+ mark_object (catch->actual_tag);
+ mark_object (catch->backtrace);
}
}
＠＠ -5771,7 +5769,7 ＠＠ Garbage collection happens automatically
/* Debugging aids. */
static Lisp_Object
-gc_plist_hack (const Ascbyte *name, EMACS_INT value, Lisp_Object tail)
+gc_plist_hack (const Ascbyte *name, int value, Lisp_Object tail)
{
/* C doesn't have local functions (or closures, or GC, or readable syntax,
or portable numeric datatypes, or bit-vectors, or characters, or
＠＠ -5780,10 +5778,9 ＠＠ gc_plist_hack (const Ascbyte *name, EMAC
}
#define HACK_O_MATIC(type, name, pl) do { \
- EMACS_INT s = 0; \
+ int s = 0; \
struct type##_block *x = current_##type##_block; \
while (x) { s += sizeof (*x) + MALLOC_OVERHEAD; x = x->prev; } \
- object_usage += s; \
(pl) = gc_plist_hack ((name), s, (pl)); \
} while (0)
＠＠ -5803,11 +5800,8 ＠＠ Garbage collection happens automatically
Lisp_Object pl = Qnil;
int i;
int gc_count_vector_total_size = 0;
- EMACS_INT object_usage = 0;
-
garbage_collect_1 ();
-
for (i = 0; i < lrecord_type_count; i++)
{
if (lcrecord_stats[i].bytes_in_use != 0
＠＠ -5824,7 +5818,6 ＠＠ Garbage collection happens automatically
sprintf (buf, "%s-storage", name);
pl = gc_plist_hack (buf, lcrecord_stats[i].bytes_in_use, pl);
- object_usage += lcrecord_stats[i].bytes_in_use;
/* Okay, simple pluralization check for `symbol-value-varalias' */
if (name[len-1] == 's')
sprintf (buf, "%ses-freed", name);
＠＠ -5902,10 +5895,6 ＠＠ Garbage collection happens automatically
pl = gc_plist_hack ("conses-free", gc_count_num_cons_freelist, pl);
pl = gc_plist_hack ("conses-used", gc_count_num_cons_in_use, pl);
- /* Record total usage for purposes of determining next GC */
- total_gc_usage = object_usage;
- total_gc_usage_set = 1;
-
/* The things we do for backwards-compatibility */
return
list6 (Fcons (make_int (gc_count_num_cons_in_use),
＠＠ -5945,29 +5934,15 ＠＠ The value is divided by 1024 to make sur
}
#endif
-DEFUN ("total-memory-usage", Ftotal_memory_usage, 0, 0, 0, /*
+DEFUN ("memory-usage", Fmemory_usage, 0, 0, 0, /*
Return the total number of bytes used by the data segment in XEmacs.
This may be helpful in debugging XEmacs's memory usage.
-NOTE: This may or may not be accurate! It is hard to determine this
-value in a system-independent fashion.
*/
())
{
return make_int (total_data_usage ());
}
-DEFUN ("lisp-object-memory-usage", Flisp_object_memory_usage, 0, 0, 0, /*
-Return the total number of bytes used for object storage in XEmacs.
-This may be helpful in debugging XEmacs's memory usage.
-This value is only recomputed when garbage collection happens; thus, a
-better value of the real number of bytes used is
- (+ (lisp-object-memory-usage) (consing-since-gc))
-*/
- ())
-{
- return make_int (total_gc_usage);
-}
-
void
recompute_funcall_allocation_flag (void)
{
＠＠ -5986,15 +5961,11 ＠＠ recompute_need_to_garbage_collect (void)
else
need_to_garbage_collect =
(consing_since_gc > gc_cons_threshold
- &&
#if 0 /* #### implement this better */
+ &&
(100 * consing_since_gc) / total_data_usage () >=
gc_cons_percentage
-#else
- (!total_gc_usage_set ||
- (100 * consing_since_gc) / total_gc_usage >=
- gc_cons_percentage)
-#endif
+#endif /* 0 */
);
recompute_funcall_allocation_flag ();
}
＠＠ -6249,8 +6220,9 ＠＠ common_init_alloc_early (void)
#else
gc_cons_threshold = 15000; /* debugging */
#endif
- gc_cons_percentage = 40; /* #### what is optimal? */
- total_gc_usage_set = 0;
+ gc_cons_percentage = 0; /* #### 20; Don't have an accurate measure of
+ memory usage on Windows; not verified on other
+ systems */
lrecord_uid_counter = 259;
#ifndef MC_ALLOC
debug_string_purity = 0;
＠＠ -6382,8 +6354,7 ＠＠ syms_of_alloc (void)
#if 0
DEFSUBR (Fmemory_limit);
#endif
- DEFSUBR (Ftotal_memory_usage);
- DEFSUBR (Flisp_object_memory_usage);
+ DEFSUBR (Fmemory_usage);
DEFSUBR (Fconsing_since_gc);
}
＠＠ -6415,22 +6386,26 ＠＠ effective way to check GCPRO problems, b
will be unusable! You almost certainly won't have the patience to wait
long enough to be able to set it back.
-See also `consing-since-gc' and `gc-cons-percentage'.
+See also `consing-since-gc'.
*/ );
DEFVAR_INT ("gc-cons-percentage", &gc_cons_percentage /*
*Percentage of memory allocated between garbage collections.
Garbage collection will happen if this percentage of the total amount of
-memory used for data (see `lisp-object-memory-usage') has been allocated
-since the last garbage collection. However, it will not happen if less
-than `gc-cons-threshold' bytes have been allocated -- this sets an absolute
-minimum in case very little data has been allocated or the percentage is
-set very low. Set this to 0 to have garbage collection always happen after
-`gc-cons-threshold' bytes have been allocated, regardless of current memory
-usage.
+memory used for data has been allocated since the last garbage collection.
+However, it will not happen if less than `gc-cons-threshold' bytes have
+been allocated -- this sets an absolute minimum in case very little data
+has been allocated or the percentage is set very low. Set this to 0 to
+have garbage collection always happen after `gc-cons-threshold' bytes have
+been allocated, regardless of current memory usage.
+
+Garbage collection happens automatically when `eval' or `funcall' are
+called. (Note that `funcall' is called implicitly as part of evaluation.)
+By binding this temporarily to a large number, you can effectively
+prevent garbage collection during a part of the program.
-See also `consing-since-gc' and `gc-cons-threshold'.
+See also `consing-since-gc'.
*/ );
#ifdef DEBUG_XEMACS
- 1 participants
- 0 comments
CVS update by stephent xemacs/src ...
19 years
CVS Monitor
CVS Monitor
User: stephent
Date: 05/10/04 18:43:39
Modified: xemacs/src alloc.c
Log:
Improve style and documentation of `register-input-method
Revision Changes Path
1.228 +33 -1 XEmacs/xemacs/CHANGES-beta
Index: CHANGES-beta
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/CHANGES-beta,v
retrieving revision 1.227
retrieving revision 1.228
diff -u -p -r1.227 -r1.228
--- CHANGES-beta 2005/10/03 06:34:34 1.227
+++ CHANGES-beta 2005/10/04 16:43:29 1.228
＠＠ -2,21 +2,53 ＠＠ to 21.5.23 "daikon"
Major features
+-- New: non-XPM color images can be mouse pointers. -- Ben Wing
+
User-Visible Bug Fixes and Minor Improvements
+-- Fix: crash due to duplicate subrs with MC_ALLOC and modules. -- Marcus Crestani
+
Build Infrastructure
+-- Fix: Cygwin, non-X build needs XPM header and library files in XE_CFLAGS. -- Mike Alexander, Rick Rankin
+-- Fix: Stop installexe.sh from adding redundant exe extension. -- Rick Rankin
+-- Fix: variable initialization misordering in xemacs.mak. -- Adrian Aichner
+-- Improve: replace support for autoconf 2.13 with warning to use autoconf 2.59. -- Malcolm Purvis
+-- Improve: update config.inc.samp to recent versions and add gmp, db, postgresql, ldap support; also optimization in non-debug builds. -- Ben Wing
+-- Improve: xemacs.mak now caters to VC++ version, support for building gmp, db, postgresql, ldap; other fixes. -- Ben Wing
+
Documentation
+-- Fix: texinfmt.el can build all Info files again. -- Adrian Aichner
+-- Fix: typos in Texinfo docs. -- Adrian Aichner
+-- Improve: Texinfo docs about specifiers. -- Ben Wing
+-- Improve: comment style, 'foo -> `foo'. -- Ben Wing
+-- Improve: rewrite nt/README
+
Lisp API
+-- Improve: GC now triggers on relative, not absolute, consing. -- Ben Wing
+-- Improve: memory usage reporting. -- Ben Wing
+-- New: `specifier-instantiator' and related primitives. -- Ben Wing
+
Internal API and Implementation
+-- Fix: Non-MULE needs mswindows_current_locale too. -- Mike Alexander
+-- Fix: address of register variable can't be taken. -- Ben Wing
+-- Fix: bitrot in sysdep.c and nt.c. -- Ben Wing
+-- Fix: bug in range tables with non-default closure. -- Ben Wing
+-- Fix: don't use C++ reserved words "new" and "catch", append '_'. -- Ben Wing
+-- Fix: initialization in mc-alloc. -- Marcus Crestani
+-- Fix: setlocale return string is volatile, dup it. -- Olivier Galibert
+-- Improve: include from ../src so <config.h> works in lib-src. -- Ben Wing
+-- Improve: minitar.c now includes config.h. -- Ben Wing
+-- Improve: warning elimination. -- Ben Wing
+
to 21.5.22 "cucumber"
Major features
---New: support for Unnnn-style keysyms on X11. -- Aidan Kehoe
+-- New: support for Unnnn-style keysyms on X11. -- Aidan Kehoe
User-Visible Bug Fixes and Minor Improvements
1.676 +5 -0 XEmacs/xemacs/lisp/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/ChangeLog,v
retrieving revision 1.675
retrieving revision 1.676
diff -u -p -r1.675 -r1.676
--- ChangeLog 2005/09/14 05:29:43 1.675
+++ ChangeLog 2005/10/04 16:43:34 1.676
＠＠ -1,3 +1,8 ＠＠
+2005-09-21 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * mule/mule-cmds.el (input-method-alist, register-input-method):
+ Improve docstrings and formal parameter names.
+
2005-09-14 Stephen J. Turnbull <stephen(a)xemacs.org>
* XEmacs 21.5.22 "cucumber" is released.
1.25 +27 -30 XEmacs/xemacs/lisp/mule/mule-cmds.el
Index: mule-cmds.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/mule/mule-cmds.el,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- mule-cmds.el 2004/11/04 23:06:02 1.24
+++ mule-cmds.el 2005/10/04 16:43:36 1.25
＠＠ -347,44 +347,41 ＠＠ This function is called with no argument
(put 'describe-current-input-method-function 'permanent-local t)
(defvar input-method-alist nil
- "Alist of input method names vs how to use them.
-Each element has the form:
- (INPUT-METHOD LANGUAGE-ENV ACTIVATE-FUNC TITLE DESCRIPTION ARGS...)
-See the function `register-input-method' for the meanings of the elements.")
+ "Alist mapping input method names to information used by the LEIM API.
+Elements have the form (METHOD LANGUAGE ACTIVATOR TITLE DESCRIPTION ARGS...).
+Use `register-input-method' to add input methods to the database. See its
+documentation for the meanings of the elements.")
-(defun register-input-method (input-method lang-env &rest args)
- "Register INPUT-METHOD as an input method for language environment ENV.
-INPUT-METHOD and LANG-ENV are symbols or strings.
+(defun register-input-method (method language
+ ;; #### shouldn't be optional, but need to
+ ;; audit callers
+ &optional activator title description
+ &rest args)
+ "Register METHOD as an input method for language environment LANGUAGE.
-The remaining arguments are:
- ACTIVATE-FUNC, TITLE, DESCRIPTION, and ARGS...
-ACTIVATE-FUNC is a function to call to activate this method.
+METHOD and LANGUAGE may be symbols or strings.
+ACTIVATOR is the function called to activate this method. METHOD (the
+ invocation name) and ARGS are passed to the function on activation.
TITLE is a string to show in the mode line when this method is active.
DESCRIPTION is a string describing this method and what it is good for.
-The ARGS, if any, are passed as arguments to ACTIVATE-FUNC.
-All told, the arguments to ACTIVATE-FUNC are INPUT-METHOD and the ARGS.
+Optional ARGS, if any, are stored and passed as arguments to ACTIVATOR.
-This function is mainly used in the file \"leim-list.el\" which is
-created at building time of emacs, registering all quail input methods
-contained in the emacs distribution.
+When registering a new Quail input method, the input method title should be
+the one given in the third parameter of `quail-define-package' (if the values
+are different, the string specified in this function takes precedence).
-In case you want to register a new quail input method by yourself, be
-careful to use the same input method title as given in the third
-parameter of `quail-define-package' (if the values are different, the
-string specified in this function takes precedence).
-
-The commands `describe-input-method' and `list-input-methods' need
-this duplicated values to show some information about input methods
-without loading the affected quail packages."
- (if (symbolp lang-env)
- (setq lang-env (symbol-name lang-env)))
- (if (symbolp input-method)
- (setq input-method (symbol-name input-method)))
- (let ((info (cons lang-env args))
- (slot (assoc input-method input-method-alist)))
+The information provided is registered in `input-method-alist'. The commands
+`describe-input-method' and `list-input-methods' use this database to show
+information about input methods without loading them."
+ (if (symbolp language)
+ (setq language (symbol-name language)))
+ (if (symbolp method)
+ (setq method (symbol-name method)))
+ (let ((info (append (list language activator title description) args))
+ (slot (assoc method input-method-alist)))
(if slot
(setcdr slot info)
- (setq slot (cons input-method info))
+ (setq slot (cons method info))
(setq input-method-alist (cons slot input-method-alist)))))
(defun read-input-method-name (prompt &optional default inhibit-null)
1.114 +54 -29 XEmacs/xemacs/src/alloc.c
Index: alloc.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/alloc.c,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -p -r1.113 -r1.114
--- alloc.c 2005/05/15 16:38:11 1.113
+++ alloc.c 2005/10/04 16:43:38 1.114
＠＠ -1,7 +1,7 ＠＠
/* Storage allocation and gc for XEmacs Lisp interpreter.
Copyright (C) 1985-1998 Free Software Foundation, Inc.
Copyright (C) 1995 Sun Microsystems, Inc.
- Copyright (C) 1995, 1996, 2001, 2002, 2003, 2004 Ben Wing.
+ Copyright (C) 1995, 1996, 2001, 2002, 2003, 2004, 2005 Ben Wing.
This file is part of XEmacs.
＠＠ -94,6 +94,8 ＠＠ static Fixnum debug_allocation_backtrace
/* Number of bytes of consing done since the last gc */
static EMACS_INT consing_since_gc;
EMACS_UINT total_consing;
+EMACS_INT total_gc_usage;
+int total_gc_usage_set;
int need_to_garbage_collect;
int need_to_check_c_alloca;
＠＠ -5525,13 +5527,13 ＠＠ garbage_collect_1 (void)
}
{
- struct catchtag *catch;
- for (catch = catchlist; catch; catch = catch->next)
+ struct catchtag *c;
+ for (c = catchlist; c; c = c->next)
{
- mark_object (catch->tag);
- mark_object (catch->val);
- mark_object (catch->actual_tag);
- mark_object (catch->backtrace);
+ mark_object (c->tag);
+ mark_object (c->val);
+ mark_object (c->actual_tag);
+ mark_object (c->backtrace);
}
}
＠＠ -5769,7 +5771,7 ＠＠ Garbage collection happens automatically
/* Debugging aids. */
static Lisp_Object
-gc_plist_hack (const Ascbyte *name, int value, Lisp_Object tail)
+gc_plist_hack (const Ascbyte *name, EMACS_INT value, Lisp_Object tail)
{
/* C doesn't have local functions (or closures, or GC, or readable syntax,
or portable numeric datatypes, or bit-vectors, or characters, or
＠＠ -5778,9 +5780,10 ＠＠ gc_plist_hack (const Ascbyte *name, int
}
#define HACK_O_MATIC(type, name, pl) do { \
- int s = 0; \
+ EMACS_INT s = 0; \
struct type##_block *x = current_##type##_block; \
while (x) { s += sizeof (*x) + MALLOC_OVERHEAD; x = x->prev; } \
+ object_usage += s; \
(pl) = gc_plist_hack ((name), s, (pl)); \
} while (0)
＠＠ -5800,8 +5803,11 ＠＠ Garbage collection happens automatically
Lisp_Object pl = Qnil;
int i;
int gc_count_vector_total_size = 0;
+ EMACS_INT object_usage = 0;
+
garbage_collect_1 ();
+
for (i = 0; i < lrecord_type_count; i++)
{
if (lcrecord_stats[i].bytes_in_use != 0
＠＠ -5818,6 +5824,7 ＠＠ Garbage collection happens automatically
sprintf (buf, "%s-storage", name);
pl = gc_plist_hack (buf, lcrecord_stats[i].bytes_in_use, pl);
+ object_usage += lcrecord_stats[i].bytes_in_use;
/* Okay, simple pluralization check for `symbol-value-varalias' */
if (name[len-1] == 's')
sprintf (buf, "%ses-freed", name);
＠＠ -5895,6 +5902,10 ＠＠ Garbage collection happens automatically
pl = gc_plist_hack ("conses-free", gc_count_num_cons_freelist, pl);
pl = gc_plist_hack ("conses-used", gc_count_num_cons_in_use, pl);
+ /* Record total usage for purposes of determining next GC */
+ total_gc_usage = object_usage;
+ total_gc_usage_set = 1;
+
/* The things we do for backwards-compatibility */
return
list6 (Fcons (make_int (gc_count_num_cons_in_use),
＠＠ -5934,15 +5945,29 ＠＠ The value is divided by 1024 to make sur
}
#endif
-DEFUN ("memory-usage", Fmemory_usage, 0, 0, 0, /*
+DEFUN ("total-memory-usage", Ftotal_memory_usage, 0, 0, 0, /*
Return the total number of bytes used by the data segment in XEmacs.
This may be helpful in debugging XEmacs's memory usage.
+NOTE: This may or may not be accurate! It is hard to determine this
+value in a system-independent fashion.
*/
())
{
return make_int (total_data_usage ());
}
+DEFUN ("lisp-object-memory-usage", Flisp_object_memory_usage, 0, 0, 0, /*
+Return the total number of bytes used for object storage in XEmacs.
+This may be helpful in debugging XEmacs's memory usage.
+This value is only recomputed when garbage collection happens; thus, a
+better value of the real number of bytes used is
+ (+ (lisp-object-memory-usage) (consing-since-gc))
+*/
+ ())
+{
+ return make_int (total_gc_usage);
+}
+
void
recompute_funcall_allocation_flag (void)
{
＠＠ -5961,11 +5986,15 ＠＠ recompute_need_to_garbage_collect (void)
else
need_to_garbage_collect =
(consing_since_gc > gc_cons_threshold
-#if 0 /* #### implement this better */
&&
+#if 0 /* #### implement this better */
(100 * consing_since_gc) / total_data_usage () >=
gc_cons_percentage
-#endif /* 0 */
+#else
+ (!total_gc_usage_set ||
+ (100 * consing_since_gc) / total_gc_usage >=
+ gc_cons_percentage)
+#endif
);
recompute_funcall_allocation_flag ();
}
＠＠ -6220,9 +6249,8 ＠＠ common_init_alloc_early (void)
#else
gc_cons_threshold = 15000; /* debugging */
#endif
- gc_cons_percentage = 0; /* #### 20; Don't have an accurate measure of
- memory usage on Windows; not verified on other
- systems */
+ gc_cons_percentage = 40; /* #### what is optimal? */
+ total_gc_usage_set = 0;
lrecord_uid_counter = 259;
#ifndef MC_ALLOC
debug_string_purity = 0;
＠＠ -6354,7 +6382,8 ＠＠ syms_of_alloc (void)
#if 0
DEFSUBR (Fmemory_limit);
#endif
- DEFSUBR (Fmemory_usage);
+ DEFSUBR (Ftotal_memory_usage);
+ DEFSUBR (Flisp_object_memory_usage);
DEFSUBR (Fconsing_since_gc);
}
＠＠ -6386,26 +6415,22 ＠＠ effective way to check GCPRO problems, b
will be unusable! You almost certainly won't have the patience to wait
long enough to be able to set it back.
-See also `consing-since-gc'.
+See also `consing-since-gc' and `gc-cons-percentage'.
*/ );
DEFVAR_INT ("gc-cons-percentage", &gc_cons_percentage /*
*Percentage of memory allocated between garbage collections.
Garbage collection will happen if this percentage of the total amount of
-memory used for data has been allocated since the last garbage collection.
-However, it will not happen if less than `gc-cons-threshold' bytes have
-been allocated -- this sets an absolute minimum in case very little data
-has been allocated or the percentage is set very low. Set this to 0 to
-have garbage collection always happen after `gc-cons-threshold' bytes have
-been allocated, regardless of current memory usage.
-
-Garbage collection happens automatically when `eval' or `funcall' are
-called. (Note that `funcall' is called implicitly as part of evaluation.)
-By binding this temporarily to a large number, you can effectively
-prevent garbage collection during a part of the program.
+memory used for data (see `lisp-object-memory-usage') has been allocated
+since the last garbage collection. However, it will not happen if less
+than `gc-cons-threshold' bytes have been allocated -- this sets an absolute
+minimum in case very little data has been allocated or the percentage is
+set very low. Set this to 0 to have garbage collection always happen after
+`gc-cons-threshold' bytes have been allocated, regardless of current memory
+usage.
-See also `consing-since-gc'.
+See also `consing-since-gc' and `gc-cons-threshold'.
*/ );
#ifdef DEBUG_XEMACS
- 1 participants
- 0 comments
CVS update by viteno xemacs ...
19 years
CVS Monitor
CVS Monitor
User: viteno
Date: 05/10/03 23:51:16
Modified: xemacs version.sh
Log:
Update xemacs_extra_name.
Revision Changes Path
1.1301 +1 -1 XEmacs/xemacs/version.sh
Index: version.sh
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/version.sh,v
retrieving revision 1.1300
retrieving revision 1.1301
diff -u -p -r1.1300 -r1.1301
--- version.sh 2005/10/02 21:51:28 1.1300
+++ version.sh 2005/10/03 21:51:15 1.1301
＠＠ -8,5 +8,5 ＠＠ emacs_kit_version=
infodock_major_version=4
infodock_minor_version=0
infodock_build_version=8
-xemacs_extra_name="(+CVS-20051002)"
+xemacs_extra_name="(+CVS-20051003)"
xemacs_release_date="2005-02-18"
- 1 participants
- 0 comments
CVS update by stephent xemacs ...
19 years
CVS Monitor
CVS Monitor
User: stephent
Date: 05/10/03 08:34:35
Modified: xemacs CHANGES-beta
Log:
prepare for 21.5.23 release
Revision Changes Path
1.227 +14 -0 XEmacs/xemacs/CHANGES-beta
Index: CHANGES-beta
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/CHANGES-beta,v
retrieving revision 1.226
retrieving revision 1.227
diff -u -p -r1.226 -r1.227
--- CHANGES-beta 2005/09/14 04:58:13 1.226
+++ CHANGES-beta 2005/10/03 06:34:34 1.227
＠＠ -1,3 +1,17 ＠＠
+to 21.5.23 "daikon"
+
+Major features
+
+User-Visible Bug Fixes and Minor Improvements
+
+Build Infrastructure
+
+Documentation
+
+Lisp API
+
+Internal API and Implementation
+
to 21.5.22 "cucumber"
Major features
- 1 participants
- 0 comments
CVS update by viteno xemacs ...
19 years
CVS Monitor
CVS Monitor
User: viteno
Date: 05/10/02 23:51:28
Modified: xemacs version.sh
Log:
Update xemacs_extra_name.
Revision Changes Path
1.1300 +1 -1 XEmacs/xemacs/version.sh
Index: version.sh
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/version.sh,v
retrieving revision 1.1299
retrieving revision 1.1300
diff -u -p -r1.1299 -r1.1300
--- version.sh 2005/10/01 21:51:07 1.1299
+++ version.sh 2005/10/02 21:51:28 1.1300
＠＠ -8,5 +8,5 ＠＠ emacs_kit_version=
infodock_major_version=4
infodock_minor_version=0
infodock_build_version=8
-xemacs_extra_name="(+CVS-20051001)"
+xemacs_extra_name="(+CVS-20051002)"
xemacs_release_date="2005-02-18"
- 1 participants
- 0 comments
CVS update by adrian xemacsweb/About ...
19 years
CVS Monitor
CVS Monitor
User: adrian
Date: 05/10/02 14:28:49
Modified: xemacsweb/About ChangeLog XEmacsServices.content
Log:
xemacsweb: Fix validation warning and wrap preformatted content in XEmacsServices.content
-------------------- ChangeLog entries follow: --------------------
About/ChangeLog addition:
2005-10-02 Adrian Aichner <adrian(a)xemacs.org>
* XEmacsServices.content: Fix validation warning and wrap
preformatted content.
Revision Changes Path
1.188 +5 -0 XEmacs/xemacsweb/About/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacsweb/About/ChangeLog,v
retrieving revision 1.187
retrieving revision 1.188
diff -u -p -r1.187 -r1.188
--- ChangeLog 2005/10/01 18:04:07 1.187
+++ ChangeLog 2005/10/02 12:28:48 1.188
＠＠ -1,3 +1,8 ＠＠
+2005-10-02 Adrian Aichner <adrian(a)xemacs.org>
+
+ * XEmacsServices.content: Fix validation warning and wrap
+ preformatted content.
+
2005-10-01 Adrian Aichner <adrian(a)xemacs.org>
* XEmacsServices.content: Document yesterday's XEmacs CVS issue.
1.50 +6 -3 XEmacs/xemacsweb/About/XEmacsServices.content
Index: XEmacsServices.content
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacsweb/About/XEmacsServices.content,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- XEmacsServices.content 2005/10/01 18:04:07 1.49
+++ XEmacsServices.content 2005/10/02 12:28:49 1.50
＠＠ -75,8 +75,11 ＠＠ Adrian Aichner
<td colspan="3">
<pre xml:space="preserve">
cvs server: Updating .
-cvs server: failed to create lock directory for `/pack/xemacscvs/XEmacs/xemacs' (/pack/cvs/var/lock/XEmacs/xemacs/#cvs.lock): No space left on device
-cvs server: failed to obtain dir lock in repository `/pack/xemacscvs/XEmacs/xemacs'
+cvs server: failed to create lock directory for \
+`/pack/xemacscvs/XEmacs/xemacs' \
+(/pack/cvs/var/lock/XEmacs/xemacs/#cvs.lock): No space left on device
+cvs server: failed to obtain dir lock in repository \
+`/pack/xemacscvs/XEmacs/xemacs'
cvs [server aborted]: read lock failed - giving up
</pre>
</td>
＠＠ -279,7 +282,7 ＠＠ cvs [server aborted]: read lock failed -
</tr>
<tr>
<!-- one of (td th) -->
- <td colspan="3"><87ad2xgsq2.fsf(a)tleepslib.sk.tsukuba.ac.jp>
+ <td colspan="3"><87ad2xgsq2.fsf(a)tleepslib.sk.tsukuba.ac.jp>
(posted to various user mailing lists)</td>
</tr>
- 1 participants
- 0 comments
CVS update by viteno xemacs ...
19 years
CVS Monitor
CVS Monitor
User: viteno
Date: 05/10/01 23:51:08
Modified: xemacs version.sh
Log:
Update xemacs_extra_name.
Revision Changes Path
1.1299 +1 -1 XEmacs/xemacs/version.sh
Index: version.sh
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/version.sh,v
retrieving revision 1.1298
retrieving revision 1.1299
diff -u -p -r1.1298 -r1.1299
--- version.sh 2005/09/29 21:51:08 1.1298
+++ version.sh 2005/10/01 21:51:07 1.1299
＠＠ -8,5 +8,5 ＠＠ emacs_kit_version=
infodock_major_version=4
infodock_minor_version=0
infodock_build_version=8
-xemacs_extra_name="(+CVS-20050929)"
+xemacs_extra_name="(+CVS-20051001)"
xemacs_release_date="2005-02-18"
- 1 participants
- 0 comments
CVS update by adrian xemacsweb/About ...
19 years
CVS Monitor
CVS Monitor
User: adrian
Date: 05/10/01 20:04:07
Modified: xemacsweb/About ChangeLog XEmacsServices.content
Log:
xemacsweb: Document yesterday's XEmacs CVS issue
-------------------- ChangeLog entries follow: --------------------
About/ChangeLog addition:
2005-10-01 Adrian Aichner <adrian(a)xemacs.org>
* XEmacsServices.content: Document yesterday's XEmacs CVS issue.
Revision Changes Path
1.187 +4 -0 XEmacs/xemacsweb/About/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacsweb/About/ChangeLog,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -p -r1.186 -r1.187
--- ChangeLog 2005/06/12 14:34:18 1.186
+++ ChangeLog 2005/10/01 18:04:07 1.187
＠＠ -1,3 +1,7 ＠＠
+2005-10-01 Adrian Aichner <adrian(a)xemacs.org>
+
+ * XEmacsServices.content: Document yesterday's XEmacs CVS issue.
+
2005-06-12 Adrian Aichner <adrian(a)xemacs.org>
* created.content: Link mending.
1.49 +40 -0 XEmacs/xemacsweb/About/XEmacsServices.content
Index: XEmacsServices.content
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacsweb/About/XEmacsServices.content,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- XEmacsServices.content 2004/07/05 10:56:17 1.48
+++ XEmacsServices.content 2005/10/01 18:04:07 1.49
＠＠ -57,6 +57,46 ＠＠ Adrian Aichner
<!-- one of (td th) -->
<th colspan="3">References</th>
</tr>
+
+ <tr>
+ <!-- one of (td th) -->
+ <td rowspan="4" valign="top"><a id="issue29" name="issue29">29</a></td>
+ <td>
+ <ul>
+<!-- <li>cvs -f -z3 -d:ext:DEVELOPER＠cvs.xemacs.org:/usr/CVSroot ...</li> -->
+ <li>cvs -f -z3 -d:pserver:xemacs＠cvs.xemacs.org:/usr/CVSroot ...</li>
+ </ul>
+ </td>
+ <td>2005-09-30 14:56:38-0400</td>
+ <td>2005-10-01 14:27:43+0200</td>
+ </tr>
+ <tr>
+ <!-- one of (td th) -->
+ <td colspan="3">
+ <pre xml:space="preserve">
+cvs server: Updating .
+cvs server: failed to create lock directory for `/pack/xemacscvs/XEmacs/xemacs' (/pack/cvs/var/lock/XEmacs/xemacs/#cvs.lock): No space left on device
+cvs server: failed to obtain dir lock in repository `/pack/xemacscvs/XEmacs/xemacs'
+cvs [server aborted]: read lock failed - giving up
+ </pre>
+ </td>
+ </tr>
+ <tr>
+ <!-- one of (td th) -->
+ <td colspan="3">
+ <p>
+ dotsrc.org has resolved the resported issue.
+ </p>
+ </td>
+ </tr>
+ <tr>
+ <!-- one of (td th) -->
+ <td colspan="3">
+ <p>
+ <a href="http://list-archive.xemacs.org/xemacs-beta/200509/msg00421.html">ht...>
+ </p>
+ </td>
+ </tr>
<tr>
<!-- one of (td th) -->
- 1 participants
- 0 comments