[pypy-commit] pypy lightweight-finalizers: rename argument to malloc_fixedsize_clear to reflect what it really means
fijal
noreply at buildbot.pypy.org
Tue Oct 25 16:11:45 CEST 2011
Author: Maciej Fijalkowski <fijall at gmail.com>
Branch: lightweight-finalizers
Changeset: r48434:cde38a4297fc
Date: 2011-10-25 16:11 +0200
http://bitbucket.org/pypy/pypy/changeset/cde38a4297fc/
Log: rename argument to malloc_fixedsize_clear to reflect what it really
means (it implies has_finalizer)
diff --git a/pypy/rpython/memory/gc/generation.py b/pypy/rpython/memory/gc/generation.py
--- a/pypy/rpython/memory/gc/generation.py
+++ b/pypy/rpython/memory/gc/generation.py
@@ -168,7 +168,7 @@
def malloc_fixedsize_clear(self, typeid, size,
has_finalizer=False,
- has_light_finalizer=False,
+ is_finalizer_light=False,
contains_weakptr=False):
if (has_finalizer or
(raw_malloc_usage(size) > self.lb_young_fixedsize and
diff --git a/pypy/rpython/memory/gc/marksweep.py b/pypy/rpython/memory/gc/marksweep.py
--- a/pypy/rpython/memory/gc/marksweep.py
+++ b/pypy/rpython/memory/gc/marksweep.py
@@ -93,7 +93,7 @@
pass
def malloc_fixedsize(self, typeid16, size,
- has_finalizer=False, has_light_finalizer=False,
+ has_finalizer=False, is_finalizer_light=False,
contains_weakptr=False):
self.maybe_collect()
size_gc_header = self.gcheaderbuilder.size_gc_header
@@ -130,7 +130,7 @@
def malloc_fixedsize_clear(self, typeid16, size,
has_finalizer=False,
- has_light_finalizer=False,
+ is_finalizer_light=False,
contains_weakptr=False):
self.maybe_collect()
size_gc_header = self.gcheaderbuilder.size_gc_header
diff --git a/pypy/rpython/memory/gc/minimark.py b/pypy/rpython/memory/gc/minimark.py
--- a/pypy/rpython/memory/gc/minimark.py
+++ b/pypy/rpython/memory/gc/minimark.py
@@ -459,7 +459,7 @@
def malloc_fixedsize_clear(self, typeid, size,
needs_finalizer=False,
- has_light_finalizer=False,
+ is_finalizer_light=False,
contains_weakptr=False):
size_gc_header = self.gcheaderbuilder.size_gc_header
totalsize = size_gc_header + size
@@ -467,7 +467,7 @@
#
# If the object needs a finalizer, ask for a rawmalloc.
# The following check should be constant-folded.
- if needs_finalizer and not has_light_finalizer:
+ if needs_finalizer and not is_finalizer_light:
ll_assert(not contains_weakptr,
"'needs_finalizer' and 'contains_weakptr' both specified")
obj = self.external_malloc(typeid, 0, can_make_young=False)
@@ -498,7 +498,7 @@
# Build the object.
llarena.arena_reserve(result, totalsize)
obj = result + size_gc_header
- if has_light_finalizer:
+ if is_finalizer_light:
self.young_objects_with_light_finalizers.append(obj)
self.init_gc_object(result, typeid, flags=0)
#
diff --git a/pypy/rpython/memory/gc/semispace.py b/pypy/rpython/memory/gc/semispace.py
--- a/pypy/rpython/memory/gc/semispace.py
+++ b/pypy/rpython/memory/gc/semispace.py
@@ -95,7 +95,7 @@
def malloc_fixedsize_clear(self, typeid16, size,
has_finalizer=False,
- has_light_finalizer=False,
+ is_finalizer_light=False,
contains_weakptr=False):
size_gc_header = self.gcheaderbuilder.size_gc_header
totalsize = size_gc_header + size
@@ -105,7 +105,7 @@
llarena.arena_reserve(result, totalsize)
self.init_gc_object(result, typeid16)
self.free = result + totalsize
- if has_light_finalizer:
+ if is_finalizer_light:
self.objects_with_light_finalizers.append(result + size_gc_header)
elif has_finalizer:
self.objects_with_finalizers.append(result + size_gc_header)
diff --git a/pypy/rpython/memory/test/test_transformed_gc.py b/pypy/rpython/memory/test/test_transformed_gc.py
--- a/pypy/rpython/memory/test/test_transformed_gc.py
+++ b/pypy/rpython/memory/test/test_transformed_gc.py
@@ -807,7 +807,7 @@
op.args = [Constant(type_id, llgroup.HALFWORD),
Constant(llmemory.sizeof(P), lltype.Signed),
Constant(False, lltype.Bool), # has_finalizer
- Constant(False, lltype.Bool), # has_light_finalizer
+ Constant(False, lltype.Bool), # is_finalizer_light
Constant(False, lltype.Bool)] # contains_weakptr
break
else:
@@ -844,7 +844,7 @@
op.args = [Constant(type_id, llgroup.HALFWORD),
Constant(llmemory.sizeof(P), lltype.Signed),
Constant(False, lltype.Bool), # has_finalizer
- Constant(False, lltype.Bool), # has_light_finalizer
+ Constant(False, lltype.Bool), # is_finalizer_light
Constant(False, lltype.Bool)] # contains_weakptr
break
else:
More information about the pypy-commit
mailing list