Skip to content

Commit b1ac027

Browse files
authored
Rename internal memory growth function. NFC (#19530)
We use camel case for JS functions and don't tend to use the emscripten prefix.
1 parent 00de89f commit b1ac027

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

src/library.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -151,14 +151,14 @@ mergeInto(LibraryManager.library, {
151151
#endif // ABORTING_MALLOC
152152

153153
#if TEST_MEMORY_GROWTH_FAILS
154-
$emscripten_realloc_buffer: function(size) {
154+
$growMemory: function(size) {
155155
return false;
156156
},
157157
#else
158158

159159
// Grows the wasm memory to the given byte size, and updates the JS views to
160160
// it. Returns 1 on success, 0 on error.
161-
$emscripten_realloc_buffer: function(size) {
161+
$growMemory: function(size) {
162162
var b = wasmMemory.buffer;
163163
var pages = (size - b.byteLength + 65535) >>> 16;
164164
#if RUNTIME_DEBUG
@@ -179,7 +179,7 @@ mergeInto(LibraryManager.library, {
179179
return 1 /*success*/;
180180
} catch(e) {
181181
#if ASSERTIONS
182-
err(`emscripten_realloc_buffer: Attempted to grow heap from ${b.byteLength} bytes to ${size} bytes, but got error: ${e}`);
182+
err(`growMemory: Attempted to grow heap from ${b.byteLength} bytes to ${size} bytes, but got error: ${e}`);
183183
#endif
184184
}
185185
// implicit 0 return to save code size (caller will cast "undefined" into 0
@@ -196,7 +196,7 @@ mergeInto(LibraryManager.library, {
196196
'$abortOnCannotGrowMemory',
197197
#endif
198198
#if ALLOW_MEMORY_GROWTH
199-
'$emscripten_realloc_buffer',
199+
'$growMemory',
200200
#endif
201201
],
202202
emscripten_resize_heap: 'ip',
@@ -280,7 +280,7 @@ mergeInto(LibraryManager.library, {
280280
#if ASSERTIONS == 2
281281
var t0 = _emscripten_get_now();
282282
#endif
283-
var replacement = emscripten_realloc_buffer(newSize);
283+
var replacement = growMemory(newSize);
284284
#if ASSERTIONS == 2
285285
var t1 = _emscripten_get_now();
286286
out(`Heap resize call from ${oldSize} to ${newSize} took ${(t1 - t0)} msecs. Success: ${!!replacement}`);

src/memoryprofiler.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,7 @@ var emscriptenMemoryProfiler = {
424424
filterCallstackForHeapResize: function(callstack) {
425425
// Do not show Memoryprofiler's own callstacks in the callstack prints.
426426
var i = callstack.indexOf('emscripten_asm_const_iii');
427-
var j = callstack.indexOf('emscripten_realloc_buffer');
427+
var j = callstack.indexOf('growMemory');
428428
i = (i == -1) ? j : (j == -1 ? i : Math.min(i, j));
429429
if (i != -1) {
430430
callstack = callstack.substr(callstack.indexOf('\n', i)+1);

0 commit comments

Comments
 (0)