archive/blender-asset-manager
Archived
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Speedup BlendFile.find_block_from_offset (use hash)

Browse Source
This commit is contained in:
Campbell Barton
2014-10-16 20:00:46 +02:00
parent 010798af5d
commit 0a561193ab
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
packer/blendfile.py
View File

@@ -99,6 +99,8 @@ class BlendFile:
# dict {b'StructName': sdna_index} # dict {b'StructName': sdna_index}
# (where the index is an index into 'structs') # (where the index is an index into 'structs')
"sdna_index_from_id", "sdna_index_from_id",
# dict {addr_old: block}
"block_from_offset",
# int # int
"code_index", "code_index",
# bool (did we make a change) # bool (did we make a change)
@@ -131,6 +133,9 @@ class BlendFile:
self.is_modified = False self.is_modified = False
self.blocks.append(block) self.blocks.append(block)
# cache (could lazy init, incase we never use?)
self.block_from_offset = {block.addr_old: block for block in self.blocks}
def find_blocks_from_code(self, code): def find_blocks_from_code(self, code):
assert(type(code) == bytes) assert(type(code) == bytes)
@@ -139,10 +144,10 @@ class BlendFile:
return self.code_index[code] return self.code_index[code]
def find_block_from_offset(self, offset): def find_block_from_offset(self, offset):
for block in self.blocks: # same as looking looping over all blocks,
if block.addr_old == offset: # then checking ``block.addr_old == offset``
return block assert(type(offset) is int)
return None return self.block_from_offset.get(offset)
def close(self): def close(self):
""" """
@@ -594,7 +599,6 @@ class DNAStruct:
dna_type = field.dna_type dna_type = field.dna_type
dna_name = field.dna_name dna_name = field.dna_name
print(dna_type.dna_type_id)
if dna_name.is_pointer: if dna_name.is_pointer:
return DNA_IO.read_pointer(handle, header) return DNA_IO.read_pointer(handle, header)
elif dna_type.dna_type_id == b'int': elif dna_type.dna_type_id == b'int':