1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

process: remove pushValueToArray in EnvEnumerator

Browse Source 
Instead of calling into JS from C++ to push values into an array,
use the new Array::New API that takes a pointer and a length
directly.

PR-URL: https://github.com/nodejs/node/pull/24264
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>
Reviewed-By: Refael Ackermann <refack@gmail.com>
This commit is contained in:
Joyee Cheung 2018-11-09 11:37:08 +08:00
parent 83c6067ac6
commit 08bfd5625f
No known key found for this signature in database
GPG Key ID: 92B78A53C8303B8D
2 changed files with 19 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/node_process.cc
View File

@ -730,40 +730,29 @@ void EnvDeleter(Local<Name> property,
void EnvEnumerator(const PropertyCallbackInfo<Array>& info) { void EnvEnumerator(const PropertyCallbackInfo<Array>& info) {
Environment* env = Environment::GetCurrent(info); Environment* env = Environment::GetCurrent(info);
Isolate* isolate = env->isolate(); Isolate* isolate = env->isolate();
Local<Context> ctx = env->context();
Local<Function> fn = env->push_values_to_array_function();
Local<Value> argv[NODE_PUSH_VAL_TO_ARRAY_MAX];
size_t idx = 0;
Mutex::ScopedLock lock(environ_mutex); Mutex::ScopedLock lock(environ_mutex);
Local<Array> envarr;
int env_size = 0;
#ifdef __POSIX__ #ifdef __POSIX__
int size = 0; while (environ[env_size]) {
while (environ[size]) env_size++;
size++; }
std::vector<Local<Value>> env_v(env_size);
Local<Array> envarr = Array::New(isolate); for (int i = 0; i < env_size; ++i) {
for (int i = 0; i < size; ++i) {
const char* var = environ[i]; const char* var = environ[i];
const char* s = strchr(var, '='); const char* s = strchr(var, '=');
const int length = s ? s - var : strlen(var); const int length = s ? s - var : strlen(var);
argv[idx] = String::NewFromUtf8(isolate, env_v[i] =
var, String::NewFromUtf8(isolate, var, v8::NewStringType::kNormal, length)
v8::NewStringType::kNormal, .ToLocalChecked();
length).ToLocalChecked();
if (++idx >= arraysize(argv)) {
fn->Call(ctx, envarr, idx, argv).ToLocalChecked();
idx = 0;
}
}
if (idx > 0) {
fn->Call(ctx, envarr, idx, argv).ToLocalChecked();
} }
#else // _WIN32 #else // _WIN32
std::vector<Local<Value>> env_v;
WCHAR* environment = GetEnvironmentStringsW(); WCHAR* environment = GetEnvironmentStringsW();
if (environment == nullptr) if (environment == nullptr)
return; // This should not happen. return; // This should not happen.
Local<Array> envarr = Array::New(isolate);
WCHAR* p = environment; WCHAR* p = environment;
while (*p) { while (*p) {
WCHAR* s; WCHAR* s;
@ -789,19 +778,13 @@ void EnvEnumerator(const PropertyCallbackInfo<Array>& info) {
FreeEnvironmentStringsW(environment); FreeEnvironmentStringsW(environment);
return; return;
} }
argv[idx] = rc.ToLocalChecked(); env_v.push_back(rc.ToLocalChecked());
if (++idx >= arraysize(argv)) {
fn->Call(ctx, envarr, idx, argv).ToLocalChecked();
idx = 0;
}
p = s + wcslen(s) + 1; p = s + wcslen(s) + 1;
} }
if (idx > 0) {
fn->Call(ctx, envarr, idx, argv).ToLocalChecked();
}
FreeEnvironmentStringsW(environment); FreeEnvironmentStringsW(environment);
#endif #endif
envarr = Array::New(isolate, env_v.data(), env_v.size());
info.GetReturnValue().Set(envarr); info.GetReturnValue().Set(envarr);
} }

6
test/parallel/test-process-env.js
View File

@ -91,6 +91,7 @@ assert.strictEqual(5, date.getHours());
// case-sensitive on other platforms. // case-sensitive on other platforms.
process.env.TEST = 'test'; process.env.TEST = 'test';
assert.strictEqual(process.env.TEST, 'test'); assert.strictEqual(process.env.TEST, 'test');
// Check both mixed case and lower case, to avoid any regressions that might // Check both mixed case and lower case, to avoid any regressions that might
// simply convert input to lower case. // simply convert input to lower case.
if (common.isWindows) { if (common.isWindows) {
@ -100,3 +101,8 @@ if (common.isWindows) {
assert.strictEqual(process.env.test, undefined); assert.strictEqual(process.env.test, undefined);
assert.strictEqual(process.env.teST, undefined); assert.strictEqual(process.env.teST, undefined);
} }
{
const keys = Object.keys(process.env);
assert.ok(keys.length > 0);
}