Merge branch 'master' into wip-color-mc

Conflicts:
	common.py
	gen/generator.py
	run/experiment.py
	run_exps.py

2 files changed, 29 insertions, 6 deletions

diff --git a/parse/col_map.py b/parse/col_map.py
index ceb8867..59484e8 100644
--- a/parse/col_map.py
+++ b/parse/col_map.py
@@ -22,7 +22,7 @@ class ColMapBuilder(object):
 
 class ColMap(object):
     def __init__(self, col_list, values = None):
-        self.col_list = col_list
+        self.col_list = sorted(col_list)
         self.rev_map = {}
         self.values = values
 
@@ -50,7 +50,7 @@ class ColMap(object):
             if col not in kv:
                 key += (None,)
             else:
-                key += (kv[col],)
+                key += (str(kv[col]),)
 
         return key
 
diff --git a/parse/sched.py b/parse/sched.py
index 6e1fbe6..524f1ed 100644
--- a/parse/sched.py
+++ b/parse/sched.py
@@ -98,15 +98,38 @@ record_map = {}
 RECORD_SIZE   = 24
 NSEC_PER_MSEC = 1000000
 
+def bits_to_bytes(bits):
+    '''Includes padding'''
+    return bits / 8 + (1 if bits%8 else 0)
+
+def field_bytes(fields):
+    fbytes = 0
+    fbits  = 0
+    for f in fields:
+        flist = list(f)
+
+        if len(flist) > 2:
+            # Specified a bitfield
+            fbits += flist[2]
+        else:
+            # Only specified a type, use types size
+            fbytes += sizeof(list(f)[1])
+
+            # Bitfields followed by a byte will cause any incomplete
+            # bytes to be turned into full bytes
+            fbytes += bits_to_bytes(fbits)
+            fbits   = 0
+
+    fbytes += bits_to_bytes(fbits)
+    return fbytes + fbits
+
 def register_record(id, clazz):
     fields = clazz.FIELDS
-
-    fsize = lambda fields : sum([sizeof(list(f)[1]) for f in fields])
-    diff  = RECORD_SIZE - fsize(SchedRecord.FIELDS) - fsize(fields)
+    diff = RECORD_SIZE - field_bytes(SchedRecord.FIELDS) - field_bytes(fields)
 
     # Create extra padding fields to make record the proper size
     # Creating one big field of c_uint64 and giving it a size of 8*diff
-    # _shoud_ work, but doesn't. This is an uglier way of accomplishing
+    # _should_ work, but doesn't. This is an uglier way of accomplishing
     # the same goal
     for d in range(diff):
         fields += [("extra%d" % d, c_char)]