Merge branch 'fix/async_loading' into wasm

* fix/async_loading: Commit the latest compiled assets Don't use writeStringToMemory
x0f0 · Nov 4, 2018 · ee90d9f · ee90d9f
2 parents 53c1c63 + 508cf1a
commit ee90d9f
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 425 deletions.
diff --git a/coffee/api.coffee b/coffee/api.coffee
@@ -5,7 +5,7 @@ apiTemp = stackAlloc(4)
 # Constants are defined in api-data.coffee
 SQLite = {}
 
-### Represents an prepared statement.
+### Represents a prepared statement.
 
 Prepared statements allow you to have a template sql string,
 that you can execute multiple times with different parameters.
@@ -311,11 +311,14 @@ class Database
         if not @db then throw "Database closed"
 
         stack = stackSave()
+
         # Store the SQL string in memory. The string will be consumed, one statement
         # at a time, by sqlite3_prepare_v2_sqlptr.
-        # Allocate at most 4 bytes per UTF8 char, +1 for the trailing '\0'
-        nextSqlPtr = stackAlloc(sql.length<<2 + 1)
-        writeStringToMemory sql, nextSqlPtr
+        # Note that if we want to allocate as much memory as could _possibly_ be used, we can 
+        # we allocate bytes equal to 4* the number of chars in the sql string.
+        # It would be faster, but this is probably a premature optimization
+        nextSqlPtr = allocateUTF8OnStack(sql)
+
         # Used to store a pointer to the next SQL statement in the string
         pzTail = stackAlloc(4)
 

diff --git a/js/sql-debug.js b/js/sql-debug.js
@@ -68,7 +68,7 @@ apiTemp = stackAlloc(4);
 SQLite = {};
 
 
-/* Represents an prepared statement.
+/* Represents a prepared statement.
 
 Prepared statements allow you to have a template sql string,
 that you can execute multiple times with different parameters.
@@ -513,8 +513,7 @@ Database = (function() {
       throw "Database closed";
     }
     stack = stackSave();
-    nextSqlPtr = stackAlloc(sql.length << 2 + 1);
-    writeStringToMemory(sql, nextSqlPtr);
+    nextSqlPtr = allocateUTF8OnStack(sql);
     pzTail = stackAlloc(4);
     results = [];
     while (getValue(nextSqlPtr, 'i8') !== NULL) {

diff --git a/js/sql-memory-growth.js b/js/sql-memory-growth.js
diff --git a/js/sql.js b/js/sql.js
diff --git a/js/worker.sql-debug.js b/js/worker.sql-debug.js
@@ -68,7 +68,7 @@ apiTemp = stackAlloc(4);
 SQLite = {};
 
 
-/* Represents an prepared statement.
+/* Represents a prepared statement.
 
 Prepared statements allow you to have a template sql string,
 that you can execute multiple times with different parameters.
@@ -513,8 +513,7 @@ Database = (function() {
       throw "Database closed";
     }
     stack = stackSave();
-    nextSqlPtr = stackAlloc(sql.length << 2 + 1);
-    writeStringToMemory(sql, nextSqlPtr);
+    nextSqlPtr = allocateUTF8OnStack(sql);
     pzTail = stackAlloc(4);
     results = [];
     while (getValue(nextSqlPtr, 'i8') !== NULL) {

diff --git a/js/worker.sql.js b/js/worker.sql.js