mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-04-30 03:40:34 +02:00
Fix finalizer resuscitation causing excessive GC
* libguile/finalizers.c (async_gc_finalizer): (scm_i_register_async_gc_callback): Replace "weak gc callback" mechanism with "async gc callback" mechanism. Very similar but the new API is designed to be called a bounded number of times, to avoid running afoul of libgc heuristics. * libguile/weak-list.h: New internal header. * libguile/Makefile.am (noinst_HEADERS): Add weak-list.h. * libguile/weak-set.c (vacuum_all_weak_sets): (scm_c_make_weak_set, scm_init_weak_set): * libguile/weak-table.c (vacuum_all_weak_tables): (scm_c_make_weak_table, scm_init_weak_table): Arrange to vacuum all weak sets from a single async GC callback, and likewise for weak tables. Thanks to Ludovic Courtès for tracking this bug down!
This commit is contained in:
parent
e337432041
commit
c9910c6042
6 changed files with 137 additions and 43 deletions
73
libguile/weak-list.h
Normal file
73
libguile/weak-list.h
Normal file
|
@ -0,0 +1,73 @@
|
|||
/* classes: h_files */
|
||||
|
||||
#ifndef SCM_WEAK_LIST_H
|
||||
#define SCM_WEAK_LIST_H
|
||||
|
||||
/* Copyright (C) 2016 Free Software Foundation, Inc.
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU Lesser General Public License
|
||||
* as published by the Free Software Foundation; either version 3 of
|
||||
* the License, or (at your option) any later version.
|
||||
*
|
||||
* This library 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
|
||||
* Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public
|
||||
* License along with this library; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
|
||||
* 02110-1301 USA
|
||||
*/
|
||||
|
||||
|
||||
|
||||
#include "libguile/__scm.h"
|
||||
#include "libguile/weak-vector.h"
|
||||
|
||||
|
||||
|
||||
static inline SCM
|
||||
scm_i_weak_cons (SCM car, SCM cdr)
|
||||
{
|
||||
return scm_cons (scm_c_make_weak_vector (1, car), cdr);
|
||||
}
|
||||
|
||||
static inline SCM
|
||||
scm_i_weak_car (SCM pair)
|
||||
{
|
||||
return scm_c_weak_vector_ref (scm_car (pair), 0);
|
||||
}
|
||||
|
||||
static inline void
|
||||
scm_i_visit_weak_list (SCM *list_loc, void (*visit) (SCM))
|
||||
{
|
||||
SCM in = *list_loc, out = SCM_EOL;
|
||||
|
||||
while (scm_is_pair (in))
|
||||
{
|
||||
SCM car = scm_i_weak_car (in);
|
||||
SCM cdr = scm_cdr (in);
|
||||
|
||||
if (!scm_is_eq (car, SCM_BOOL_F))
|
||||
{
|
||||
scm_set_cdr_x (in, out);
|
||||
out = in;
|
||||
visit (car);
|
||||
}
|
||||
|
||||
in = cdr;
|
||||
}
|
||||
|
||||
*list_loc = out;
|
||||
}
|
||||
|
||||
|
||||
#endif /* SCM_WEAK_LIST_H */
|
||||
|
||||
/*
|
||||
Local Variables:
|
||||
c-file-style: "gnu"
|
||||
End:
|
||||
*/
|
Loading…
Add table
Add a link
Reference in a new issue