Merge commit 'f30e1bdf97ae8b2b2918da585f887a4d3a23a347' into boehm-demers-weiser-gc

Conflicts:
	libguile/Makefile.am
	libguile/coop-pthreads.c
	libguile/gc-freelist.c
	libguile/gc-segment.c
	libguile/gc.c
	libguile/private-gc.h
	test-suite/tests/environments.nottest

diff --cc configure.in
Simple merge

diff --cc libguile/Makefile.am
index 34b7473,47220dd..6e1fa86
--- 1/libguile/Makefile.am
--- 2/libguile/Makefile.am
+++ b/libguile/Makefile.am
@@@ -94,12 -95,13 +95,12 @@@ libguile_la_CFLAGS = $(GUILE_CFLAGS
  
  libguile_la_SOURCES = alist.c arbiters.c async.c backtrace.c boolean.c        \
      chars.c continuations.c convert.c debug.c deprecation.c           \
-     deprecated.c discouraged.c dynwind.c environments.c eq.c error.c  \
+     deprecated.c discouraged.c dynwind.c eq.c error.c \
      eval.c evalext.c extensions.c feature.c fluids.c fports.c         \
 -    futures.c gc.c gc-mark.c gc-segment.c gc-malloc.c gc-card.c               \
 -    gc-freelist.c gc_os_dep.c gdbint.c gettext.c                      \
 -    gh_data.c gh_eval.c gh_funcs.c                                    \
 +    futures.c gc.c gc-malloc.c                                                \
-     gdbint.c gh_data.c gh_eval.c gh_funcs.c                           \
++    gdbint.c gettext.c gh_data.c gh_eval.c gh_funcs.c                 \
      gh_init.c gh_io.c gh_list.c gh_predicates.c goops.c gsubr.c               \
-     guardians.c hash.c hashtab.c hooks.c i18n.c init.c inline.c               \
+     guardians.c hash.c hashtab.c hooks.c init.c inline.c              \
      ioext.c keywords.c lang.c list.c load.c macros.c mallocs.c                \
      modules.c numbers.c objects.c objprop.c options.c pairs.c ports.c \
      print.c procprop.c procs.c properties.c random.c rdelim.c read.c  \
@@@ -109,11 -111,21 +110,20 @@@
      throw.c values.c variable.c vectors.c version.c vports.c weaks.c  \
      ramap.c unif.c
  
+ libguile_i18n_v_@LIBGUILE_I18N_MAJOR@_la_SOURCES = i18n.c
+ libguile_i18n_v_@LIBGUILE_I18N_MAJOR@_la_CFLAGS =     \
+    $(libguile_la_CFLAGS)
+ libguile_i18n_v_@LIBGUILE_I18N_MAJOR@_la_LIBADD =     \
+    libguile.la
+ libguile_i18n_v_@LIBGUILE_I18N_MAJOR@_la_LDFLAGS =    \
+    -module -L$(builddir) -lguile                              \
+    -version-info @LIBGUILE_I18N_INTERFACE@
+ 
  DOT_X_FILES = alist.x arbiters.x async.x backtrace.x boolean.x chars.x        \
      continuations.x debug.x deprecation.x deprecated.x discouraged.x  \
 -    dynl.x dynwind.x eq.x error.x eval.x evalext.x    \
 -    extensions.x feature.x fluids.x fports.x futures.x gc.x gc-mark.x \
 -    gc-segment.x gc-malloc.x gc-card.x gettext.x goops.x              \
 -    gsubr.x guardians.x                                                       \
 +    dynl.x dynwind.x environments.x eq.x error.x eval.x evalext.x     \
 +    extensions.x feature.x fluids.x fports.x futures.x gc.x           \
-     goops.x gsubr.x guardians.x                                               \
++    gettext.c goops.x gsubr.x guardians.x                             \
      hash.x hashtab.x hooks.x i18n.x init.x ioext.x keywords.x lang.x  \
      list.x load.x macros.x mallocs.x modules.x numbers.x objects.x    \
      objprop.x options.x pairs.x ports.x print.x procprop.x procs.x    \
@@@ -128,10 -140,11 +138,10 @@@ EXTRA_DOT_X_FILES = @EXTRA_DOT_X_FILES
  DOT_DOC_FILES = alist.doc arbiters.doc async.doc backtrace.doc                \
      boolean.doc chars.doc continuations.doc debug.doc deprecation.doc \
      deprecated.doc discouraged.doc dynl.doc dynwind.doc                       \
-     environments.doc eq.doc error.doc eval.doc evalext.doc            \
+     eq.doc error.doc eval.doc evalext.doc             \
      extensions.doc feature.doc fluids.doc fports.doc futures.doc      \
 -    gc.doc goops.doc gsubr.doc gc-mark.doc gc-segment.doc             \
 -    gc-malloc.doc gc-card.doc gettext.doc                             \
 -    guardians.doc hash.doc hashtab.doc                                        \
 +    gc.doc goops.doc gsubr.doc                                                \
-     gc-malloc.doc guardians.doc hash.doc hashtab.doc                  \
++    gc-malloc.doc gettext.doc guardians.doc hash.doc hashtab.doc      \
      hooks.doc i18n.doc init.doc ioext.doc keywords.doc lang.doc               \
      list.doc load.doc macros.doc mallocs.doc modules.doc numbers.doc  \
      objects.doc objprop.doc options.doc pairs.doc ports.doc print.doc \
@@@ -183,12 -197,12 +194,13 @@@ pkginclude_HEADERS = gh.
  # These are headers visible as <libguile/mumble.h>.
  modincludedir = $(includedir)/libguile
  modinclude_HEADERS = __scm.h alist.h arbiters.h async.h backtrace.h   \
 +    boehm-gc.h                                                                \
      boolean.h chars.h continuations.h convert.h debug.h debug-malloc.h        \
      deprecation.h deprecated.h discouraged.h dynl.h dynwind.h         \
-     environments.h eq.h error.h eval.h evalext.h extensions.h         \
+     eq.h error.h eval.h evalext.h extensions.h                \
      feature.h filesys.h fluids.h fports.h futures.h gc.h              \
-     gdb_interface.h gdbint.h goops.h gsubr.h guardians.h hash.h               \
+     gdb_interface.h gdbint.h gettext.h goops.h                                \
+     gsubr.h guardians.h hash.h                                                \
      hashtab.h hooks.h i18n.h init.h inline.h ioext.h iselect.h                \
      keywords.h lang.h list.h load.h macros.h mallocs.h modules.h      \
      net_db.h numbers.h objects.h objprop.h options.h pairs.h ports.h  \

diff --cc libguile/continuations.c
Simple merge

diff --cc libguile/coop-pthreads.c
Simple merge

diff --cc libguile/environments.c
Simple merge

diff --cc libguile/eval.c
Simple merge

diff --cc libguile/fports.c
Simple merge

diff --cc libguile/gc.c
index d8b27d2,ead6d30..04e4e0a
--- 1/libguile/gc.c
--- 2/libguile/gc.c
+++ b/libguile/gc.c
@@@ -224,21 -209,28 +219,28 @@@ unsigned long scm_mtrigger
   */
  unsigned long scm_cells_allocated = 0;
  unsigned long scm_mallocated = 0;
- unsigned long scm_gc_cells_collected;
- unsigned long scm_gc_cells_collected_1 = 0; /* previous GC yield */
- unsigned long scm_gc_malloc_collected;
- unsigned long scm_gc_ports_collected;
- unsigned long scm_gc_time_taken = 0;
+ 
+ /* Global GC sweep statistics since the last full GC.  */
+ static scm_t_sweep_statistics scm_i_gc_sweep_stats = { 0, 0 };
+ static scm_t_sweep_statistics scm_i_gc_sweep_stats_1 = { 0, 0 };
+ 
+ /* Total count of cells marked/swept.  */
+ static double scm_gc_cells_marked_acc = 0.;
+ static double scm_gc_cells_swept_acc = 0.;
+ 
+ static unsigned long scm_gc_time_taken = 0;
  static unsigned long t_before_gc;
- unsigned long scm_gc_mark_time_taken = 0;
- unsigned long scm_gc_times = 0;
- unsigned long scm_gc_cells_swept = 0;
- double scm_gc_cells_marked_acc = 0.;
- double scm_gc_cells_swept_acc = 0.;
- int scm_gc_cell_yield_percentage =0;
+ static unsigned long scm_gc_mark_time_taken = 0;
+ 
+ static unsigned long scm_gc_times = 0;
+ 
+ static int scm_gc_cell_yield_percentage = 0;
+ static unsigned long protected_obj_count = 0;
+ 
+ /* The following are accessed from `gc-malloc.c' and `gc-card.c'.  */
  int scm_gc_malloc_yield_percentage = 0;
 -unsigned long scm_gc_malloc_collected = 0;
 -unsigned long scm_gc_ports_collected = 0;
 +
 +static unsigned long protected_obj_count = 0;
  
  
  SCM_SYMBOL (sym_cells_allocated, "cells-allocated");

diff --cc libguile/gc.h
Simple merge

diff --cc libguile/init.c
Simple merge

diff --cc libguile/modules.c
Simple merge

diff --cc libguile/numbers.c
Simple merge

diff --cc libguile/ports.c
index bcf4a89,a1ebb57..3fcc0ef
--- 1/libguile/ports.c
--- 2/libguile/ports.c
+++ b/libguile/ports.c
@@@ -27,9 -27,8 +27,10 @@@
  
  #include <stdio.h>
  #include <errno.h>
+ #include <fcntl.h>  /* for chsize on mingw */
  
 +#include <assert.h>
 +
  #include "libguile/_scm.h"
  #include "libguile/async.h"
  #include "libguile/eval.h"

diff --cc libguile/pthread-threads.h
Simple merge

diff --cc libguile/threads.c
Simple merge

diff --cc libguile/unif.c
Simple merge

diff --cc libguile/vectors.c
Simple merge

diff --cc test-suite/Makefile.am
Simple merge

diff --cc test-suite/tests/environments.nottest
index a426eec,646efc5..4688384
--- 1/test-suite/tests/environments.nottest
--- 2/test-suite/tests/environments.test
+++ b/test-suite/tests/environments.nottest
@@@ -15,12 -15,11 +15,12 @@@
  ;;;; License along with this library; if not, write to the Free Software
  ;;;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  
 -(use-modules (ice-9 documentation))
 +(use-modules (ice-9 documentation)
 +           (test-suite lib))
  
- ;;; FIXME: Test disabled!
- ;;; The `environments' code (which is currently unused) relies on weak alist
- ;;; vectors.  However, these are currently implemented as weak hash tables.
+ ;;; environments are currently commented out of libguile, so these
+ ;;; tests must be commented out also. - NJ 2006-11-02.
+ (if #f (let ()
  
  ;;;
  ;;; miscellaneous