refactor chunking code and add function ident information

1 files changed, 8 insertions, 16 deletions

diff --git a/emscripten.py b/emscripten.py
index 6ef105b7..945df09a 100755
--- a/emscripten.py
+++ b/emscripten.py
@@ -88,6 +88,7 @@ def emscript(infile, settings, outfile, libraries=[]):
   # Split input into the relevant parts for each phase
   pre = []
   funcs = [] # split up functions here, for parallelism later
+  func_idents = []
   meta = [] # needed by each function XXX
 
   if DEBUG: t = time.time()
@@ -95,16 +96,17 @@ def emscript(infile, settings, outfile, libraries=[]):
   ll_lines = open(infile).readlines()
   for line in ll_lines:
     if in_func:
-      funcs[-1].append(line)
+      funcs[-1][1].append(line)
       if line.startswith('}'):
         in_func = False
-        funcs[-1] = ''.join(funcs[-1])
+        funcs[-1] = (funcs[-1][0], ''.join(funcs[-1][1]))
         pre.append(line) # pre needs it to, so we know about all implemented functions
     else:
       if line.startswith(';'): continue
       if line.startswith('define '):
         in_func = True
-        funcs.append([line])
+        ident = shared.JS.to_nice_ident(line.split('(')[0].split(' ')[-1])
+        funcs.append((ident, [line]))
         pre.append(line) # pre needs it to, so we know about all implemented functions
       elif line.find(' = type { ') > 0:
         pre.append(line) # type
@@ -168,22 +170,12 @@ def emscript(infile, settings, outfile, libraries=[]):
   if DEBUG: t = time.time()
   forwarded_json = json.loads(forwarded_data)
   indexed_functions = set()
-  chunks = [] # bundles of functions
-  curr = []
-  for i in range(len(funcs)):
-    func = funcs[i]
-    if len(curr) + len(func) < chunk_size:
-      curr.append(func)
-    else:
-      chunks.append(curr)
-      curr = [func]
-  if curr:
-    chunks.append(curr)
-    curr = None
+
+  chunks = shared.JCache.chunkify(funcs, chunk_size)
   if cores == 1 and total_ll_size < MAX_CHUNK_SIZE: assert len(chunks) == 1, 'no point in splitting up without multiple cores'
   if DEBUG: print >> sys.stderr, '  emscript: phase 2 working on %d chunks %s (intended chunk size: %.2f MB, meta: %.2f MB, forwarded: %.2f MB, total: %.2f MB)' % (len(chunks), ('using %d cores' % cores) if len(chunks) > 1 else '', chunk_size/(1024*1024.), len(meta)/(1024*1024.), len(forwarded_data)/(1024*1024.), total_ll_size/(1024*1024.))
 
-  commands = [(i, chunks[i], meta, settings_file, compiler, forwarded_file, libraries) for i in range(len(chunks))]
+  commands = [(i, [func[1] for func in chunks[i]], meta, settings_file, compiler, forwarded_file, libraries) for i in range(len(chunks))]
 
   if len(chunks) > 1:
     pool = multiprocessing.Pool(processes=cores)