Changeset 227

Timestamp:

04/09/11 12:31:22 (14 years ago)

Author:

tim

Message:

added a SetLogMask? function to pyregfi as an interface to regfi_log_set_mask
made pyregfi-smoketest.py easier to use

Files:

• test/pyregfi-smoketest.py (modified) (3 diffs)
• trunk/python/pyregfi/__init__.py (modified) (2 diffs)
• trunk/python/pyregfi/structures.py (modified) (1 diff)

test/pyregfi-smoketest.py

@@ -8 +8 @@
 
 
-def usage():
-    sys.stderr.write("USAGE: pyregfi-smoketest.py hive1 [hive2 ...]\n")
-
-
-
+
+pyregfi.SetLogMask((pyregfi.LOG_TYPES.INFO, pyregfi.LOG_TYPES.WARN, pyregfi.LOG_TYPES.ERROR))
 
 # Uses the HiveIterator to walk all keys
@@ -192 +189 @@
         pass
 
-    
-if len(sys.argv) < 2:
+tests = {
+    "iterTallyNames":iterTallyNames,
+    "iterParentWalk":iterParentWalk,
+    "iterTallyData":iterTallyData,
+    "recurseKeyTally":recurseKeyTally,
+    "iterFetchRelated":iterFetchRelated,
+    "iterIterWalk":iterIterWalk,
+    "iterCallbackIO":iterCallbackIO,
+    }
+
+def usage():
+    sys.stderr.write("USAGE: pyregfi-smoketest.py test1[,test2[,...]] hive1 [hive2 ...]\n")
+    sys.stderr.write("\tAvailable tests:\n")
+    for t in tests.keys():
+        sys.stderr.write("\t\t%s\n" % t)
+
+
+if len(sys.argv) < 3:
     usage()
     sys.exit(1)
 
-
-tests = [("iterTallyNames",iterTallyNames),
-         ("iterParentWalk",iterParentWalk),
-         ("iterTallyData",iterTallyData),
-         ("recurseKeyTally",recurseKeyTally),
-         ("iterFetchRelated",iterFetchRelated),
-         ("iterIterWalk",iterIterWalk),]
-
-tests = [("iterCallbackIO",iterCallbackIO),]
-
+selected_tests = sys.argv[1].split(',')
+for st in selected_tests:
+    if st not in tests:
+        usage()
+        sys.stderr.write("ERROR: %s not a valid test type" % st)
+        sys.exit(1)
 
 files = []
-for f in sys.argv[1:]:
+for f in sys.argv[2:]:
     files.append((f, open(f,"rb")))
 
@@ -216 +225 @@
 for hname,fh in files:
     hive = pyregfi.Hive(fh)
-    for tname,t in tests:
+    for tname in selected_tests:
+        t = tests[tname]
         teststart = time.time()
         tstr = "'%s' on '%s'" % (tname,hname)

trunk/python/pyregfi/__init__.py

@@ -133 +133 @@
 
 
+## An enumeration of log message types
+#
+# @note This is a static class, there is no need to instantiate it. 
+#       Just access its attributes directly as LOG_TYPES.INFO, etc
+class LOG_TYPES(object):
+    ## Informational messages, useful in debugging
+    INFO  =  0x01
+    ## Non-critical problems in structure parsing or intepretation
+    WARN  =  0x04
+    ## Major failures
+    ERROR =  0x10
+
+
 def _buffer2bytearray(char_pointer, length):
     if length == 0 or char_pointer == None:
@@ -180 +193 @@
         return ''
     return msgs.decode('utf-8')
+
+
+## Sets the types of log messages to record
+#
+# @param log_types A sequence of message types that regfi should generate.
+#                  Message types can be found in the LOG_TYPES enumeration.
+#
+# @return True on success, False on failure.  Failures are rare, but could
+#         indicate that global logging is not operating as expected.
+# 
+# Example:
+# @code
+# SetLogMask((LOG_TYPES.ERROR, LOG_TYPES.WARN, LOG_TYPES.INFO))
+# @endcode
+#
+# The message mask is a global (all hives, iterators), thread-specific value.
+# For more information, see @ref regfi_log_set_mask.
+#
+def SetLogMask(log_types):
+    mask = 0
+    for m in log_types:
+        mask |= m
+    return regfi.regfi_log_set_mask(mask)
+
 
 

trunk/python/pyregfi/structures.py

@@ -17 +17 @@
 # XXX: can we always be sure enums are this size?
 REGFI_ENCODING = c_uint32
-REGFI_ENCODING_UTF8 = 1
+REGFI_ENCODING_UTF8 = REGFI_ENCODING(1)
 
 REGFI_DATA_TYPE = c_uint32
-REGFI_REGF_SIZE = 0x1000