mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-05-02 04:40:29 +02:00
Code Activity

Fix weak-value hash tables.

Browse source 
* libguile/hashtab.c (scm_hash_fn_set_x): Register a disappearing link
  to VAL when TABLE is weak-value.

* test-suite/tests/weaks.test ("weak-hash")["weak-key dies", "weak-value
  dies", "doubly-weak dies"]: Use `hash-set!' and `hash-ref', not
  `hashq-set!' and `hashq-ref', otherwise these tests would always
  succeed because (eq? "this" "this") => #f.
  ["lives"]: Use `hash-ref' and `hash-set!' too for consistency.
This commit is contained in:
Ludovic Courtès 2010-09-23 11:51:28 +02:00
parent cb2d8076ef
commit 5a99a574e4
2 changed files with 62 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

7
libguile/hashtab.c
View file

@ -623,6 +623,13 @@ scm_hash_fn_set_x (SCM table, SCM obj, SCM val,
it = scm_hash_fn_create_handle_x (table, obj, SCM_BOOL_F, hash_fn, assoc_fn, closure); it = scm_hash_fn_create_handle_x (table, obj, SCM_BOOL_F, hash_fn, assoc_fn, closure);
SCM_SETCDR (it, val); SCM_SETCDR (it, val);
if (SCM_HASHTABLE_P (table) && SCM_HASHTABLE_WEAK_VALUE_P (table)
&& SCM_NIMP (val))
/* IT is a weak-cdr pair. Register a disappearing link from IT's
cdr to VAL like `scm_weak_cdr_pair' does. */
SCM_I_REGISTER_DISAPPEARING_LINK ((void *) SCM_CDRLOC (it), SCM2PTR (val));
return val; return val;
} }

105
test-suite/tests/weaks.test
View file

@ -1,5 +1,5 @@
;;;; weaks.test --- tests guile's weaks -*- scheme -*- ;;;; weaks.test --- tests guile's weaks -*- scheme -*-
;;;; Copyright (C) 1999, 2001, 2003, 2006, 2009 Free Software Foundation, Inc. ;;;; Copyright (C) 1999, 2001, 2003, 2006, 2009, 2010 Free Software Foundation, Inc.
;;;; ;;;;
;;;; This library is free software; you can redistribute it and/or ;;;; This library is free software; you can redistribute it and/or
;;;; modify it under the terms of the GNU Lesser General Public ;;;; modify it under the terms of the GNU Lesser General Public
@ -131,59 +131,64 @@
"weak-hash" "weak-hash"
(pass-if "lives" (pass-if "lives"
(begin (begin
(hashq-set! x test-key test-value) (hash-set! x test-key test-value)
(hashq-set! y test-key test-value) (hash-set! y test-key test-value)
(hashq-set! z test-key test-value) (hash-set! z test-key test-value)
(gc) (gc)
(gc) (gc)
(and (hashq-ref x test-key) (and (hash-ref x test-key)
(hashq-ref y test-key) (hash-ref y test-key)
(hashq-ref z test-key) (hash-ref z test-key)
#t))) #t)))
;; In the tests below we use `string-copy' to avoid the risk of
;; unintended retention of a string that we want to be GC'd.
(pass-if "weak-key dies" (pass-if "weak-key dies"
(begin (begin
(hashq-set! x "this" "is") (hash-set! x (string-copy "this") "is")
(hashq-set! x "a" "test") (hash-set! x (string-copy "a") "test")
(hashq-set! x "of" "the") (hash-set! x (string-copy "of") "the")
(hashq-set! x "emergency" "weak") (hash-set! x (string-copy "emergency") "weak")
(hashq-set! x "key" "hash system") (hash-set! x (string-copy "key") "hash system")
(gc) (gc)
(and (and
(or (not (hashq-ref x "this")) (or (not (hash-ref x "this"))
(not (hashq-ref x "a")) (not (hash-ref x "a"))
(not (hashq-ref x "of")) (not (hash-ref x "of"))
(not (hashq-ref x "emergency")) (not (hash-ref x "emergency"))
(not (hashq-ref x "key"))) (not (hash-ref x "key")))
(hashq-ref x test-key) (hash-ref x test-key)
#t))) #t)))
(pass-if "weak-value dies" (pass-if "weak-value dies"
(begin (begin
(hashq-set! y "this" "is") (hash-set! y "this" (string-copy "is"))
(hashq-set! y "a" "test") (hash-set! y "a" (string-copy "test"))
(hashq-set! y "of" "the") (hash-set! y "of" (string-copy "the"))
(hashq-set! y "emergency" "weak") (hash-set! y "emergency" (string-copy "weak"))
(hashq-set! y "value" "hash system") (hash-set! y "value" (string-copy "hash system"))
(gc) (gc)
(and (or (not (hashq-ref y "this")) (and (or (not (hash-ref y "this"))
(not (hashq-ref y "a")) (not (hash-ref y "a"))
(not (hashq-ref y "of")) (not (hash-ref y "of"))
(not (hashq-ref y "emergency")) (not (hash-ref y "emergency"))
(not (hashq-ref y "value"))) (not (hash-ref y "value")))
(hashq-ref y test-key) (hash-ref y test-key)
#t))) #t)))
(pass-if "doubly-weak dies" (pass-if "doubly-weak dies"
(begin (begin
(hashq-set! z "this" "is") (hash-set! z (string-copy "this") (string-copy "is"))
(hashq-set! z "a" "test") (hash-set! z "a" (string-copy "test"))
(hashq-set! z "of" "the") (hash-set! z (string-copy "of") "the")
(hashq-set! z "emergency" "weak") (hash-set! z "emergency" (string-copy "weak"))
(hashq-set! z "all" "hash system") (hash-set! z (string-copy "all") (string-copy "hash system"))
(gc) (gc)
(and (or (not (hashq-ref z "this")) (and (or (not (hash-ref z "this"))
(not (hashq-ref z "a")) (not (hash-ref z "a"))
(not (hashq-ref z "of")) (not (hash-ref z "of"))
(not (hashq-ref z "emergency")) (not (hash-ref z "emergency"))
(not (hashq-ref z "all"))) (not (hash-ref z "all")))
(hashq-ref z test-key) (hash-ref z test-key)
#t))))) #t)))))