Mercurial > hg > piper-vamp-js
changeset 176:eaf46e7647a0 tip master
Update for latest Emscripten - Pointer_stringify has apparently been deprecated for a while, and was removed in v1.38.27
| author | Chris Cannam <cannam@all-day-breakfast.com> |
|---|---|
| date | Wed, 27 Feb 2019 11:29:53 +0000 |
| parents | a91b4defa581 |
| children | |
| files | Makefile.inc test/node-load-test.js test/perf-test-node.js test/perf-test.js test/quick-test.js |
| diffstat | 5 files changed, 12 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile.inc Wed Jun 13 15:55:39 2018 +0100 +++ b/Makefile.inc Wed Feb 27 11:29:53 2019 +0000 @@ -103,15 +103,16 @@ --memory-init-file 0 \ -s MODULARIZE=1 \ -s NO_FILESYSTEM=1 \ - -s MEM_INIT_METHOD=0 \ + -s ASSERTIONS=1 \ -s ERROR_ON_UNDEFINED_SYMBOLS=1 \ -s "EXPORT_NAME='$(EM_MODULE_SYMBOL)'" \ -s "EXPORTED_FUNCTIONS=['_piperRequestJson', '_piperProcessRaw', '_piperFreeJson', '_malloc', '_free']" \ - -s "EXTRA_EXPORTED_RUNTIME_METHODS=['cwrap', 'allocate', 'ALLOC_NORMAL', 'Pointer_stringify', 'intArrayFromString']" \ + -s "EXTRA_EXPORTED_RUNTIME_METHODS=['cwrap', 'allocate', 'ALLOC_NORMAL', 'UTF8ToString', 'intArrayFromString']" \ $(EMFLAGS) EMFLAGS_ASMJS := \ $(EMFLAGS_ANY) \ + -s MEM_INIT_METHOD=0 \ -s WASM=0 EMFLAGS_WASM := \ @@ -179,6 +180,8 @@ $(SO_MODULE): $(OBJECTS) $(CXX) -o $@ $^ $(LDFLAGS) +test: test-em test-wasm + test-em: em $(NODE) $(MY_DIR)/test/node-load-test.js $(shell pwd)/$(EM_MODULE_U)
--- a/test/node-load-test.js Wed Jun 13 15:55:39 2018 +0100 +++ b/test/node-load-test.js Wed Feb 27 11:29:53 2019 +0000 @@ -65,7 +65,7 @@ } extractorModule._free(buffersPtr); - const responseJstr = extractorModule.Pointer_stringify(responseJson); + const responseJstr = extractorModule.UTF8ToString(responseJson); const response = JSON.parse(responseJstr); piperFreeJson(responseJson); @@ -99,7 +99,7 @@ let inCstr = m.allocate(m.intArrayFromString(jsonStr), 'i8', m.ALLOC_NORMAL); let outCstr = piperRequestJson(inCstr); m._free(inCstr); - const responseJstr = m.Pointer_stringify(outCstr); + const responseJstr = m.UTF8ToString(outCstr); const response = JSON.parse(responseJstr); piperFreeJson(outCstr); return response;
--- a/test/perf-test-node.js Wed Jun 13 15:55:39 2018 +0100 +++ b/test/perf-test-node.js Wed Feb 27 11:29:53 2019 +0000 @@ -67,7 +67,7 @@ } extractorModule._free(buffersPtr); - const responseJstr = extractorModule.Pointer_stringify(responseJson); + const responseJstr = extractorModule.UTF8ToString(responseJson); const response = JSON.parse(responseJstr); piperFreeJson(responseJson); @@ -101,7 +101,7 @@ var inCstr = m.allocate(m.intArrayFromString(jsonStr), 'i8', m.ALLOC_NORMAL); var outCstr = piperRequestJson(inCstr); m._free(inCstr); - var result = m.Pointer_stringify(outCstr); + var result = m.UTF8ToString(outCstr); piperFreeJson(outCstr); note("Returned JSON = " + result); return result;
--- a/test/perf-test.js Wed Jun 13 15:55:39 2018 +0100 +++ b/test/perf-test.js Wed Feb 27 11:29:53 2019 +0000 @@ -65,7 +65,7 @@ } exampleModule._free(buffersPtr); - const responseJstr = exampleModule.Pointer_stringify(responseJson); + const responseJstr = exampleModule.UTF8ToString(responseJson); const response = JSON.parse(responseJstr); piperFreeJson(responseJson); @@ -99,7 +99,7 @@ var inCstr = m.allocate(m.intArrayFromString(jsonStr), 'i8', m.ALLOC_NORMAL); var outCstr = piperRequestJson(inCstr); m._free(inCstr); - var result = m.Pointer_stringify(outCstr); + var result = m.UTF8ToString(outCstr); piperFreeJson(outCstr); note("Returned JSON = " + result); return result;
--- a/test/quick-test.js Wed Jun 13 15:55:39 2018 +0100 +++ b/test/quick-test.js Wed Feb 27 11:29:53 2019 +0000 @@ -43,7 +43,7 @@ var inCstr = m.allocate(m.intArrayFromString(jsonStr), 'i8', m.ALLOC_NORMAL); var outCstr = piperRequestJson(inCstr); m._free(inCstr); - var result = m.Pointer_stringify(outCstr); + var result = m.UTF8ToString(outCstr); piperFreeJson(outCstr); note("Returned JSON = " + result); return result;