[pypy-svn] r16142 - pypy/dist/pypy/rpython/memory

[cfbolz at codespeak.net]

Author: cfbolz
Date: Thu Aug 18 16:28:27 2005
New Revision: 16142

Modified:
   pypy/dist/pypy/rpython/memory/convertlltype.py
   pypy/dist/pypy/rpython/memory/gcwrapper.py
   pypy/dist/pypy/rpython/memory/lltypesimulation.py
Log:
rename get_total_size to sizeof


Modified: pypy/dist/pypy/rpython/memory/convertlltype.py
==============================================================================
--- pypy/dist/pypy/rpython/memory/convertlltype.py	(original)
+++ pypy/dist/pypy/rpython/memory/convertlltype.py	Thu Aug 18 16:28:27 2005
@@ -1,5 +1,5 @@
 from pypy.rpython.memory import lladdress
-from pypy.rpython.memory.lltypesimulation import simulatorptr, get_total_size
+from pypy.rpython.memory.lltypesimulation import simulatorptr, sizeof
 from pypy.rpython.memory.lltypesimulation import get_fixed_size
 from pypy.rpython.memory.lltypesimulation import get_variable_size
 from pypy.rpython.memory.lltypesimulation import primitive_to_fmt
@@ -61,7 +61,7 @@
             return address
         TYPE = lltype.typeOf(_array)
         arraylength = len(_array.items)
-        size = get_total_size(TYPE, arraylength)
+        size = sizeof(TYPE, arraylength)
         if inline_to_addr is not None:
             startaddr = inline_to_addr
         else:
@@ -95,9 +95,9 @@
         layout = get_layout(TYPE)
         if TYPE._arrayfld is not None:
             inlinedarraylength = len(getattr(_struct, TYPE._arrayfld).items)
-            size = get_total_size(TYPE, inlinedarraylength)
+            size = sizeof(TYPE, inlinedarraylength)
         else:
-            size = get_total_size(TYPE)
+            size = sizeof(TYPE)
         if inline_to_addr is not None:
             startaddr = inline_to_addr
         else:
@@ -182,7 +182,7 @@
             elif isinstance(cand, lltype._array):
                 seen[cand] = True
                 length = len(cand.items)
-                total_size += get_total_size(cand._TYPE, length) * 2 * INT_SIZE
+                total_size += sizeof(cand._TYPE, length) * 2 * INT_SIZE
                 for item in cand.items:
                     candidates.append(item)
             elif isinstance(cand, lltype._struct):
@@ -196,10 +196,10 @@
                 TYPE = cand._TYPE
                 if not has_parent:
                     if TYPE._arrayfld is not None:
-                        total_size += get_total_size(
+                        total_size += sizeof(
                             TYPE, len(getattr(cand, TYPE._arrayfld).items))
                     else:
-                        total_size += get_total_size(TYPE)
+                        total_size += sizeof(TYPE)
                     total_size += INT_SIZE * 2
                 for name in TYPE._flds:
                     candidates.append(getattr(cand, name))

Modified: pypy/dist/pypy/rpython/memory/gcwrapper.py
==============================================================================
--- pypy/dist/pypy/rpython/memory/gcwrapper.py	(original)
+++ pypy/dist/pypy/rpython/memory/gcwrapper.py	Thu Aug 18 16:28:27 2005
@@ -63,7 +63,7 @@
     def malloc(self, TYPE, size=0):
         typeid = self.objectmodel.get_typeid(TYPE)
         address = self.gc.malloc(typeid,
-                                 lltypesimulation.get_total_size(TYPE, size))
+                                 lltypesimulation.sizeof(TYPE, size))
         result = lltypesimulation.simulatorptr(lltype.Ptr(TYPE), address)
         result._zero_initialize(size)
         result._init_size(size)

Modified: pypy/dist/pypy/rpython/memory/lltypesimulation.py
==============================================================================
--- pypy/dist/pypy/rpython/memory/lltypesimulation.py	(original)
+++ pypy/dist/pypy/rpython/memory/lltypesimulation.py	Thu Aug 18 16:28:27 2005
@@ -82,7 +82,7 @@
     else:
         assert 0, "not yet implemented"
 
-def get_total_size(TYPE, i=None):
+def sizeof(TYPE, i=None):
     fixedsize = get_fixed_size(TYPE)
     varsize = get_variable_size(TYPE)
     if i is None:
@@ -122,7 +122,7 @@
         self.__dict__['_layout'] = get_layout(TYPE.TO)
 
     def _zero_initialize(self, i=None):
-        size = get_total_size(self._T, i)
+        size = sizeof(self._T, i)
         self._address._store("c" * size, *(["\x00"] * size))
 
     def _init_size(self, size):