Changeset 216

Timestamp:

03/28/11 23:54:37 (14 years ago)

Author:

tim

Message:

added a new testcase to the smoketest for data attributes
fixed data naming issues in pyregfi

Files:

• test/pyregfi-smoketest.py (modified) (3 diffs)
• trunk/python/pyregfi/__init__.py (modified) (4 diffs)

test/pyregfi-smoketest.py

@@ -31 +31 @@
 # Gathers various (meaningless) statistics to exercise simple attribute access
 # and to hopefully smoke out any bugs that can be identified by changing stats
-def iterTally(hive):
+def iterTallyNames(hive):
     key_count = 0
     key_lens = 0
@@ -77 +77 @@
 
 
+# Uses the HiveIterator to walk all keys
+# Gathers various (meaningless) statistics about data/data_raw attributes
+def iterTallyData(hive):
+    data_stat = 0.0
+    dataraw_stat = 0.0
+    
+    for k in hive:
+        for v in k.values:
+            d = v.data
+            if d == None:
+                data_stat += 0.1
+            elif hasattr(d, "__len__"):
+                data_stat += len(d)
+            else:
+                data_stat += d/2.0**64
+
+            d = v.data_raw
+            if d == None:
+                dataraw_stat += 0.1
+            else:
+                dataraw_stat += len(d)
+
+    print("  Data stat: %f" % data_stat)
+    print("  Raw data stat: %f" % dataraw_stat)
+
+
+
 if len(sys.argv) < 2:
     usage()
@@ -82 +109 @@
 
 
-tests = [("iterTally",iterTally),("iterParentWalk",iterParentWalk),]
+#tests = [("iterTallyNames",iterTallyNames),("iterParentWalk",iterParentWalk),]
+tests = [("iterTallyData",iterTallyData),]
 
 files = []

trunk/python/pyregfi/__init__.py

@@ -249 +249 @@
             name = create_string_buffer(bytes(name))
 
-        if self._find_element(self._hive.file, self._key.base, name, byref(index)):
+        if self._find_element(self._hive.file, self._key._base, name, byref(index)):
             return self._constructor(self._hive, 
                                      self._get_element(self._hive.file,
-                                                       self._key.base,
+                                                       self._key._base,
                                                        index))
         raise KeyError('')
@@ -343 +343 @@
         ret_val = None
         if name == "data":
-            data_p = regfi.regfi_fetch_data(self._hive.file, self.base)
+            data_p = regfi.regfi_fetch_data(self._hive.file, self._base)
             try:
                 data_struct = data_p.contents
@@ -373 +373 @@
         elif name == "data_raw":
             # XXX: should we load the data without interpretation instead?
-            data_p = regfi.regfi_fetch_data(self._hive.file, self.base)
+            data_p = regfi.regfi_fetch_data(self._hive.file, self._base)
             try:
                 data_struct = data_p.contents
@@ -381 +381 @@
             ret_val = _buffer2bytearray(data_struct.raw,
                                         data_struct.size)
-            regfi.regfi_free_record(data_p)            
+            regfi.regfi_free_record(data_p)
             
         else: