guile/guile-core/libguile ChangeLog gc.c

[Mikael Djurfeldt]

CVSROOT:        /cvs
Module name:    guile
Changes by:     Mikael Djurfeldt <address@hidden>       02/02/20 20:00:41

Modified files:
        guile-core/libguile: ChangeLog gc.c 

Log message:
        * gc.c (scm_gc_sweep): Print an error message when aborting due to
        underflowing scm_mallocated.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-core/libguile/ChangeLog.diff?cvsroot=OldCVS&tr1=1.1587&tr2=1.1588&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-core/libguile/gc.c.diff?cvsroot=OldCVS&tr1=1.223&tr2=1.224&r1=text&r2=text

Patches:
Index: guile/guile-core/libguile/ChangeLog
diff -c guile/guile-core/libguile/ChangeLog:1.1587 
guile/guile-core/libguile/ChangeLog:1.1588
*** guile/guile-core/libguile/ChangeLog:1.1587  Thu Feb 14 10:32:25 2002
--- guile/guile-core/libguile/ChangeLog Wed Feb 20 20:00:40 2002
***************
*** 1,3 ****
--- 1,8 ----
+ 2002-02-20  Mikael Djurfeldt  <address@hidden>
+ 
+       * gc.c (scm_gc_sweep): Print an error message when aborting due to
+       underflowing scm_mallocated.
+ 
  2002-02-14  Marius Vollmer  <address@hidden>
  
        * gc.h, gc.c (scm_must_malloc, scm_must_realloc, scm_must_strdup,
Index: guile/guile-core/libguile/gc.c
diff -c guile/guile-core/libguile/gc.c:1.223 
guile/guile-core/libguile/gc.c:1.224
*** guile/guile-core/libguile/gc.c:1.223        Thu Feb 14 10:32:12 2002
--- guile/guile-core/libguile/gc.c      Wed Feb 20 20:00:41 2002
***************
*** 1,4 ****
! /* Copyright (C) 1995,1996,1997,1998,1999,2000,2001 Free Software Foundation, 
Inc.
   *
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published by
--- 1,4 ----
! /* Copyright (C) 1995,1996,1997,1998,1999,2000,2001, 2002 Free Software 
Foundation, Inc.
   *
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published by
***************
*** 1833,1844 ****
    scm_gc_yield -= scm_cells_allocated;
  
    if (scm_mallocated < m)
!     /* The byte count of allocated objects has underflowed.  This is
!        probably because you forgot to report the sizes of objects you
!        have allocated, by calling scm_done_malloc or some such.  When
!        the GC freed them, it subtracted their size from
!        scm_mallocated, which underflowed.  */
!     abort ();
  
    scm_mallocated -= m;
    scm_gc_malloc_collected = m;
--- 1833,1850 ----
    scm_gc_yield -= scm_cells_allocated;
  
    if (scm_mallocated < m)
!     {
!       /* The byte count of allocated objects has underflowed.  This is
!        probably because you forgot to report the sizes of objects you
!        have allocated, by calling scm_done_malloc or some such.  When
!        the GC freed them, it subtracted their size from
!        scm_mallocated, which underflowed.  */
!       fprintf (stderr,
!              "scm_gc_sweep: Byte count of allocated objects has 
underflowed.\n"
!              "This is probably because the GC hasn't been correctly 
informed\n"
!              "about object sizes\n");
!       abort ();
!     }
  
    scm_mallocated -= m;
    scm_gc_malloc_collected = m;