GeezerVison

The World Wide Web, restored to 800 pixels of glory.

GeezerVison is showing github.com — util: improve textdecoder decode performance · nodejs/node@4730850

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

benchmark/util
- text-decoder.js
lib/internal
- encoding.js
src
- node_i18n.cc

Expand file treeCollapse file tree

Open diff view settings

Collapse file

`‎benchmark/util/text-decoder.js‎`

Copy file name to clipboard

+19Lines changed: 19 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,19 @@`
	`1`	`+'use strict';`
	`2`	`+`
	`3`	`+const common = require('../common.js');`
	`4`	`+`
	`5`	`+const bench = common.createBenchmark(main, {`
	`6`	`+ encoding: ['utf-8', 'latin1', 'iso-8859-3'],`
	`7`	`+ ignoreBOM: [0, 1],`
	`8`	`+ len: [256, 1024 * 16, 1024 * 512],`
	`9`	`+ n: [1e6]`
	`10`	`+});`
	`11`	`+`
	`12`	`+function main({ encoding, len, n, ignoreBOM }) {`
	`13`	`+ const buf = Buffer.allocUnsafe(len);`
	`14`	`+ const decoder = new TextDecoder(encoding, { ignoreBOM });`
	`15`	`+`
	`16`	`+ bench.start();`
	`17`	`+ decoder.decode(buf);`
	`18`	`+ bench.end(n);`
	`19`	`+}`

Collapse file

`‎lib/internal/encoding.js‎`

Copy file name to clipboardExpand all lines: lib/internal/encoding.js

+1-1Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -438,7 +438,7 @@ function makeTextDecoderICU() {`
`438`	`438`	`if (typeof ret === 'number') {`
`439`	`439`	`throw new ERR_ENCODING_INVALID_ENCODED_DATA(this.encoding, ret);`
`440`	`440`	`}`
`441`		`- return ret.toString('ucs2');`
	`441`	`+ return ret;`
`442`	`442`	`}`
`443`	`443`	`}`
`444`	`444`

Collapse file

`‎src/node_i18n.cc‎`

Copy file name to clipboardExpand all lines: src/node_i18n.cc

+27-13Lines changed: 27 additions & 13 deletions

Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,7 @@`
`50`	`50`	`#include "node_buffer.h"`
`51`	`51`	`#include "node_errors.h"`
`52`	`52`	`#include "node_internals.h"`
	`53`	`+#include "string_bytes.h"`
`53`	`54`	`#include "util-inl.h"`
`54`	`55`	`#include "v8.h"`
`55`	`56`
`@@ -96,7 +97,6 @@ using v8::NewStringType;`
`96`	`97`	`using v8::Object;`
`97`	`98`	`using v8::ObjectTemplate;`
`98`	`99`	`using v8::String;`
`99`		`-using v8::Uint8Array;`
`100`	`100`	`using v8::Value;`
`101`	`101`
`102`	`102`	`namespace i18n {`
`@@ -445,7 +445,6 @@ void ConverterObject::Decode(const FunctionCallbackInfo<Value>& args) {`
`445`	`445`
`446`	`446`	`UErrorCode status = U_ZERO_ERROR;`
`447`	`447`	`MaybeStackBuffer<UChar> result;`
`448`		`- MaybeLocal<Object> ret;`
`449`	`448`
`450`	`449`	`UBool flush = (flags & CONVERTER_FLAGS_FLUSH) == CONVERTER_FLAGS_FLUSH;`
`451`	`450`
`@@ -501,19 +500,34 @@ void ConverterObject::Decode(const FunctionCallbackInfo<Value>& args) {`
`501`	`500`	`converter->set_bom_seen(true);`
`502`	`501`	`}`
`503`	`502`	`}`
`504`		`- ret = ToBufferEndian(env, &result);`
`505`		`- if (omit_initial_bom && !ret.IsEmpty()) {`
	`503`	`+`
	`504`	`+ Local<Value> error;`
	`505`	`+ UChar* output = result.out();`
	`506`	`+ size_t beginning = 0;`
	`507`	`+ size_t length = result.length() * sizeof(UChar);`
	`508`	`+`
	`509`	`+ if (omit_initial_bom) {`
`506`	`510`	// Perform `ret = ret.slice(2)`.
`507`		`- CHECK(ret.ToLocalChecked()->IsUint8Array());`
`508`		`- Local<Uint8Array> orig_ret = ret.ToLocalChecked().As<Uint8Array>();`
`509`		`- ret = Buffer::New(env,`
`510`		`- orig_ret->Buffer(),`
`511`		`- orig_ret->ByteOffset() + 2,`
`512`		`- orig_ret->ByteLength() - 2)`
`513`		`- .FromMaybe(Local<Uint8Array>());`
	`511`	`+ beginning += 2;`
	`512`	`+ length -= 2;`
`514`	`513`	`}`
`515`		`- if (!ret.IsEmpty())`
`516`		`- args.GetReturnValue().Set(ret.ToLocalChecked());`
	`514`	`+`
	`515`	`+ char* value = reinterpret_cast<char*>(output) + beginning;`
	`516`	`+`
	`517`	`+ if (IsBigEndian()) {`
	`518`	`+ SwapBytes16(value, length);`
	`519`	`+ }`
	`520`	`+`
	`521`	`+ MaybeLocal<Value> encoded =`
	`522`	`+ StringBytes::Encode(env->isolate(), value, length, UCS2, &error);`
	`523`	`+`
	`524`	`+ Local<Value> ret;`
	`525`	`+ if (encoded.ToLocal(&ret)) {`
	`526`	`+ args.GetReturnValue().Set(ret);`
	`527`	`+ } else {`
	`528`	`+ args.GetReturnValue().Set(error);`
	`529`	`+ }`
	`530`	`+`
`517`	`531`	`return;`
`518`	`532`	`}`
`519`	`533`

0 commit comments

Comments

0 (0)

You are visitor 01402503 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.