Changeset cc1a727 in mainline

Timestamp:

2011-07-24T21:18:16Z (13 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

78eb2dc

Parents:

c028b22

Message:

Add support for ext2 to be used as RAM disk format

Files:

• HelenOS.config (modified) (1 diff)
• boot/Makefile (modified) (1 diff)
• boot/Makefile.common (modified) (2 diffs)
• tools/imgutil.py (added)
• tools/mkext2.py (added)
• tools/mkfat.py (modified) (5 diffs)
• tools/xstruct.py (modified) (4 diffs)

HelenOS.config

@@ -88 +88 @@
 @ "tmpfs" TMPFS image
 @ "fat" FAT16 image
+@ "ext2fs" EXT2 image
 ! RDFMT (choice)
 

boot/Makefile

@@ -50 +50 @@
         $(MKFAT) 1048576 $(DIST_PATH) $@
 endif
+ifeq ($(RDFMT),ext2fs)
+        $(MKEXT2) 1048576 $(DIST_PATH) $@
+endif
 
 build_dist: clean_dist

boot/Makefile.common

@@ -56 +56 @@
 MKTMPFS = $(TOOLS_PATH)/mktmpfs.py
 MKFAT = $(TOOLS_PATH)/mkfat.py
+MKEXT2 = $(TOOLS_PATH)/mkext2.py
 MKUIMAGE = $(TOOLS_PATH)/mkuimage.py
 
@@ -82 +83 @@
 ifeq ($(RDFMT),fat)
         INIT_TASKS += $(USPACE_PATH)/srv/fs/fat/fat
+endif
+
+ifeq ($(RDFMT),ext2fs)
+        INIT_TASKS += $(USPACE_PATH)/srv/fs/ext2fs/ext2fs
 endif
 

tools/mkfat.py

@@ -37 +37 @@
 import xstruct
 import array
-
-exclude_names = set(['.svn', '.bzr'])
-
-def align_up(size, alignment):
-        "Return size aligned up to alignment"
-        
-        if (size % alignment == 0):
-                return size
-        
-        return ((size // alignment) + 1) * alignment
+from imgutil import *
 
 def subtree_size(root, cluster_size, dirent_size):
@@ -54 +45 @@
         files = 2
         
-        for name in os.listdir(root):
-                canon = os.path.join(root, name)
-                
-                if (os.path.isfile(canon) and (not name in exclude_names)):
-                        size += align_up(os.path.getsize(canon), cluster_size)
+        for item in listdir_items(root):
+                if item.is_file:
+                        size += align_up(item.size, cluster_size)
                         files += 1
-                
-                if (os.path.isdir(canon) and (not name in exclude_names)):
-                        size += subtree_size(canon, cluster_size, dirent_size)
+                elif item.is_dir:
+                        size += subtree_size(item.path, cluster_size, dirent_size)
                         files += 1
         
@@ -72 +60 @@
         return len(os.listdir(root))
 
-def write_file(path, outf, cluster_size, data_start, fat, reserved_clusters):
+def write_file(item, outf, cluster_size, data_start, fat, reserved_clusters):
         "Store the contents of a file"
         
-        size = os.path.getsize(path)
         prev = -1
         first = 0
         
-        inf = open(path, "rb")
-        rd = 0;
-        while (rd < size):
+        for data in chunks(item, cluster_size):
                 empty_cluster = fat.index(0)
                 fat[empty_cluster] = 0xffff
@@ -92 +77 @@
                 prev = empty_cluster
                 
-                data = bytes(inf.read(cluster_size));
                 outf.seek(data_start + (empty_cluster - reserved_clusters) * cluster_size)
                 outf.write(data)
-                rd += len(data)
-        inf.close()
-        
-        return first, size
+        
+        return first, item.size
 
 def write_directory(directory, outf, cluster_size, data_start, fat, reserved_clusters, dirent_size, empty_cluster):
@@ -303 +285 @@
                 empty_cluster = 0
         
-        for name in os.listdir(root):
-                canon = os.path.join(root, name)
-                
-                if (os.path.isfile(canon) and (not name in exclude_names)):
-                        rv = write_file(canon, outf, cluster_size, data_start, fat, reserved_clusters)
-                        directory.append(create_dirent(name, False, rv[0], rv[1]))
-                
-                if (os.path.isdir(canon) and (not name in exclude_names)):
-                        rv = recursion(False, canon, outf, cluster_size, root_start, data_start, fat, reserved_clusters, dirent_size, empty_cluster)
-                        directory.append(create_dirent(name, True, rv[0], rv[1]))
+        for item in listdir_items(root):                
+                if item.is_file:
+                        rv = write_file(item, outf, cluster_size, data_start, fat, reserved_clusters)
+                        directory.append(create_dirent(item.name, False, rv[0], rv[1]))
+                elif item.is_dir:
+                        rv = recursion(False, item.path, outf, cluster_size, root_start, data_start, fat, reserved_clusters, dirent_size, empty_cluster)
+                        directory.append(create_dirent(item.name, True, rv[0], rv[1]))
         
         if (head):

tools/xstruct.py

@@ -1 +1 @@
 #
 # Copyright (c) 2008 Martin Decky
+# Copyright (c) 2011 Martin Sucha
 # All rights reserved.
 #
@@ -31 +32 @@
 
 import struct
+import types
+
+ranges = {
+        'B': ((int, long), 0x00, 0xff),
+        'H': ((int, long), 0x0000, 0xffff),
+        'L': ((int, long), 0x00000000, 0xffffffff),
+        'Q': ((int, long), 0x0000000000000000, 0xffffffffffffffff),
+        'b': ((int, long), -0x80, 0x7f),
+        'h': ((int, long), -0x8000, 0x7fff),
+        'l': ((int, long), -0x80000000, 0x7fffffff) ,
+        'q': ((int, long), -0x8000000000000000, 0x7fffffffffffffff),
+}
+
+def check_range(varname, fmt, value):
+        if value == None:
+                raise ValueError('Variable "%s" not set' % varname)
+        if not fmt in ranges:
+                return
+        vartype, varmin, varmax = ranges[fmt]
+        if not isinstance(value, vartype):
+                raise ValueError('Variable "%s" is %s but should be %s' %
+                                 (varname, str(type(value)), str(vartype)))
+        if value < varmin or value > varmax:
+                raise ValueError('Variable "%s" value %s out of range %s..%s' % 
+                                 (varname, repr(value), repr(varmin), repr(varmax)))
 
 class Struct:
@@ -38 +64 @@
         def pack(self):
                 args = []
-                for variable in self._args_:
-                        if (isinstance(self.__dict__[variable], list)):
-                                for item in self.__dict__[variable]:
+                for variable, fmt, length in self._args_:
+                        value = self.__dict__[variable]
+                        if isinstance(value, list):
+                                if length != None and length != len(value):
+                                        raise ValueError('Variable "%s" length %u does not match %u' %
+                                                      (variable, len(value), length))
+                                for index, item in enumerate(value):
+                                        check_range(variable + '[' + repr(index) + ']', fmt, item)
                                         args.append(item)
                         else:
-                                args.append(self.__dict__[variable])
-                
+                                check_range(variable, fmt, value)
+                                args.append(value)              
                 return struct.pack(self._format_, *args)
+        
+        def unpack(self, data):
+                values = struct.unpack(self._format_, data)
+                i = 0
+                for variable, fmt, length in self._args_:
+                        self.__dict__[variable] = values[i]
+                        i += 1
 
 def create(definition):
@@ -77 +115 @@
                         subtokens = token.split("[")
                         
+                        length = None
                         if (len(subtokens) > 1):
-                                format += "%d" % int(subtokens[1].split("]")[0])
+                                length = int(subtokens[1].split("]")[0])
+                                format += "%d" % length
                         
                         format += variable
                         
                         inst.__dict__[subtokens[0]] = None
-                        args.append(subtokens[0])
+                        args.append((subtokens[0], variable, length))
                         
                         variable = None