Optimize Structure wrappers

Note the optimization is twofold - bringing unpacker to local scope and
using compiled Struct. Timings pending

Author: Utumno

Mopy/bash/bolt.py

@@ -1498,23 +1498,36 @@ def pop(self,key,default=None):
         return self.data.pop(key,default)
 
 # Structure wrappers ----------------------------------------------------------
-def unpack_str8(ins): return ins.read(struct_unpack(u'B', ins.read(1))[0])
-def unpack_str16(ins): return ins.read(struct_unpack(u'H', ins.read(2))[0])
-def unpack_str32(ins): return ins.read(struct_unpack(u'I', ins.read(4))[0])
-def unpack_int(ins): return struct_unpack(u'I', ins.read(4))[0]
-def unpack_short(ins): return struct_unpack(u'H', ins.read(2))[0]
-def unpack_float(ins): return struct_unpack(u'f', ins.read(4))[0]
-def unpack_double(ins): return struct_unpack(u'd', ins.read(8))[0]
-def unpack_byte(ins): return struct_unpack(u'B', ins.read(1))[0]
-def unpack_int_signed(ins): return struct_unpack(u'i', ins.read(4))[0]
-def unpack_int64_signed(ins): return struct_unpack(u'q', ins.read(8))[0]
-def unpack_4s(ins): return struct_unpack(u'4s', ins.read(4))[0]
-def unpack_str16_delim(ins):
-    str_value = ins.read(struct_unpack(u'Hc', ins.read(3))[0])
-    ins.read(1) # discard delimiter
+def unpack_str8(ins, __unpack=struct.Struct(u'B').unpack):
+    return ins.read(__unpack(ins.read(1))[0])
+def unpack_str16(ins, __unpack=struct.Struct(u'H').unpack):
+    return ins.read(__unpack(ins.read(2))[0])
+def unpack_str32(ins, __unpack=struct.Struct(u'I').unpack):
+    return ins.read(__unpack(ins.read(4))[0])
+def unpack_int(ins, __unpack=struct.Struct(u'I').unpack):
+    return __unpack(ins.read(4))[0]
+def unpack_short(ins, __unpack=struct.Struct(u'H').unpack):
+    return __unpack(ins.read(2))[0]
+def unpack_float(ins, __unpack=struct.Struct(u'f').unpack):
+    return __unpack(ins.read(4))[0]
+def unpack_double(ins, __unpack=struct.Struct(u'd').unpack):
+    return __unpack(ins.read(8))[0]
+def unpack_byte(ins, __unpack=struct.Struct(u'B').unpack):
+    return __unpack(ins.read(1))[0]
+def unpack_int_signed(ins, __unpack=struct.Struct(u'i').unpack):
+    return __unpack(ins.read(4))[0]
+def unpack_int64_signed(ins, __unpack=struct.Struct(u'q').unpack):
+    return __unpack(ins.read(8))[0]
+def unpack_4s(ins, __unpack=struct.Struct(u'4s').unpack):
+    return __unpack(ins.read(4))[0]
+def unpack_str16_delim_null(ins, __unpack=struct.Struct(u'Hc').unpack):
+    str_value = ins.read(__unpack(ins.read(3))[0])
+    ins.seek(1, 1) # discard null string terminator
     return str_value
-def unpack_int_delim(ins): return struct_unpack(u'Ic', ins.read(5))[0]
-def unpack_byte_delim(ins): return struct_unpack(u'Bc', ins.read(2))[0]
+def unpack_str_int_delim(ins, __unpack=struct.Struct(u'Ic').unpack):
+    return __unpack(ins.read(5))[0]
+def unpack_str_byte_delim(ins, __unpack=struct.Struct(u'Bc').unpack):
+    return __unpack(ins.read(2))[0]
 
 def unpack_string(ins, string_len):
     return struct_unpack(u'%ds' % string_len, ins.read(string_len))[0]

Mopy/bash/bosh/save_headers.py

@@ -40,8 +40,8 @@
 from .. import bolt
 from ..bolt import decode, cstrip, unpack_string, unpack_int, unpack_str8, \
     unpack_short, unpack_float, unpack_str16, unpack_byte, struct_pack, \
-    unpack_int_delim, unpack_str16_delim, unpack_byte_delim, unpack_many, \
-    encode
+    unpack_str_int_delim, unpack_str16_delim_null, unpack_str_byte_delim, \
+    unpack_many, encode
 from ..bosh import ModInfo
 from ..exception import SaveHeaderError, raise_bolt_error
 
@@ -427,25 +427,25 @@ class FalloutNVSaveHeader(SaveFileHeader):
     _masters_unknown_byte = 0x1B
     unpackers = OrderedDict([
         ('header_size', (00, unpack_int)),
-        ('_unknown',    (00, unpack_int_delim)),
+        ('_unknown',    (00, unpack_str_int_delim)),
         ('language',    (00, lambda ins: unpack_many(ins, '64sc')[0])),
-        ('ssWidth',     (00, unpack_int_delim)),
-        ('ssHeight',    (00, unpack_int_delim)),
-        ('ssDepth',     (00, unpack_int_delim)),
-        ('pcName',      (00, unpack_str16_delim)),
-        ('pcNick',      (00, unpack_str16_delim)),
-        ('pcLevel',     (00, unpack_int_delim)),
-        ('pcLocation',  (00, unpack_str16_delim)),
-        ('gameDate',    (00, unpack_str16_delim)),
+        ('ssWidth',     (00, unpack_str_int_delim)),
+        ('ssHeight',    (00, unpack_str_int_delim)),
+        ('ssDepth',     (00, unpack_str_int_delim)),
+        ('pcName',      (00, unpack_str16_delim_null)),
+        ('pcNick',      (00, unpack_str16_delim_null)),
+        ('pcLevel',     (00, unpack_str_int_delim)),
+        ('pcLocation',  (00, unpack_str16_delim_null)),
+        ('gameDate',    (00, unpack_str16_delim_null)),
     ])
 
     def load_masters(self, ins):
         self._mastersStart = ins.tell()
         self._master_list_size(ins)
         self.masters = []
-        numMasters = unpack_byte_delim(ins)
+        numMasters = unpack_str_byte_delim(ins)
         for count in xrange(numMasters):
-            self.masters.append(unpack_str16_delim(ins))
+            self.masters.append(unpack_str16_delim_null(ins))
 
     def _master_list_size(self, ins):
         formVersion, masterListSize = unpack_many(ins, '=BI')
@@ -459,7 +459,7 @@ def _write_masters(self, ins, out):
         _pack(out, '=B', self._masters_unknown_byte)
         _pack(out, '=I', self._master_block_size())
         #--Skip old masters
-        numMasters = unpack_byte_delim(ins) # get me the Byte
+        numMasters = unpack_str_byte_delim(ins) # get me the Byte
         oldMasters = self._dump_masters(ins, numMasters, out)
         #--Offsets
         offset = out.tell() - ins.tell()
@@ -473,7 +473,7 @@ def _write_masters(self, ins, out):
     def _dump_masters(self, ins, numMasters, out):
         oldMasters = []
         for count in xrange(numMasters):
-            oldMasters.append(unpack_str16_delim(ins))
+            oldMasters.append(unpack_str16_delim_null(ins))
         # Write new masters - note the silly delimiters
         _pack(out, '=B', len(self.masters))
         _pack(out, '=c', '|')