diff options
author | Alon Zakai <alonzakai@gmail.com> | 2013-11-01 18:26:58 -0700 |
---|---|---|
committer | Alon Zakai <alonzakai@gmail.com> | 2013-11-01 18:26:58 -0700 |
commit | 3d48329892cd517b2e709ef94a00df8214169ddd (patch) | |
tree | 988d17b59d4fc2473a6d7a63df0f4117b711bcf4 /src/preamble.js | |
parent | 75af3c1ac8dba93b508b8b431bef9a35e6b054c3 (diff) | |
parent | 2c3d580bf9122ec4aef9ee8d462281d3fd810355 (diff) |
Merge branch 'incoming' into f32
Conflicts:
src/parseTools.js
Diffstat (limited to 'src/preamble.js')
-rw-r--r-- | src/preamble.js | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/preamble.js b/src/preamble.js index 8ab6d604..b1434deb 100644 --- a/src/preamble.js +++ b/src/preamble.js @@ -1110,19 +1110,21 @@ var Math_min = Math.min; // it happens right before run - run will be postponed until // the dependencies are met. var runDependencies = 0; -var runDependencyTracking = {}; var runDependencyWatcher = null; var dependenciesFulfilled = null; // overridden to take different actions when all run dependencies are fulfilled +#if ASSERTIONS +var runDependencyTracking = {}; +#endif function addRunDependency(id) { runDependencies++; if (Module['monitorRunDependencies']) { Module['monitorRunDependencies'](runDependencies); } +#if ASSERTIONS if (id) { assert(!runDependencyTracking[id]); runDependencyTracking[id] = 1; -#if ASSERTIONS if (runDependencyWatcher === null && typeof setInterval !== 'undefined') { // Check for missing dependencies every few seconds runDependencyWatcher = setInterval(function() { @@ -1139,10 +1141,10 @@ function addRunDependency(id) { } }, 10000); } -#endif } else { Module.printErr('warning: run dependency added without ID'); } +#endif } Module['addRunDependency'] = addRunDependency; function removeRunDependency(id) { @@ -1150,12 +1152,14 @@ function removeRunDependency(id) { if (Module['monitorRunDependencies']) { Module['monitorRunDependencies'](runDependencies); } +#if ASSERTIONS if (id) { assert(runDependencyTracking[id]); delete runDependencyTracking[id]; } else { Module.printErr('warning: run dependency removed without ID'); } +#endif if (runDependencies == 0) { if (runDependencyWatcher !== null) { clearInterval(runDependencyWatcher); |