Merge pull request #44 from b8raoult/develop

Update memos.py so it produces the same files on Windows

eccodes.code-workspace

@@ -0,0 +1,7 @@
+{
+	"folders": [
+		{
+			"path": "."
+		}
+	]
+}

memfs.py

@@ -4,9 +4,13 @@ import os
 import re
 import sys
 import binascii
+import time
 
 assert len(sys.argv) > 2
 
+start = time.time()
+print("MEMFS: starting")
+
 # Exclude experimental features e.g. GRIB3 and TAF
 # The BUFR codetables is not used in the engine
 EXCLUDED = ["grib3", "codetables", "taf", "stations"]
@@ -29,7 +33,7 @@ print("Excluding: ", EXCLUDED)
 FILES = {}
 SIZES = {}
 NAMES = []
-CHUNK = 5500 * 1000  # chunk size in bytes
+CHUNK = 16 * 1024 * 1024  # chunk size in bytes
 
 # Binary to ASCII function. Different in Python 2 and 3
 try:
@@ -45,11 +49,9 @@ def get_outfile_name(base, count):
 
 # The last argument is the base name of the generated C file(s)
 output_file_base = sys.argv[-1]
-totsize = 0  # amount written
-fcount = 0
-opath = get_outfile_name(output_file_base, fcount)
-print("MEMFS: Generating output: ", opath)
-g = open(opath, "w")
+
+buffer = None
+fcount = -1
 
 for directory in dirs:
 
@@ -58,13 +60,19 @@ for directory in dirs:
     NAMES.append(dname)
 
     for dirpath, dirnames, files in os.walk(directory, followlinks=True):
-        # for ex in EXCLUDED:
-        #    if ex in dirnames:
-        #        print('Note: eccodes memfs.py script: %s/%s will not be included.' % (dirpath,ex))
+
+
 
         # Prune the walk by modifying the dirnames in-place
         dirnames[:] = [dirname for dirname in dirnames if dirname not in EXCLUDED]
         for name in files:
+
+            if buffer is None:
+                fcount += 1
+                opath = get_outfile_name(output_file_base, fcount)
+                print("MEMFS: Generating output:", opath)
+                buffer = open(opath, 'wb')
+
             full = "%s/%s" % (dirpath, name)
             _, ext = os.path.splitext(full)
             if ext not in [".def", ".table", ".tmpl", ".list", ".txt"]:
@@ -72,8 +80,6 @@ for directory in dirs:
             if name == "CMakeLists.txt":
                 continue
 
-            fsize = os.path.getsize(full)
-            totsize += fsize
             full = full.replace("\\", "/")
             fname = full[full.find("/%s/" % (dname,)) :]
             # print("MEMFS: Add ", fname)
@@ -82,9 +88,9 @@ for directory in dirs:
             assert name not in FILES
             assert name not in SIZES
             FILES[name] = fname
-            SIZES[name] = fsize
+            SIZES[name] = os.path.getsize(full)
 
-            print("const unsigned char %s[] = {" % (name,), file=g)
+            buffer.write("const unsigned char %s[] = {" % (name,))
 
             with open(full, "rb") as f:
                 i = 0
@@ -98,24 +104,22 @@ for directory in dirs:
                 # e.g. 23 -> 0x23
                 for n in range(0, len(contents_hex), 2):
                     twoChars = ascii(contents_hex[n : n + 2])
-                    print("0x%s," % (twoChars,), end="", file=g)
+                    buffer.write("0x%s," % (twoChars,))
                     i += 1
                     if (i % 20) == 0:
-                        print("", file=g)
+                        buffer.write("\n")
 
-            print("};", file=g)
-            if totsize >= CHUNK:
-                g.close()
-                fcount += 1
-                opath = get_outfile_name(output_file_base, fcount)
-                print("MEMFS: Generating output: ", opath)
-                g = open(opath, "w")
-                totsize = 0
+            buffer.write("};\n")
+            if buffer.tell() >= CHUNK:
+                buffer.close()
+                buffer = None
+
+if buffer is not None:
+    buffer.close()
 
-g.close()
 # The number of generated C files is hard coded.
 # See memfs/CMakeLists.txt
-assert fcount == 3, fcount
+assert fcount == 6, fcount
 opath = output_file_base + "_final.c"
 print("MEMFS: Generating output: ", opath)
 g = open(opath, "w")
@@ -311,3 +315,6 @@ FILE* codes_memfs_open(const char* path) {
 )
 
 print("Finished")
+
+print("MEMFS: done", time.time() - start)
+

memfs/CMakeLists.txt

@@ -10,6 +10,9 @@ set( generated_c_files
     ${CMAKE_CURRENT_BINARY_DIR}/memfs_gen_001.c
     ${CMAKE_CURRENT_BINARY_DIR}/memfs_gen_002.c
     ${CMAKE_CURRENT_BINARY_DIR}/memfs_gen_003.c
+    ${CMAKE_CURRENT_BINARY_DIR}/memfs_gen_004.c
+    ${CMAKE_CURRENT_BINARY_DIR}/memfs_gen_005.c
+    ${CMAKE_CURRENT_BINARY_DIR}/memfs_gen_006.c
     ${CMAKE_CURRENT_BINARY_DIR}/memfs_gen_final.c)
 
 add_custom_command(